From: JuanJo Ciarlante <jjo@google.com>
Date: Sat, 28 Nov 2009 17:19:14 +0000 (-0800)
Subject: * rebased to v2.1.1 release
X-Git-Tag: v2.3-alpha1~240^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ac2ac72e5fb286c9d8663a346075cae157f1762;p=thirdparty%2Fopenvpn.git

* rebased to v2.1.1 release
* document {un,}trusted_ip6 in manpage
---

diff --git a/openvpn.8 b/openvpn.8
index 182e5d52a..2b60c12ff 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -5402,13 +5402,16 @@ or
 script execution.
 .\"*********************************************************
 .TP
-.B trusted_ip
+.B trusted_ip (or trusted_ip6)
 Actual IP address of connecting client or peer which has been authenticated.
 Set prior to execution of
 .B \-\-ipchange, \-\-client-connect,
 and
 .B \-\-client-disconnect
 scripts.
+If using ipv6 endpoints (udp6, tcp6),
+.B trusted_ip6
+will be set instead.
 .\"*********************************************************
 .TP
 .B trusted_port
@@ -5420,7 +5423,7 @@ and
 scripts.
 .\"*********************************************************
 .TP
-.B untrusted_ip
+.B untrusted_ip (or untrusted_ip6)
 Actual IP address of connecting client or peer which has not been authenticated
 yet.  Sometimes used to
 .B nmap
@@ -5432,6 +5435,9 @@ Set prior to execution of
 and
 .B \-\-auth-user-pass-verify
 scripts.
+If using ipv6 endpoints (udp6, tcp6),
+.B untrusted_ip6
+will be set instead.
 .\"*********************************************************
 .TP
 .B untrusted_port