- Merged OpenBSD updates to include paths.

[openssh.git] / ssh-agent.c

diff --git a/ssh-agent.c b/ssh-agent.c
index d224386c823ba42a4cfc7b17fb16e940a664e7c9..ecb44a229d9d9bfdb33d6647d1780b5dd4a3056c 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -9,7 +9,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.27 2000/04/12 09:39:10 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -417,6 +417,7 @@ after_select(fd_set *readset, fd_set *writeset)
 {
        unsigned int i;
        int len, sock;
+       socklen_t slen;
        char buf[1024];
        struct sockaddr_un sunaddr;
 
@@ -426,8 +427,8 @@ after_select(fd_set *readset, fd_set *writeset)
                        break;
                case AUTH_SOCKET:
                        if (FD_ISSET(sockets[i].fd, readset)) {
-                               len = sizeof(sunaddr);
-                               sock = accept(sockets[i].fd, (struct sockaddr *) & sunaddr, &len);
+                               slen = sizeof(sunaddr);
+                               sock = accept(sockets[i].fd, (struct sockaddr *) & sunaddr, &slen);
                                if (sock < 0) {
                                        perror("accept from AUTH_SOCKET");
                                        break;
@@ -645,6 +646,8 @@ main(int ac, char **av)
        }
        signal(SIGINT, SIG_IGN);
        signal(SIGPIPE, SIG_IGN);
+       signal(SIGHUP, cleanup_exit);                                          
+       signal(SIGTERM, cleanup_exit);                                          
        while (1) {
                FD_ZERO(&readset);
                FD_ZERO(&writeset);