- deraadt@cvs.openbsd.org 2006/03/20 18:26:55

     [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
     [ssh-rsa.c ssh.c sshlogin.c]
     annoying spacing fixes getting in the way of real diffs

diff --git a/ChangeLog b/ChangeLog
index b2ebb63bc3097931e4653fb7d8c35116bfc9dd5c..8ffc050f38df2d5e3091b4888b06eb7f5dad280b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,10 @@
      [auth1.c auth2.c sshd.c]
      sprinkle some ARGSUSED for table driven functions (which sometimes 
      must ignore their args)
+   - deraadt@cvs.openbsd.org 2006/03/20 18:26:55
+     [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
+     [ssh-rsa.c ssh.c sshlogin.c]
+     annoying spacing fixes getting in the way of real diffs
 
 20060325
  - OpenBSD CVS Sync

diff --git a/channels.c b/channels.c
index 6cb88ad44f6ceaa4794a9d553b8667cad65ae4a5..d16493001ffa8ac57026b9b669766f0d4ea094df 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -2877,7 +2877,7 @@ connect_local_xsocket(u_int dnr)
        memset(&addr, 0, sizeof(addr));
        addr.sun_family = AF_UNIX;
        snprintf(addr.sun_path, sizeof addr.sun_path, _PATH_UNIX_X, dnr);
-       if (connect(sock, (struct sockaddr *) & addr, sizeof(addr)) == 0)
+       if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0)
                return sock;
        close(sock);
        error("connect %.100s: %.100s", addr.sun_path, strerror(errno));

diff --git a/monitor.c b/monitor.c
index 11244d273cbd83836293da62d9606e5baffcb63c..db30305307db2ed3c0e7effba12c3b44501ecedc 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1226,7 +1226,7 @@ mm_record_login(Session *s, struct passwd *pw)
        fromlen = sizeof(from);
        if (packet_connection_is_on_socket()) {
                if (getpeername(packet_get_connection_in(),
-                       (struct sockaddr *) & from, &fromlen) < 0) {
+                       (struct sockaddr *)&from, &fromlen) < 0) {
                        debug("getpeername: %.100s", strerror(errno));
                        cleanup_exit(255);
                }

diff --git a/session.c b/session.c
index b71a2c71a883866b745447b660f855655e469328..b00caa54772fdc5f3bf1562e9935870b6c7d35a0 100644 (file)
--- a/session.c
+++ b/session.c
@@ -186,7 +186,7 @@ auth_input_request_forwarding(struct passwd * pw)
        sunaddr.sun_family = AF_UNIX;
        strlcpy(sunaddr.sun_path, auth_sock_name, sizeof(sunaddr.sun_path));
 
-       if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0)
+       if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0)
                packet_disconnect("bind: %.100s", strerror(errno));
 
        /* Restore the privileged uid. */
@@ -643,7 +643,7 @@ do_pre_login(Session *s)
        fromlen = sizeof(from);
        if (packet_connection_is_on_socket()) {
                if (getpeername(packet_get_connection_in(),
-                   (struct sockaddr *) & from, &fromlen) < 0) {
+                   (struct sockaddr *)&from, &fromlen) < 0) {
                        debug("getpeername: %.100s", strerror(errno));
                        cleanup_exit(255);
                }

diff --git a/ssh-agent.c b/ssh-agent.c
index 17914410c20814c8d1decf7356d1b9bddb86bd9a..7feb898dd8c178e47dd87098aeb022bf1126213e 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -887,7 +887,7 @@ after_select(fd_set *readset, fd_set *writeset)
                        if (FD_ISSET(sockets[i].fd, readset)) {
                                slen = sizeof(sunaddr);
                                sock = accept(sockets[i].fd,
-                                   (struct sockaddr *) &sunaddr, &slen);
+                                   (struct sockaddr *)&sunaddr, &slen);
                                if (sock < 0) {
                                        error("accept from AUTH_SOCKET: %s",
                                            strerror(errno));
@@ -1134,7 +1134,7 @@ main(int ac, char **av)
        sunaddr.sun_family = AF_UNIX;
        strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));
        prev_mask = umask(0177);
-       if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) {
+       if (bind(sock, (struct sockaddr *) &sunaddr, sizeof(sunaddr)) < 0) {
                perror("bind");
                *socket_name = '\0'; /* Don't unlink any existing file */
                umask(prev_mask);

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 126556466341e0883a70faafd4997f055cfd3276..e8a1d4b4be82376e164fe86f520def55bc38cb7d 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -105,7 +105,7 @@ ask_filename(struct passwd *pw, const char *prompt)
 
        if (key_type_name == NULL)
                name = _PATH_SSH_CLIENT_ID_RSA;
-       else
+       else {
                switch (key_type_from_name(key_type_name)) {
                case KEY_RSA1:
                        name = _PATH_SSH_CLIENT_IDENTITY;
@@ -121,7 +121,7 @@ ask_filename(struct passwd *pw, const char *prompt)
                        exit(1);
                        break;
                }
-
+       }
        snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
        fprintf(stderr, "%s (%s): ", prompt, identity_file);
        if (fgets(buf, sizeof(buf), stdin) == NULL)
@@ -316,7 +316,7 @@ get_line(FILE *fp, char *line, size_t len)
                        fprintf(stderr, "input line too long.\n");
                        exit(1);
                }
-               switch(c) {
+               switch (c) {
                case '\r':
                        c = fgetc(fp);
                        if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) {
@@ -1144,6 +1144,7 @@ main(int ac, char **av)
                        break;
                case 'D':
                        download = 1;
+                       /*FALLTHROUGH*/
                case 'U':
                        reader_id = optarg;
                        break;

diff --git a/ssh-rsa.c b/ssh-rsa.c
index 1520d7e1dd82236d8176f475fb084d2f3ba7bf5b..ce4195fead9484b545232b254856c9c1491e3994 100644 (file)
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -61,6 +61,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
 
        if (ok != 1) {
                int ecode = ERR_get_error();
+
                error("ssh_rsa_sign: RSA_sign failed: %s",
                    ERR_error_string(ecode, NULL));
                xfree(sig);

diff --git a/ssh.c b/ssh.c
index 550218444c448ebc3dc79cfc3cfa3e889d146565..2681ccb6bb48c8e9ff76a834cb8054bf48ab0db4 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1041,7 +1041,7 @@ ssh_control_listener(void)
                fatal("%s socket(): %s", __func__, strerror(errno));
 
        old_umask = umask(0177);
-       if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
+       if (bind(control_fd, (struct sockaddr *)&addr, addr_len) == -1) {
                control_fd = -1;
                if (errno == EINVAL || errno == EADDRINUSE)
                        fatal("ControlSocket %s already exists",
@@ -1299,7 +1299,7 @@ control_client(const char *path)
        if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
                fatal("%s socket(): %s", __func__, strerror(errno));
 
-       if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) {
+       if (connect(sock, (struct sockaddr *)&addr, addr_len) == -1) {
                if (mux_command != SSHMUX_COMMAND_OPEN) {
                        fatal("Control socket connect(%.100s): %s", path,
                            strerror(errno));

diff --git a/sshlogin.c b/sshlogin.c
index 718c9c412dd46a3b22340b2407ec235fe9db6cfd..95b850acbd13b5e26688dc1eb1513ed80fb204cc 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -102,7 +102,7 @@ store_lastlog_message(const char *user, uid_t uid)
  */
 void
 record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
-    const char *host, struct sockaddr * addr, socklen_t addrlen)
+    const char *host, struct sockaddr *addr, socklen_t addrlen)
 {
        struct logininfo *li;