diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-28 11:22:51 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-28 11:22:51 +0200 |
| commit | 328500c490c36c679e275dbf99c2820f58bcbaa3 (patch) | |
| tree | 8e4fb0f8504c28d8d27aaa24618895bf09d6a439 /options.c | |
| parent | Solved hidden merge conflict between feat_misc and bugfix2.1 (diff) | |
| parent | Added "net stop dnscache" and "net start dnscache" in front (diff) | |
| download | openvpn-328500c490c36c679e275dbf99c2820f58bcbaa3.tar.xz | |
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>
Diffstat (limited to 'options.c')
| -rw-r--r-- | options.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -628,8 +628,8 @@ static const char usage_message[] = "--dhcp-pre-release : Ask Windows to release the previous TAP adapter lease on\n" " startup.\n" "--dhcp-release : Ask Windows to release the TAP adapter lease on shutdown.\n" - "--register-dns : Run ipconfig /flushdns and ipconfig /registerdns on\n" - " connection initiation.\n" + "--register-dns : Run net stop dnscache, net start dnscache, ipconfig /flushdns\n" + " and ipconfig /registerdns on connection initiation.\n" "--tap-sleep n : Sleep for n seconds after TAP adapter open before\n" " attempting to set adapter properties.\n" "--pause-exit : When run from a console window, pause before exiting.\n" |