3 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 95d2b76f8..25b4adae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
    - stevesk@cvs.openbsd.org 2006/02/08 12:32:49
      [includes.h misc.c]
      move #include <netinet/tcp.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/08 13:15:44
+     [gss-serv.c monitor.c]
+     small KNF
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3935,4 +3938,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4149 2006/03/15 00:19:42 djm Exp $
+$Id: ChangeLog,v 1.4150 2006/03/15 00:20:03 djm Exp $
diff --git a/gss-serv.c b/gss-serv.c
index 26eec25bd..56e33d6a2 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $   */
+/*      $OpenBSD: gss-serv.c,v 1.14 2006/02/08 13:15:44 stevesk Exp $   */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -175,7 +175,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
                 return GSS_S_FAILURE;
 
         name->value = xmalloc(name->length+1);
-        memcpy(name->value, tok+offset,name->length);
+        memcpy(name->value, tok+offset, name->length);
         ((char *)name->value)[name->length] = 0;
 
         return GSS_S_COMPLETE;
@@ -234,7 +234,8 @@ ssh_gssapi_cleanup_creds(void)
 {
         if (gssapi_client.store.filename != NULL) {
                 /* Unlink probably isn't sufficient */
-                debug("removing gssapi cred file\"%s\"", gssapi_client.store.filename);
+                debug("removing gssapi cred file\"%s\"",
+                    gssapi_client.store.filename);
                 unlink(gssapi_client.store.filename);
         }
 }
diff --git a/monitor.c b/monitor.c
index 1d6fcf1d8..4ba78db9c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.65 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.66 2006/02/08 13:15:44 stevesk Exp $");
 
 #include <paths.h>
 
@@ -198,7 +198,7 @@ struct mon_table mon_dispatch_proto20[] = {
 #endif
 #ifdef BSD_AUTH
     {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},
-    {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond},
+    {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH, mm_answer_bsdauthrespond},
 #endif
 #ifdef SKEY
     {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery},
@@ -239,7 +239,7 @@ struct mon_table mon_dispatch_proto15[] = {
     {MONITOR_REQ_RSARESPONSE, MON_ONCE|MON_AUTHDECIDE, mm_answer_rsa_response},
 #ifdef BSD_AUTH
     {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},
-    {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond},
+    {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH, mm_answer_bsdauthrespond},
 #endif
 #ifdef SKEY
     {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery},