summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-23 22:12:38 +1000
committerDamien Miller <djm@mindrot.org>2003-09-23 22:12:38 +1000
commit5c3a55846a87a40d10aaf08123e4101388d22b87 (patch)
treea45c4d5280d6302b64e7f6565715bb358e62102d /servconf.c
parent7ff4e6dbe588aab63f1547e917734730f388aaa4 (diff)
- (djm) Sync with V_3_7 branch:
- (djm) Fix SSH1 challenge kludge - (djm) Bug #671: Fix builds on OpenBSD - (djm) Bug #676: Fix PAM stack corruption - (djm) Fix bad free() in PAM code - (djm) Don't call pam_end before pam_init - (djm) Enable build with old OpenSSL again - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index 71e28b3cb..58f49a2f4 100644
--- a/servconf.c
+++ b/servconf.c
@@ -110,7 +110,7 @@ fill_default_server_options(ServerOptions *options)
110{ 110{
111 /* Portable-specific options */ 111 /* Portable-specific options */
112 if (options->use_pam == -1) 112 if (options->use_pam == -1)
113 options->use_pam = 1; 113 options->use_pam = 0;
114 114
115 /* Standard Options */ 115 /* Standard Options */
116 if (options->protocol == SSH_PROTO_UNKNOWN) 116 if (options->protocol == SSH_PROTO_UNKNOWN)