From: djm <djm>
Date: Thu, 15 May 2003 04:16:41 +0000 (+0000)
Subject:  - (djm) Enable UsePAM when built --with-pam
X-Git-Tag: PRE_KRB4_REMOVAL~168
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/1457e7ff18ba753df10188565e7a19dab0e438be

 - (djm) Enable UsePAM when built --with-pam
---

diff --git a/ChangeLog b/ChangeLog
index 7f4c5edb..1411b282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,12 +35,16 @@
      [sftp-int.c sftp.c]
      Teach ls how to display multiple column display and allow users 
      to return to single column format via 'ls -1'.  OK @djm
+   - jakob@cvs.openbsd.org 2003/05/15 04:08:44
+     [readconf.c servconf.c]
+     disable kerberos when not supported. ok markus@
  - (djm) Always parse UsePAM
  - (djm) Configure glue for DNS support (code doesn't work in portable yet)
  - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support)
  - (djm) Tidy Makefile clean targets
  - (djm) Adapt README.dns for portable
  - (djm) Avoid uuencode.c warnings
+ - (djm) Enable UsePAM when built --with-pam
 
 20030514
  - (djm) Bug #117: Don't lie to PAM about username
@@ -121,9 +125,6 @@
      http://bugzilla.mindrot.org/show_bug.cgi?id=560
      Privsep child continues to run after monitor killed.
      Pass monitor signals through to child; Darren Tucker
-   - jakob@cvs.openbsd.org 2003/05/15 04:08:44
-     [readconf.c servconf.c]
-     disable kerberos when not supported. ok markus@
  - (djm) Make portable build with MIT krb5 (some issues remain)
  - (djm) Add new UsePAM configuration directive to allow runtime control
    over usage of PAM. This allows non-root use of sshd when built with
diff --git a/servconf.c b/servconf.c
index 92d3170b..5840961e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -131,7 +131,11 @@ fill_default_server_options(ServerOptions *options)
 {
 	/* Portable-specific options */
 	if (options->use_pam == -1)
+#ifdef USE_PAM
+		options->use_pam = 1;
+#else
 		options->use_pam = 0;
+#endif
 
 	/* Standard Options */
 	if (options->protocol == SSH_PROTO_UNKNOWN)