summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-08-26 10:48:14 +1000
committerDamien Miller <djm@mindrot.org>2003-08-26 10:48:14 +1000
commit30912f7259b771a1cf705c0bc47a6c3f3edffb43 (patch)
treeb3e1b33115ce10b6edc2303f7dd1f415f2419d15
parent36ca53a5a025114d7c55b881027294a28b7d465a (diff)
- (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint"BEFORE_KRB5_GSSAPI_MERGE
as deprecated. Remove mention from README.privsep. Patch from aet AT cc.hut.fi
-rw-r--r--ChangeLog7
-rw-r--r--README.privsep5
-rw-r--r--servconf.c5
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 550e443d..e8727e2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20030826
+ - (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint"
+ as deprecated. Remove mention from README.privsep. Patch from
+ aet AT cc.hut.fi
+
20030825
- (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from
larsch@trustcenter.de
@@ -869,4 +874,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2905 2003/08/25 05:01:04 dtucker Exp $
+$Id: ChangeLog,v 1.2906 2003/08/26 00:48:14 djm Exp $
diff --git a/README.privsep b/README.privsep
index e8bf1db3..64adad83 100644
--- a/README.privsep
+++ b/README.privsep
@@ -40,8 +40,7 @@ Compression will be disabled on systems without a working mmap MAP_ANON.
PAM-enabled OpenSSH is known to function with privsep on Linux.
It does not function on HP-UX with a trusted system
-configuration. PAMAuthenticationViaKbdInt does not function with
-privsep.
+configuration.
On Compaq Tru64 Unix, only the pre-authentication part of privsep is
supported. Post-authentication privsep is disabled automatically (so
@@ -62,4 +61,4 @@ process 1005 is the sshd process listening for new connections.
process 6917 is the privileged monitor process, 6919 is the user owned
sshd process and 6921 is the shell process.
-$Id: README.privsep,v 1.11 2003/03/21 01:18:09 mouring Exp $
+$Id: README.privsep,v 1.12 2003/08/26 00:48:15 djm Exp $
diff --git a/servconf.c b/servconf.c
index e9c313bb..09fdbf42 100644
--- a/servconf.c
+++ b/servconf.c
@@ -270,10 +270,11 @@ static struct {
} keywords[] = {
/* Portable-specific options */
#ifdef USE_PAM
- { "UsePAM", sUsePAM },
+ { "usepam", sUsePAM },
#else
- { "UsePAM", sUnsupported },
+ { "usepam", sUnsupported },
#endif
+ { "pamauthenticationviakbdint", sDeprecated },
/* Standard Options */
{ "port", sPort },
{ "hostkey", sHostKeyFile },