14 files changed, 27 insertions, 27 deletions

diff --git a/auth-krb5.c b/auth-krb5.c
index 76c2419aa..308a6d5f9 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -323,7 +323,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
         
         if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, 
                           authctxt->pw->pw_name)) {
-                problem = -1;
+                problem = -1;
                 goto out;
         } 
 
diff --git a/channels.c b/channels.c
index 3ac690135..cca138c2b 100644
--- a/channels.c
+++ b/channels.c
@@ -707,8 +707,8 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset)
                         FD_SET(c->wfd, writeset);
                 } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
                         if (CHANNEL_EFD_OUTPUT_ACTIVE(c))
-                               debug2("channel %d: obuf_empty delayed efd %d/(%d)",
-                                   c->self, c->efd, buffer_len(&c->extended));
+                               debug2("channel %d: obuf_empty delayed efd %d/(%d)",
+                                   c->self, c->efd, buffer_len(&c->extended));
                         else
                                 chan_obuf_empty(c);
                 }
@@ -1641,8 +1641,8 @@ channel_output_poll(void)
                          * hack for extended data: delay EOF if EFD still in use.
                          */
                         if (CHANNEL_EFD_INPUT_ACTIVE(c))
-                               debug2("channel %d: ibuf_empty delayed efd %d/(%d)",
-                                   c->self, c->efd, buffer_len(&c->extended));
+                               debug2("channel %d: ibuf_empty delayed efd %d/(%d)",
+                                   c->self, c->efd, buffer_len(&c->extended));
                         else
                                 chan_ibuf_empty(c);
                 }
diff --git a/clientloop.c b/clientloop.c
index 15945a80d..aa8e9bedb 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -481,7 +481,7 @@ process_cmdline(void)
         int local = 0;
 
         leave_raw_mode();
-        handler = signal(SIGINT, SIG_IGN);
+        handler = signal(SIGINT, SIG_IGN);
         cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
         if (s == NULL)
                 goto out;
diff --git a/entropy.c b/entropy.c
index da1a391f3..dcc8689c9 100644
--- a/entropy.c
+++ b/entropy.c
@@ -45,7 +45,7 @@
  * XXX: we should tell the child how many bytes we need.
  */
 
-RCSID("$Id: entropy.c,v 1.43 2002/04/21 18:26:10 tim Exp $");
+RCSID("$Id: entropy.c,v 1.44 2002/06/09 19:41:48 mouring Exp $");
 
 #ifndef OPENSSL_PRNG_ONLY
 #define RANDOM_SEED_SIZE 48
@@ -115,7 +115,7 @@ seed_rng(void)
 
         if (waitpid(pid, &ret, 0) == -1)
                fatal("Couldn't wait for ssh-rand-helper completion: %s", 
-                   strerror(errno));
+                   strerror(errno));
         mysignal(SIGCHLD, old_sigchld);
 
         /* We don't mind if the child exits upon a SIGPIPE */
diff --git a/nchan.c b/nchan.c
index db38de6ac..5ed64f86e 100644
--- a/nchan.c
+++ b/nchan.c
@@ -411,8 +411,8 @@ chan_is_dead(Channel *c, int send)
             c->extended_usage == CHAN_EXTENDED_WRITE &&
             c->efd != -1 &&
             buffer_len(&c->extended) > 0) {
-                debug2("channel %d: active efd: %d len %d",
-                    c->self, c->efd, buffer_len(&c->extended));
+                debug2("channel %d: active efd: %d len %d",
+                    c->self, c->efd, buffer_len(&c->extended));
                 return 0;
         }
         if (!(c->flags & CHAN_CLOSE_SENT)) {
diff --git a/session.c b/session.c
index 8c6cdadad..dcecf1ae3 100644
--- a/session.c
+++ b/session.c
@@ -1120,7 +1120,7 @@ launch_login(struct passwd *pw, const char *hostname)
 
         execl(LOGIN_PROGRAM, "login", "-h", hostname,
 #ifdef xxxLOGIN_NEEDS_TERM
-                    (s->term ? s->term : "unknown"),
+                    (s->term ? s->term : "unknown"),
 #endif /* LOGIN_NEEDS_TERM */
 #ifdef LOGIN_NO_ENDOPT
             "-p", "-f", pw->pw_name, (char *)NULL);
diff --git a/sftp-client.c b/sftp-client.c
index 0d42696ae..2f9faff18 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1061,7 +1061,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
 
                 if (id == startid || len == 0 ||
                     id - ackid >= conn->num_requests) {
-                        u_int r_id;
+                        u_int r_id;
 
                         buffer_clear(&msg);
                         get_msg(conn->fd_in, &msg);
diff --git a/sftp.c b/sftp.c
index 9a6488fa1..f941d18fa 100644
--- a/sftp.c
+++ b/sftp.c
@@ -238,8 +238,8 @@ main(int argc, char **argv)
         interactive_loop(in, out, file1, file2);
 
 #if !defined(USE_PIPES)
-        shutdown(in, SHUT_RDWR);
-        shutdown(out, SHUT_RDWR);
+        shutdown(in, SHUT_RDWR);
+        shutdown(out, SHUT_RDWR);
 #endif
 
         close(in);
diff --git a/ssh-agent.c b/ssh-agent.c
index 56db292ba..06e4d2316 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -617,7 +617,7 @@ process_remove_smartcard_key(SocketEntry *e)
                 version = k->type == KEY_RSA1 ? 1 : 2;
                 if ((id = lookup_identity(k, version)) != NULL) {
                         tab = idtab_lookup(version);
-                        TAILQ_REMOVE(&tab->idlist, id, next);
+                        TAILQ_REMOVE(&tab->idlist, id, next);
                         tab->nentries--;
                         free_identity(id);
                         success = 1;
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 250e53e14..5d26200e5 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -416,7 +416,7 @@ do_upload(struct passwd *pw, const char *sc_reader_id)
         key_free(prv);
         if (ret < 0)
                 exit(1);
-        log("loading key done");
+        log("loading key done");
         exit(0);
 }
 
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 660294bc9..78929b2e0 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -143,9 +143,9 @@ main(int argc, char **argv)
         seteuid(getuid());
         setuid(getuid());
 
-        init_rng();
-        seed_rng();
-        arc4random_stir();
+        init_rng();
+        seed_rng();
+        arc4random_stir();
 
 #ifdef DEBUG_SSH_KEYSIGN
         log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 8f2283ead..364d5d270 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.6 2002/04/14 09:27:13 djm Exp $");
+RCSID("$Id: ssh-rand-helper.c,v 1.7 2002/06/09 19:41:49 mouring Exp $");
 
 /* Number of bytes we write out */
 #define OUTPUT_SEED_SIZE        48
@@ -391,7 +391,7 @@ hash_command_output(entropy_cmd_t *src, char *hash)
 
         if (waitpid(pid, &status, 0) == -1) {
                error("Couldn't wait for child '%s' completion: %s",
-                   src->cmdstring, strerror(errno));
+                   src->cmdstring, strerror(errno));
                 return 0.0;
         }
 
diff --git a/sshconnect.h b/sshconnect.h
index ad34ee64a..134b59af9 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -28,9 +28,9 @@
 
 typedef struct Sensitive Sensitive;
 struct Sensitive {
-        Key     **keys;
-        int     nkeys;
-        int     external_keysign;
+        Key     **keys;
+        int     nkeys;
+        int     external_keysign;
 };
 
 int
diff --git a/sshpty.c b/sshpty.c
index 91de75939..a7e7e2769 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -164,8 +164,8 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 #else /* HAVE_DEV_PTS_AND_PTC */
 #ifdef _CRAY
         char buf[64];
-        int i;
-        int highpty;
+        int i;
+        int highpty;
 
 #ifdef _SC_CRAY_NPTY
         highpty = sysconf(_SC_CRAY_NPTY);
@@ -289,7 +289,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
         if (fd < 0)
                 error("%.100s: %.100s", ttyname, strerror(errno));
         close(*ttyfd);
-        *ttyfd = fd;
+        *ttyfd = fd;
 #else /* _CRAY */
 
         /* First disconnect from the old controlling tty. */