RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Ben Lindstrom 2001-09-20 01:03:31 +00:00
parent 2b7a0e953e
commit b1d822c311
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.
@ -6517,4 +6523,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.1544 2001/09/20 00:57:55 mouring Exp $
$Id: ChangeLog,v 1.1545 2001/09/20 01:03:31 mouring Exp $

10
authfd.c
View File

@ -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;
}