-(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

diff --git a/ChangeLog b/ChangeLog
index e3d02611d4be190196c72739facc61c7505d8287..0d20dbe8f98c52ca83fd98dc901fa4dc31bd552a 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/audit.c b/audit.c
index 688cea54abb6c62ffdb0472f05d68b2ecf08d978..6bc9f92b3486443e07cbf3c3a73959ef4f880ec9 100644 (file)
--- a/audit.c
+++ b/audit.c
@@ -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);
 }
 
 /*

diff --git a/auth1.c b/auth1.c
index 74e213d13d875ee863a77819f35b8d2b10a8295c..4bc2bf76d62d1d5794dabbb9cfe5b9be225ab37b 100644 (file)
--- a/auth1.c
+++ b/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);

diff --git a/auth2.c b/auth2.c
index 2265d311ecf5e51ba672c81ba423028a26459dbd..613b0e2bc9db9a234ba2ca0169ab84bd15256ec8 100644 (file)
--- a/auth2.c
+++ b/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

diff --git a/entropy.c b/entropy.c
index 431d5ea5c9d417882c61f0ac28894533ba903206..5e73495dde20416177b4eff669819a73db99f5f9 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -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 */

diff --git a/loginrec.c b/loginrec.c
index 76daaecb1c2aec1d99a98ed5cfde956139fe19e0..ab4df74cdd232467cbe63ee0132cf9e0a3af90aa 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -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

diff --git a/serverloop.c b/serverloop.c
index b0c4aafa0a02fdc8b557d9dbd482ae0c9ba52c3d..d2eff170a9042565450a7e65c28be0a147c4bdba 100644 (file)
--- a/serverloop.c
+++ b/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 {

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index d4abc63f1b0100cb9dde1ed082132e35f47f7407..d8517b1a32a7a0aae6d8840123392db2760ac7de 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -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;
        }