Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	openvpn.8
	- Enhancements to the --register-dns description
	ssl.h
 	- Community changed n_packets and n_bytes to use
          counter_type instead of int to avoid integer overflows
	  (commit 6484c6299cf298107316e6497)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 1 insertions, 0 deletions

diff --git a/win32.h b/win32.h
index f974b06..fcc3062 100644
--- a/win32.h
+++ b/win32.h
@@ -34,6 +34,7 @@
 #define NETSH_PATH_SUFFIX     "\\system32\\netsh.exe"
 #define WIN_ROUTE_PATH_SUFFIX "\\system32\\route.exe"
 #define WIN_IPCONFIG_PATH_SUFFIX "\\system32\\ipconfig.exe"
+#define WIN_NET_PATH_SUFFIX "\\system32\\net.exe"
 
 /*
  * Win32-specific OpenVPN code, targetted at the mingw