summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-08 18:04:36 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-08 18:04:36 +0000
commitd5730a8b858bdab06f3162ab89c001e63c2b954d (patch)
tree044b552b22dadd8b3a5d26de1b94609666601a35
parent49e57a871abf4304b96bdd4abc5f5872cdd913ea (diff)
- markus@cvs.openbsd.org 2001/04/08 13:03:00
[ssh-add.c] init pointers with NULL, thanks to danimal@danimal.org
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f6d4c4447..ac7bca633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - stevesk@cvs.openbsd.org 2001/04/08 16:01:36 3 - stevesk@cvs.openbsd.org 2001/04/08 16:01:36
4 [sshd.8] 4 [sshd.8]
5 document ListenAddress addr:port 5 document ListenAddress addr:port
6 - markus@cvs.openbsd.org 2001/04/08 13:03:00
7 [ssh-add.c]
8 init pointers with NULL, thanks to danimal@danimal.org
6 9
720010408 1020010408
8 - OpenBSD CVS Sync 11 - OpenBSD CVS Sync
@@ -4943,4 +4946,4 @@
4943 - Wrote replacements for strlcpy and mkdtemp 4946 - Wrote replacements for strlcpy and mkdtemp
4944 - Released 1.0pre1 4947 - Released 1.0pre1
4945 4948
4946$Id: ChangeLog,v 1.1080 2001/04/08 18:02:43 mouring Exp $ 4949$Id: ChangeLog,v 1.1081 2001/04/08 18:04:36 mouring Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 05ff4cab8..eaa773816 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.31 2001/03/26 08:07:08 markus Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.32 2001/04/08 13:03:00 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -59,7 +59,7 @@ void
59delete_file(AuthenticationConnection *ac, const char *filename) 59delete_file(AuthenticationConnection *ac, const char *filename)
60{ 60{
61 Key *public; 61 Key *public;
62 char *comment; 62 char *comment = NULL;
63 63
64 public = key_load_public(filename, &comment); 64 public = key_load_public(filename, &comment);
65 if (public == NULL) { 65 if (public == NULL) {
@@ -136,7 +136,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
136{ 136{
137 struct stat st; 137 struct stat st;
138 Key *private; 138 Key *private;
139 char *comment, *askpass = NULL, *pass; 139 char *comment = NULL, *askpass = NULL, *pass;
140 char buf[1024], msg[1024]; 140 char buf[1024], msg[1024];
141 int interactive = isatty(STDIN_FILENO); 141 int interactive = isatty(STDIN_FILENO);
142 142