From 3b59dfa161b52b41e5e0cacaf3db1510cfaaa319 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 21 Jun 2009 17:54:47 +1000
Subject:    - jj@cvs.openbsd.org 2009/04/14 21:10:54      [servconf.c]     
 Fixed a few the-the misspellings in comments. Skipped a bunch in     
 binutils,gcc and so on. ok jmc@

---
 servconf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'servconf.c')

diff --git a/servconf.c b/servconf.c
index e7fc2a781..af940cac2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.194 2009/01/22 10:02:34 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.195 2009/04/14 21:10:54 jj Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1376,7 +1376,7 @@ parse_server_match_config(ServerOptions *options, const char *user,
 /*
  * Copy any supported values that are set.
  *
- * If the preauth flag is set, we do not bother copying the the string or
+ * If the preauth flag is set, we do not bother copying the string or
  * array values that are not used pre-authentication, because any that we
  * do use must be explictly sent in mm_getpwnamallow().
  */
-- 
cgit v1.2.3


From 64cee36713d8094af37e3e2e5a7d38a8d25dff80 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 21 Jun 2009 20:26:17 +1000
Subject:  - (dtucker) [servconf.c sshd.c] More whitespace sync.

---
 ChangeLog  | 1 +
 servconf.c | 6 +++---
 sshd.c     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'servconf.c')

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 */
-- 
cgit v1.2.3