summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2009-02-22 23:50:58 +0000
committerDamien Miller <djm@cvs.openbsd.org>2009-02-22 23:50:58 +0000
commit18f68798f0bf0df0572109e97f40945b0c219638 (patch)
tree82ad257318b0b7aa63b27875438439b81e9d7095 /usr.bin/ssh
parent11ad1a96ad57aa925eb1465e588ba29c6d0d2602 (diff)
don't advertise experimental options
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config.515
-rw-r--r--usr.bin/ssh/sshd_config.520
2 files changed, 6 insertions, 29 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 6ff2f3efe14..ea9a20b23e3 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.118 2009/02/12 07:34:20 jmc Exp $
-.Dd $Mdocdate: February 12 2009 $
+.\" $OpenBSD: ssh_config.5,v 1.119 2009/02/22 23:50:57 djm Exp $
+.Dd $Mdocdate: February 22 2009 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1086,17 +1086,6 @@ Specifies the full pathname of the
program.
The default is
.Pa /usr/X11R6/bin/xauth .
-.It Cm ZeroKnowledgePasswordAuthentication
-Specifies whether to use zero knowledge password authentication.
-This authentication method avoids exposure of password to untrusted
-hosts.
-The argument to this keyword must be
-.Dq yes
-or
-.Dq no .
-The default is currently
-.Dq no
-as this method is considered experimental.
.El
.Sh PATTERNS
A
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index 23c1505f890..451e89ae9d6 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.100 2009/01/24 17:10:22 naddy Exp $
-.Dd $Mdocdate: January 24 2009 $
+.\" $OpenBSD: sshd_config.5,v 1.101 2009/02/22 23:50:57 djm Exp $
+.Dd $Mdocdate: February 22 2009 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -612,10 +612,9 @@ Available keywords are
.Cm RhostsRSAAuthentication ,
.Cm RSAAuthentication ,
.Cm X11DisplayOffset ,
-.Cm X11Forwarding ,
-.Cm X11UseLocalHost ,
+.Cm X11Forwarding
and
-.Cm ZeroKnowledgePasswordAuthentication .
+.Cm X11UseLocalHost
.It Cm MaxAuthTries
Specifies the maximum number of authentication attempts permitted per
connection.
@@ -982,17 +981,6 @@ Specifies the full pathname of the
program.
The default is
.Pa /usr/X11R6/bin/xauth .
-.It Cm ZeroKnowledgePasswordAuthentication
-Specifies whether to use zero knowledge password authentication.
-This authentication method avoids exposure of password to untrusted
-hosts.
-The argument to this keyword must be
-.Dq yes
-or
-.Dq no .
-The default is currently
-.Dq no
-as this method is considered experimental.
.El
.Sh TIME FORMATS
.Xr sshd 8