diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
tree | 86848a7668424b392d48791a0e41e05f9df7b62b /authfd.c | |
parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.91 2013/12/29 04:29:25 djm Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.92 2014/01/31 16:39:19 tedu Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -102,7 +102,7 @@ ssh_get_authentication_socket(void) | |||
102 | if (!authsocket) | 102 | if (!authsocket) |
103 | return -1; | 103 | return -1; |
104 | 104 | ||
105 | bzero(&sunaddr, sizeof(sunaddr)); | 105 | memset(&sunaddr, 0, sizeof(sunaddr)); |
106 | sunaddr.sun_family = AF_UNIX; | 106 | sunaddr.sun_family = AF_UNIX; |
107 | strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); | 107 | strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); |
108 | 108 | ||