summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--authfd.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae6de3f2a..7de7fdbf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
3 - djm@cvs.openbsd.org 2011/06/23 23:35:42 3 - djm@cvs.openbsd.org 2011/06/23 23:35:42
4 [monitor.c] 4 [monitor.c]
5 ignore EINTR errors from poll() 5 ignore EINTR errors from poll()
6 - tedu@cvs.openbsd.org 2011/07/06 18:09:21
7 [authfd.c]
8 bzero the agent address. the kernel was for a while very cranky about
9 these things. evne though that's fixed, always good to initialize
10 memory. ok deraadt djm
6 11
720110624 1220110624
8 - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for 13 - (djm) [configure.ac Makefile.in sandbox-darwin.c] Add a sandbox for
diff --git a/authfd.c b/authfd.c
index c942a9110..f037e838b 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.85 2011/05/15 08:09:01 djm Exp $ */ 1/* $OpenBSD: authfd.c,v 1.86 2011/07/06 18:09:21 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,6 +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 sunaddr.sun_family = AF_UNIX; 106 sunaddr.sun_family = AF_UNIX;
106 strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); 107 strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
107 108