-(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c]

[ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too

ChangeLog

@@ -22,6 +22,8 @@
      [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c]
      [sshconnect.c sshconnect2.c]
      knf says that a 2nd level indent is four (not three or five) spaces
+ -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c]
+  [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too
 
 20050716
  - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
@@ -2855,4 +2857,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.3851 2005/07/17 07:22:45 djm Exp $
+$Id: ChangeLog,v 1.3852 2005/07/17 07:26:43 djm Exp $

audit.c

@@ -1,4 +1,4 @@
-/* $Id: audit.c,v 1.2 2005/02/08 10:52:48 dtucker Exp $ */
+/* $Id: audit.c,v 1.3 2005/07/17 07:26:44 djm Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
@@ -120,7 +120,7 @@ void
 audit_connection_from(const char *host, int port)
 {
 	debug("audit connection from %s port %d euid %d", host, port,
-	   (int)geteuid());
+	    (int)geteuid());
 }
 
 /*
@@ -147,7 +147,7 @@ audit_session_open(const char *ttyn)
 	const char *t = ttyn ? ttyn : "(no tty)";
 
 	debug("audit session open euid %d user %s tty name %s", geteuid(),
-	     audit_username(), t);
+	    audit_username(), t);
 }
 
 /*
@@ -163,7 +163,7 @@ audit_session_close(const char *ttyn)
 	const char *t = ttyn ? ttyn : "(no tty)";
 
 	debug("audit session close euid %d user %s tty name %s", geteuid(),
-	     audit_username(), t);
+	    audit_username(), t);
 }
 
 /*

auth1.c

@@ -323,7 +323,7 @@ do_authloop(Authctxt *authctxt)
 			size_t len;
 
 			error("Access denied for user %s by PAM account "
-			   "configuration", authctxt->user);
+			    "configuration", authctxt->user);
 			len = buffer_len(&loginmsg);
 			buffer_append(&loginmsg, "\0", 1);
 			msg = buffer_ptr(&loginmsg);

auth2.c

@@ -234,7 +234,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
 				packet_write_wait();
 			}
 			fatal("Access denied for user %s by PAM account "
-			   "configuration", authctxt->user);
+			    "configuration", authctxt->user);
 		}
 	}
 #endif

entropy.c

@@ -45,7 +45,7 @@
  * XXX: we should tell the child how many bytes we need.
  */
 
-RCSID("$Id: entropy.c,v 1.48 2003/11/21 12:56:47 djm Exp $");
+RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $");
 
 #ifndef OPENSSL_PRNG_ONLY
 #define RANDOM_SEED_SIZE 48
@@ -114,8 +114,8 @@ seed_rng(void)
 	close(p[0]);
 
 	if (waitpid(pid, &ret, 0) == -1)
-	       fatal("Couldn't wait for ssh-rand-helper completion: %s",
-		   strerror(errno));
+		fatal("Couldn't wait for ssh-rand-helper completion: %s",
+		    strerror(errno));
 	signal(SIGCHLD, old_sigchld);
 
 	/* We don't mind if the child exits upon a SIGPIPE */

loginrec.c

@@ -165,7 +165,7 @@
 # include <libutil.h>
 #endif
 
-RCSID("$Id: loginrec.c,v 1.69 2005/07/17 07:04:47 djm Exp $");
+RCSID("$Id: loginrec.c,v 1.70 2005/07/17 07:26:44 djm Exp $");
 
 /**
  ** prototypes for helper functions in this file
@@ -444,7 +444,8 @@ login_write(struct logininfo *li)
 #endif
 #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN
 	if (li->type == LTYPE_LOGIN &&
-	   !sys_auth_record_login(li->username,li->hostname,li->line, &loginmsg))
+	    !sys_auth_record_login(li->username,li->hostname,li->line,
+	    &loginmsg))
 		logit("Writing login record failed for %s", li->username);
 #endif
 #ifdef SSH_AUDIT_EVENTS

serverloop.c

@@ -983,7 +983,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
 #ifndef NO_IPPORT_RESERVED_CONCEPT
 		    || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0)
 #endif
-		   ) {
+		    ) {
 			success = 0;
 			packet_send_debug("Server has disabled port forwarding.");
 		} else {

ssh-rand-helper.c

@@ -39,7 +39,7 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.25 2005/07/17 07:04:47 djm Exp $");
+RCSID("$Id: ssh-rand-helper.c,v 1.26 2005/07/17 07:26:44 djm Exp $");
 
 /* Number of bytes we write out */
 #define OUTPUT_SEED_SIZE	48
@@ -398,8 +398,8 @@ hash_command_output(entropy_cmd_t *src, unsigned char *hash)
 	debug3("Time elapsed: %d msec", msec_elapsed);
 
 	if (waitpid(pid, &status, 0) == -1) {
-	       error("Couldn't wait for child '%s' completion: %s",
-		   src->cmdstring, strerror(errno));
+		error("Couldn't wait for child '%s' completion: %s",
+		    src->cmdstring, strerror(errno));
 		return 0.0;
 	}