summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--servconf.c6
-rw-r--r--sshd.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 629c482df..5635d7aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,7 @@
107 Also: pull in the changes for 1.1->1.2 missed in the previous sync. 107 Also: pull in the changes for 1.1->1.2 missed in the previous sync.
108 - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and 108 - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
109 header-order changes to reduce diff vs OpenBSD. 109 header-order changes to reduce diff vs OpenBSD.
110 - (dtucker) [servconf.c sshd.c] More whitespace sync.
110 111
11120090616 11220090616
112 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t 113 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/servconf.c b/servconf.c
index af940cac2..b51b86a8f 100644
--- a/servconf.c
+++ b/servconf.c
@@ -343,7 +343,7 @@ static struct {
343 { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL }, 343 { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },
344 { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL }, 344 { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
345 { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL }, 345 { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
346 { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */ 346 { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
347#ifdef KRB5 347#ifdef KRB5
348 { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL }, 348 { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL },
349 { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL }, 349 { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL },
@@ -417,10 +417,10 @@ static struct {
417 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, 417 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
418 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, 418 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
419 { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, 419 { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
420 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL }, 420 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
421 { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, 421 { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
422 { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, 422 { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
423 { "match", sMatch, SSHCFG_ALL }, 423 { "match", sMatch, SSHCFG_ALL },
424 { "permitopen", sPermitOpen, SSHCFG_ALL }, 424 { "permitopen", sPermitOpen, SSHCFG_ALL },
425 { "forcecommand", sForceCommand, SSHCFG_ALL }, 425 { "forcecommand", sForceCommand, SSHCFG_ALL },
426 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, 426 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
diff --git a/sshd.c b/sshd.c
index 91831e208..13a455d1f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -578,7 +578,7 @@ demote_sensitive_data(void)
578static void 578static void
579privsep_preauth_child(void) 579privsep_preauth_child(void)
580{ 580{
581 u_int32_t rnd[256]; 581 u_int32_t rnd[256];
582 gid_t gidset[1]; 582 gid_t gidset[1];
583 583
584 /* Enable challenge-response authentication for privilege separation */ 584 /* Enable challenge-response authentication for privilege separation */