- (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint"

   as deprecated. Remove mention from README.privsep. Patch from
   aet AT cc.hut.fi

diff --git a/ChangeLog b/ChangeLog
index abe22ad9e47a0a7b2fc72545ab6dde9a8ac20155..a142951c780654d343afd47a949486baa6160bda 100644 (file)
--- 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

diff --git a/README.privsep b/README.privsep
index 581bbefc414767b3cf77d9a38c2c57840fb96fae..2f60236dbe06ea82d1921b0fddab06a945ee97e5 100644 (file)
--- 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

diff --git a/servconf.c b/servconf.c
index e9c313bbbab78b0f06ce6a9320fee32a60c0f9a9..09fdbf42416d4d18020d0a986ea5d84832cf66c6 100644 (file)
--- 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 },