diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | README.privsep | 5 | ||||
-rw-r--r-- | servconf.c | 5 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20030826 | ||
2 | - (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint" | ||
3 | as deprecated. Remove mention from README.privsep. Patch from | ||
4 | aet AT cc.hut.fi | ||
5 | |||
1 | 20030825 | 6 | 20030825 |
2 | - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from | 7 | - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from |
3 | larsch@trustcenter.de | 8 | larsch@trustcenter.de |
@@ -869,4 +874,4 @@ | |||
869 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 874 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
870 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 875 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
871 | 876 | ||
872 | $Id: ChangeLog,v 1.2905 2003/08/25 05:01:04 dtucker Exp $ | 877 | $Id: ChangeLog,v 1.2906 2003/08/26 00:48:14 djm Exp $ |
diff --git a/README.privsep b/README.privsep index e8bf1db34..64adad83b 100644 --- a/README.privsep +++ b/README.privsep | |||
@@ -40,8 +40,7 @@ Compression will be disabled on systems without a working mmap MAP_ANON. | |||
40 | 40 | ||
41 | PAM-enabled OpenSSH is known to function with privsep on Linux. | 41 | PAM-enabled OpenSSH is known to function with privsep on Linux. |
42 | It does not function on HP-UX with a trusted system | 42 | It does not function on HP-UX with a trusted system |
43 | configuration. PAMAuthenticationViaKbdInt does not function with | 43 | configuration. |
44 | privsep. | ||
45 | 44 | ||
46 | On Compaq Tru64 Unix, only the pre-authentication part of privsep is | 45 | On Compaq Tru64 Unix, only the pre-authentication part of privsep is |
47 | supported. Post-authentication privsep is disabled automatically (so | 46 | supported. Post-authentication privsep is disabled automatically (so |
@@ -62,4 +61,4 @@ process 1005 is the sshd process listening for new connections. | |||
62 | process 6917 is the privileged monitor process, 6919 is the user owned | 61 | process 6917 is the privileged monitor process, 6919 is the user owned |
63 | sshd process and 6921 is the shell process. | 62 | sshd process and 6921 is the shell process. |
64 | 63 | ||
65 | $Id: README.privsep,v 1.11 2003/03/21 01:18:09 mouring Exp $ | 64 | $Id: README.privsep,v 1.12 2003/08/26 00:48:15 djm Exp $ |
diff --git a/servconf.c b/servconf.c index e9c313bbb..09fdbf424 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -270,10 +270,11 @@ static struct { | |||
270 | } keywords[] = { | 270 | } keywords[] = { |
271 | /* Portable-specific options */ | 271 | /* Portable-specific options */ |
272 | #ifdef USE_PAM | 272 | #ifdef USE_PAM |
273 | { "UsePAM", sUsePAM }, | 273 | { "usepam", sUsePAM }, |
274 | #else | 274 | #else |
275 | { "UsePAM", sUnsupported }, | 275 | { "usepam", sUnsupported }, |
276 | #endif | 276 | #endif |
277 | { "pamauthenticationviakbdint", sDeprecated }, | ||
277 | /* Standard Options */ | 278 | /* Standard Options */ |
278 | { "port", sPort }, | 279 | { "port", sPort }, |
279 | { "hostkey", sHostKeyFile }, | 280 | { "hostkey", sHostKeyFile }, |