- stevesk@cvs.openbsd.org 2001/09/19 19:35:30

     [authfd.c]
     use sizeof addr vs. SUN_LEN(addr) for sockaddr_un.  Stevens
     blesses this and we do it this way elsewhere.  this helps in
     portable because not all systems have SUN_LEN() and
     sockaddr_un.sun_len.  ok markus@

diff --git a/ChangeLog b/ChangeLog
index 6d40384d8d94d93066b890e17b75bcd5f5320c50..6efa931b69e7cb114cd635a46f4914af4d6faba5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
      [readconf.c readconf.h scp.c sftp.c ssh.1]
      add ClearAllForwardings ssh option and set it in scp and sftp; ok 
      markus@
+   - stevesk@cvs.openbsd.org 2001/09/19 19:35:30
+     [authfd.c]
+     use sizeof addr vs. SUN_LEN(addr) for sockaddr_un.  Stevens 
+     blesses this and we do it this way elsewhere.  this helps in 
+     portable because not all systems have SUN_LEN() and 
+     sockaddr_un.sun_len.  ok markus@
 
 20010918
  - (djm) Configure support for smartcards. Based on Ben's work.

diff --git a/authfd.c b/authfd.c
index 2eb4513d472d6f01c8b98c76b8dca9fca29a8c78..d6366ee36c748dbdfeca54ffd18bf64312a00006 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.44 2001/08/07 10:37:46 markus Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.45 2001/09/19 19:35:30 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -67,7 +67,7 @@ int
 ssh_get_authentication_socket(void)
 {
        const char *authsocket;
-       int sock, len;
+       int sock;
        struct sockaddr_un sunaddr;
 
        authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
@@ -76,10 +76,6 @@ ssh_get_authentication_socket(void)
 
        sunaddr.sun_family = AF_UNIX;
        strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
-       len = SUN_LEN(&sunaddr)+1;
-#ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN
-       sunaddr.sun_len = len;
-#endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
 
        sock = socket(AF_UNIX, SOCK_STREAM, 0);
        if (sock < 0)
@@ -90,7 +86,7 @@ ssh_get_authentication_socket(void)
                close(sock);
                return -1;
        }
-       if (connect(sock, (struct sockaddr *) & sunaddr, len) < 0) {
+       if (connect(sock, (struct sockaddr *) &sunaddr, sizeof sunaddr) < 0) {
                close(sock);
                return -1;
        }