summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-16 11:42:35 +1000
committerDamien Miller <djm@mindrot.org>2003-05-16 11:42:35 +1000
commit6ac2c48a195fd0c2bed1e8284e0658a4aae66756 (patch)
tree3722ae6821eedff10de52f3a0ee7d39b8e0be165 /servconf.c
parentb78d5eb6c58d54fb9972afe487ad94e63cc7d5c7 (diff)
- (djm) Add warning for UsePAM when built without PAM support
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/servconf.c b/servconf.c
index f37193a8f..a737f4b46 100644
--- a/servconf.c
+++ b/servconf.c
@@ -131,11 +131,7 @@ 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; 134 options->use_pam = 1;
136#else
137 options->use_pam = 0;
138#endif
139 135
140 /* Standard Options */ 136 /* Standard Options */
141 if (options->protocol == SSH_PROTO_UNKNOWN) 137 if (options->protocol == SSH_PROTO_UNKNOWN)
@@ -299,7 +295,11 @@ static struct {
299 ServerOpCodes opcode; 295 ServerOpCodes opcode;
300} keywords[] = { 296} keywords[] = {
301 /* Portable-specific options */ 297 /* Portable-specific options */
298#ifdef USE_PAM
302 { "UsePAM", sUsePAM }, 299 { "UsePAM", sUsePAM },
300#else
301 { "UsePAM", sUnsupported },
302#endif
303 /* Standard Options */ 303 /* Standard Options */
304 { "port", sPort }, 304 { "port", sPort },
305 { "hostkey", sHostKeyFile }, 305 { "hostkey", sHostKeyFile },