From fe46678b8432fe146881025ff6bf51f28ca18946 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Tue, 26 Aug 2003 00:48:14 +0000
Subject: [PATCH]  - (djm) Bug #629: Mark ssh_config option
 "pamauthenticationviakbdint"    as deprecated. Remove mention from
 README.privsep. Patch from    aet AT cc.hut.fi

---
 ChangeLog      | 5 +++++
 README.privsep | 3 +--
 servconf.c     | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abe22ad9..a142951c 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
diff --git a/README.privsep b/README.privsep
index 581bbefc..2f60236d 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
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 },
-- 
2.45.1