summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshconnect2.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f322ebb6e..5baca853d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
11 - dtucker@cvs.openbsd.org 2013/05/06 07:35:12 11 - dtucker@cvs.openbsd.org 2013/05/06 07:35:12
12 [sftp-server.8] 12 [sftp-server.8]
13 Reference the version of the sftp draft we actually implement. ok djm@ 13 Reference the version of the sftp draft we actually implement. ok djm@
14 - djm@cvs.openbsd.org 2013/05/10 03:40:07
15 [sshconnect2.c]
16 fix bzero(ptr_to_struct, sizeof(ptr_to_struct)); bz#2100 from
14 17
1520130510 1820130510
16 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler 19 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
diff --git a/sshconnect2.c b/sshconnect2.c
index c811c3652..c01efe38c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.194 2013/04/05 00:14:00 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.195 2013/05/10 03:40:07 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1409,7 +1409,7 @@ pubkey_prepare(Authctxt *authctxt)
1409 /* If IdentitiesOnly set and key not found then don't use it */ 1409 /* If IdentitiesOnly set and key not found then don't use it */
1410 if (!found && options.identities_only) { 1410 if (!found && options.identities_only) {
1411 TAILQ_REMOVE(&files, id, next); 1411 TAILQ_REMOVE(&files, id, next);
1412 bzero(id, sizeof(id)); 1412 bzero(id, sizeof(*id));
1413 free(id); 1413 free(id);
1414 } 1414 }
1415 } 1415 }