1 files changed, 17 insertions, 17 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index c05c61468..e5232fc9b 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.111 2003/06/12 19:12:03 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -179,7 +179,7 @@ confirm_key(Identity *id)
         p = read_passphrase(prompt, RP_ALLOW_EOF);
         if (p != NULL) {
                 /*
-                 * Accept empty responses and responses consisting 
+                 * Accept empty responses and responses consisting
                  * of the word "yes" as affirmative.
                  */
                 if (*p == '\0' || *p == '\n' || strcasecmp(p, "yes") == 0)
@@ -784,7 +784,7 @@ process_message(SocketEntry *e)
 static void
 new_socket(sock_type type, int fd)
 {
-        u_int i, old_alloc;
+        u_int i, old_alloc, new_alloc;
 
         if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
                 error("fcntl O_NONBLOCK: %s", strerror(errno));
@@ -795,25 +795,26 @@ new_socket(sock_type type, int fd)
         for (i = 0; i < sockets_alloc; i++)
                 if (sockets[i].type == AUTH_UNUSED) {
                         sockets[i].fd = fd;
-                        sockets[i].type = type;
                         buffer_init(&sockets[i].input);
                         buffer_init(&sockets[i].output);
                         buffer_init(&sockets[i].request);
+                        sockets[i].type = type;
                         return;
                 }
         old_alloc = sockets_alloc;
-        sockets_alloc += 10;
+        new_alloc = sockets_alloc + 10;
         if (sockets)
-                sockets = xrealloc(sockets, sockets_alloc * sizeof(sockets[0]));
+                sockets = xrealloc(sockets, new_alloc * sizeof(sockets[0]));
         else
-                sockets = xmalloc(sockets_alloc * sizeof(sockets[0]));
-        for (i = old_alloc; i < sockets_alloc; i++)
+                sockets = xmalloc(new_alloc * sizeof(sockets[0]));
+        for (i = old_alloc; i < new_alloc; i++)
                 sockets[i].type = AUTH_UNUSED;
-        sockets[old_alloc].type = type;
+        sockets_alloc = new_alloc;
         sockets[old_alloc].fd = fd;
         buffer_init(&sockets[old_alloc].input);
         buffer_init(&sockets[old_alloc].output);
         buffer_init(&sockets[old_alloc].request);
+        sockets[old_alloc].type = type;
 }
 
 static int
@@ -948,7 +949,7 @@ after_select(fd_set *readset, fd_set *writeset)
 }
 
 static void
-cleanup_socket(void *p)
+cleanup_socket(void)
 {
         if (socket_name[0])
                 unlink(socket_name);
@@ -956,17 +957,17 @@ cleanup_socket(void *p)
                 rmdir(socket_dir);
 }
 
-static void
+void
 cleanup_exit(int i)
 {
-        cleanup_socket(NULL);
-        exit(i);
+        cleanup_socket();
+        _exit(i);
 }
 
 static void
 cleanup_handler(int sig)
 {
-        cleanup_socket(NULL);
+        cleanup_socket();
         _exit(2);
 }
 
@@ -1099,7 +1100,7 @@ main(int ac, char **av)
 
         if (agentsocket == NULL) {
                 /* Create private directory for agent socket */
-                strlcpy(socket_dir, "/tmp/ssh-XXXXXXXX", sizeof socket_dir);
+                strlcpy(socket_dir, "/tmp/ssh-XXXXXXXXXX", sizeof socket_dir);
                 if (mkdtemp(socket_dir) == NULL) {
                         perror("mkdtemp: private socket dir");
                         exit(1);
@@ -1137,7 +1138,7 @@ main(int ac, char **av)
 #ifdef HAVE_CYGWIN
         umask(prev_mask);
 #endif
-        if (listen(sock, 128) < 0) {
+        if (listen(sock, SSH_LISTEN_BACKLOG) < 0) {
                 perror("listen");
                 cleanup_exit(1);
         }
@@ -1208,7 +1209,6 @@ main(int ac, char **av)
 #endif
 
 skip:
-        fatal_add_cleanup(cleanup_socket, NULL);
         new_socket(AUTH_SOCKET, sock);
         if (ac > 0) {
                 mysignal(SIGALRM, check_parent_exists);