unexpand

diff --git a/auth-krb5.c b/auth-krb5.c
index 76c2419aa1f2f120ee98d8c2723593649abd95be..308a6d5f9bad6ba997e0db05c5ba065a0fabc976 100644 (file)
--- 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 3ac690135ca3eaa89d1b320bfa4c302dec82a720..cca138c2b8068b1a65294e87ed31951343957bd6 100644 (file)
--- 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 15945a80d0b48019aae8af445a332543c7b16cf9..aa8e9bedb89f3182eb60b4eeba302dd697da1b1f 100644 (file)
--- 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 578ffbeb35812b6a160c9e4735afec6571fff20a..5050a4f1f369a359f20e7656513df21c01f0ab99 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -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 db38de6acff62fc6c241be307aca78ac752285ef..5ed64f86ecca288a8b3a3801c53f6d3f94412995 100644 (file)
--- 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 8c6cdadad2a30caa41c260fabb7cd7022e29b1f2..dcecf1ae34c115d1ba3036450ccdbe692970c349 100644 (file)
--- 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 0d42696ae4459a2e6cf4586c2a035c89e1639999..2f9faff18d1987cf4c16b48493a2329b13cd08e2 100644 (file)
--- 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 9a6488fa13971fa9214ba73d5875ffffc1918986..f941d18faae581b8d92fb11575e955332696206c 100644 (file)
--- 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 56db292ba375ecd60252a12b7f71d1f0ed413059..06e4d231655c8ebe7d9769b46cde98299877dfa9 100644 (file)
--- 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 250e53e14b1a316665b5645d914c47e3922538aa..5d26200e542cd010be292c3bae2152a33f9fd5f3 100644 (file)
--- 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 660294bc9a0c6fd41dca0a8fe3a44eaaa4d4526d..78929b2e0a4051b6de68e90583420da9205b3574 100644 (file)
--- 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 72a818f91f03be42f814809216c178fd14003ce6..da78a09a6362fedac99739681b86d84aa0f2709d 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -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 ad34ee64abf3c4814fa80b7c764f3dcc7eaa429a..134b59af934d9929dac1729ee19b0588bbffa034 100644 (file)
--- 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 91de759390994055af2d4798687d4623736fd2c1..a7e7e27693bb856c0849cdfeee6c2a5e1e42f2d1 100644 (file)
--- 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. */