summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:33:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:33:23 +0000
commitafd3475ddf9e215d1e1948d1ec55723b8e9d42d6 (patch)
treeb3255b90c42c70e2fb37b0275cfd7fe6cd2b02f2
parentb40204bf22e6e9fb71db567715009fe338ab05c2 (diff)
downloadopenssh-git-afd3475ddf9e215d1e1948d1ec55723b8e9d42d6.tar.gz
- deraadt@cvs.openbsd.org 2001/03/01 02:11:25
[authfd.c] split line so that p will have an easier time next time around
-rw-r--r--ChangeLog5
-rw-r--r--authfd.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bce6a537..3c3f8f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,9 @@
- markus@cvs.openbsd.org 2001/02/28 21:31:32
[channels.c]
typo
+ - deraadt@cvs.openbsd.org 2001/03/01 02:11:25
+ [authfd.c]
+ split line so that p will have an easier time next time around
20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4284,4 +4287,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.878 2001/03/05 06:29:44 mouring Exp $
+$Id: ChangeLog,v 1.879 2001/03/05 06:33:23 mouring Exp $
diff --git a/authfd.c b/authfd.c
index db877e43..74518e3f 100644
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.35 2001/02/04 15:32:22 stevesk Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.36 2001/03/01 02:11:25 deraadt Exp $");
#include <openssl/evp.h>
@@ -75,10 +75,9 @@ ssh_get_authentication_socket(void)
sunaddr.sun_family = AF_UNIX;
strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
-#ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN
- sunaddr.sun_len = len = SUN_LEN(&sunaddr)+1;
-#else /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
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);