diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:33:23 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:33:23 +0000 |
commit | afd3475ddf9e215d1e1948d1ec55723b8e9d42d6 (patch) | |
tree | b3255b90c42c70e2fb37b0275cfd7fe6cd2b02f2 | |
parent | b40204bf22e6e9fb71db567715009fe338ab05c2 (diff) |
- 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-- | ChangeLog | 5 | ||||
-rw-r--r-- | authfd.c | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -92,6 +92,9 @@ | |||
92 | - markus@cvs.openbsd.org 2001/02/28 21:31:32 | 92 | - markus@cvs.openbsd.org 2001/02/28 21:31:32 |
93 | [channels.c] | 93 | [channels.c] |
94 | typo | 94 | typo |
95 | - deraadt@cvs.openbsd.org 2001/03/01 02:11:25 | ||
96 | [authfd.c] | ||
97 | split line so that p will have an easier time next time around | ||
95 | 98 | ||
96 | 20010304 | 99 | 20010304 |
97 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 100 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4284,4 +4287,4 @@ | |||
4284 | - Wrote replacements for strlcpy and mkdtemp | 4287 | - Wrote replacements for strlcpy and mkdtemp |
4285 | - Released 1.0pre1 | 4288 | - Released 1.0pre1 |
4286 | 4289 | ||
4287 | $Id: ChangeLog,v 1.878 2001/03/05 06:29:44 mouring Exp $ | 4290 | $Id: ChangeLog,v 1.879 2001/03/05 06:33:23 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.35 2001/02/04 15:32:22 stevesk Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.36 2001/03/01 02:11:25 deraadt Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -75,10 +75,9 @@ ssh_get_authentication_socket(void) | |||
75 | 75 | ||
76 | sunaddr.sun_family = AF_UNIX; | 76 | sunaddr.sun_family = AF_UNIX; |
77 | strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); | 77 | strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); |
78 | #ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN | ||
79 | sunaddr.sun_len = len = SUN_LEN(&sunaddr)+1; | ||
80 | #else /* HAVE_SUN_LEN_IN_SOCKADDR_UN */ | ||
81 | len = SUN_LEN(&sunaddr)+1; | 78 | len = SUN_LEN(&sunaddr)+1; |
79 | #ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN | ||
80 | sunaddr.sun_len = len; | ||
82 | #endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */ | 81 | #endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */ |
83 | 82 | ||
84 | sock = socket(AF_UNIX, SOCK_STREAM, 0); | 83 | sock = socket(AF_UNIX, SOCK_STREAM, 0); |