diff options
author | Damien Miller <djm@mindrot.org> | 2003-05-15 14:16:41 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-05-15 14:16:41 +1000 |
commit | 156cbe8c67d1824745c17efe0ec42487be9a5d28 (patch) | |
tree | 655adce21814ecf040280ea525f90701bd09b5ab | |
parent | d248b5bd1bc1999a4d5d5ba7b433fc50e267baf6 (diff) |
- (djm) Enable UsePAM when built --with-pam
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | servconf.c | 4 |
2 files changed, 9 insertions, 4 deletions
@@ -35,12 +35,16 @@ | |||
35 | [sftp-int.c sftp.c] | 35 | [sftp-int.c sftp.c] |
36 | Teach ls how to display multiple column display and allow users | 36 | Teach ls how to display multiple column display and allow users |
37 | to return to single column format via 'ls -1'. OK @djm | 37 | to return to single column format via 'ls -1'. OK @djm |
38 | - jakob@cvs.openbsd.org 2003/05/15 04:08:44 | ||
39 | [readconf.c servconf.c] | ||
40 | disable kerberos when not supported. ok markus@ | ||
38 | - (djm) Always parse UsePAM | 41 | - (djm) Always parse UsePAM |
39 | - (djm) Configure glue for DNS support (code doesn't work in portable yet) | 42 | - (djm) Configure glue for DNS support (code doesn't work in portable yet) |
40 | - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support) | 43 | - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support) |
41 | - (djm) Tidy Makefile clean targets | 44 | - (djm) Tidy Makefile clean targets |
42 | - (djm) Adapt README.dns for portable | 45 | - (djm) Adapt README.dns for portable |
43 | - (djm) Avoid uuencode.c warnings | 46 | - (djm) Avoid uuencode.c warnings |
47 | - (djm) Enable UsePAM when built --with-pam | ||
44 | 48 | ||
45 | 20030514 | 49 | 20030514 |
46 | - (djm) Bug #117: Don't lie to PAM about username | 50 | - (djm) Bug #117: Don't lie to PAM about username |
@@ -121,9 +125,6 @@ | |||
121 | http://bugzilla.mindrot.org/show_bug.cgi?id=560 | 125 | http://bugzilla.mindrot.org/show_bug.cgi?id=560 |
122 | Privsep child continues to run after monitor killed. | 126 | Privsep child continues to run after monitor killed. |
123 | Pass monitor signals through to child; Darren Tucker | 127 | Pass monitor signals through to child; Darren Tucker |
124 | - jakob@cvs.openbsd.org 2003/05/15 04:08:44 | ||
125 | [readconf.c servconf.c] | ||
126 | disable kerberos when not supported. ok markus@ | ||
127 | - (djm) Make portable build with MIT krb5 (some issues remain) | 128 | - (djm) Make portable build with MIT krb5 (some issues remain) |
128 | - (djm) Add new UsePAM configuration directive to allow runtime control | 129 | - (djm) Add new UsePAM configuration directive to allow runtime control |
129 | over usage of PAM. This allows non-root use of sshd when built with | 130 | over usage of PAM. This allows non-root use of sshd when built with |
@@ -1519,4 +1520,4 @@ | |||
1519 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1520 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1520 | ok provos@ | 1521 | ok provos@ |
1521 | 1522 | ||
1522 | $Id: ChangeLog,v 1.2717 2003/05/15 04:15:23 djm Exp $ | 1523 | $Id: ChangeLog,v 1.2718 2003/05/15 04:16:41 djm Exp $ |
diff --git a/servconf.c b/servconf.c index 92d3170b2..5840961e3 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -131,7 +131,11 @@ fill_default_server_options(ServerOptions *options) | |||
131 | { | 131 | { |
132 | /* Portable-specific options */ | 132 | /* Portable-specific options */ |
133 | if (options->use_pam == -1) | 133 | if (options->use_pam == -1) |
134 | #ifdef USE_PAM | ||
135 | options->use_pam = 1; | ||
136 | #else | ||
134 | options->use_pam = 0; | 137 | options->use_pam = 0; |
138 | #endif | ||
135 | 139 | ||
136 | /* Standard Options */ | 140 | /* Standard Options */ |
137 | if (options->protocol == SSH_PROTO_UNKNOWN) | 141 | if (options->protocol == SSH_PROTO_UNKNOWN) |