summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-02-23 10:53:58 +1100
committerDamien Miller <djm@mindrot.org>2009-02-23 10:53:58 +1100
commit19913847640ac7df423f01f641abfce0f364238f (patch)
tree4d40c9aa209c8d7ff0c71e4c7dcb0820b7164eb2
parent9eab9564d5185b52f33f4a265914d32a3147338e (diff)
- djm@cvs.openbsd.org 2009/02/22 23:50:57
[ssh_config.5 sshd_config.5] don't advertise experimental options
-rw-r--r--ChangeLog8
-rw-r--r--ssh_config.515
-rw-r--r--sshd_config.520
3 files changed, 13 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index c50e1e5f..3fb16799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20090223
+ - (djm) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2009/02/22 23:50:57
+ [ssh_config.5 sshd_config.5]
+ don't advertise experimental options
+
20090222
- (djm) OpenBSD CVS Sync
- tobias@cvs.openbsd.org 2009/02/21 19:32:04
@@ -5190,5 +5196,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.5201 2009/02/21 21:47:02 djm Exp $
+$Id: ChangeLog,v 1.5202 2009/02/22 23:53:58 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 6ff2f3ef..ea9a20b2 100644
--- a/ssh_config.5
+++ b/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/sshd_config.5 b/sshd_config.5
index 033ae8d3..c28b18e3 100644
--- a/sshd_config.5
+++ b/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.
@@ -1006,17 +1005,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