diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-add.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -6,6 +6,9 @@ | |||
6 | - deraadt@cvs.openbsd.org 2002/06/26 14:50:04 | 6 | - deraadt@cvs.openbsd.org 2002/06/26 14:50:04 |
7 | [monitor_fdpass.c] | 7 | [monitor_fdpass.c] |
8 | use ssize_t for recvmsg() and sendmsg() return | 8 | use ssize_t for recvmsg() and sendmsg() return |
9 | - markus@cvs.openbsd.org 2002/06/26 14:51:33 | ||
10 | [ssh-add.c] | ||
11 | fix exit code for -X/-x | ||
9 | 12 | ||
10 | 20020626 | 13 | 20020626 |
11 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM | 14 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM |
@@ -1178,4 +1181,4 @@ | |||
1178 | - (stevesk) entropy.c: typo in debug message | 1181 | - (stevesk) entropy.c: typo in debug message |
1179 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1182 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1180 | 1183 | ||
1181 | $Id: ChangeLog,v 1.2304 2002/06/27 00:21:03 mouring Exp $ | 1184 | $Id: ChangeLog,v 1.2305 2002/06/27 00:21:59 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.61 2002/06/19 00:27:55 deraadt Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.62 2002/06/26 14:51:33 markus Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -264,7 +264,7 @@ lock_agent(AuthenticationConnection *ac, int lock) | |||
264 | fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un"); | 264 | fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un"); |
265 | memset(p1, 0, strlen(p1)); | 265 | memset(p1, 0, strlen(p1)); |
266 | xfree(p1); | 266 | xfree(p1); |
267 | return -1; | 267 | return (ret); |
268 | } | 268 | } |
269 | 269 | ||
270 | static int | 270 | static int |