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 @@
      Also: pull in the changes for 1.1->1.2 missed in the previous sync.
  - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
    header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
 
 20090616
  - (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 {
         { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },
         { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
         { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
-        { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL },  /* alias */
+        { "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
 #ifdef KRB5
         { "kerberosauthentication", sKerberosAuthentication, SSHCFG_ALL },
         { "kerberosorlocalpasswd", sKerberosOrLocalPasswd, SSHCFG_GLOBAL },
@@ -417,10 +417,10 @@ static struct {
         { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
         { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
         { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
-        { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL },
+        { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
         { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
         { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
-        { "match", sMatch, SSHCFG_ALL },
+        { "match", sMatch, SSHCFG_ALL },
         { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },
         { "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)
 static void
 privsep_preauth_child(void)
 {
-        u_int32_t rnd[256];
+        u_int32_t rnd[256];
         gid_t gidset[1];
 
         /* Enable challenge-response authentication for privilege separation */