summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh.c b/ssh.c
index f9c6252d3..7e23acff6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.306 2007/11/03 01:24:06 deraadt Exp $ */ 1/* $OpenBSD: ssh.c,v 1.307 2007/11/03 02:00:32 dtucker 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
@@ -1260,8 +1260,8 @@ load_public_identity_files(void)
1260#endif /* SMARTCARD */ 1260#endif /* SMARTCARD */
1261 if ((pw = getpwuid(original_real_uid)) == NULL) 1261 if ((pw = getpwuid(original_real_uid)) == NULL)
1262 fatal("load_public_identity_files: getpwuid failed"); 1262 fatal("load_public_identity_files: getpwuid failed");
1263 pwname = strdup(pw->pw_name); 1263 pwname = xstrdup(pw->pw_name);
1264 pwdir = strdup(pw->pw_dir); 1264 pwdir = xstrdup(pw->pw_dir);
1265 if (gethostname(thishost, sizeof(thishost)) == -1) 1265 if (gethostname(thishost, sizeof(thishost)) == -1)
1266 fatal("load_public_identity_files: gethostname: %s", 1266 fatal("load_public_identity_files: gethostname: %s",
1267 strerror(errno)); 1267 strerror(errno));
@@ -1280,9 +1280,9 @@ load_public_identity_files(void)
1280 options.identity_keys[i] = public; 1280 options.identity_keys[i] = public;
1281 } 1281 }
1282 bzero(pwname, strlen(pwname)); 1282 bzero(pwname, strlen(pwname));
1283 free(pwname); 1283 xfree(pwname);
1284 bzero(pwdir, strlen(pwdir)); 1284 bzero(pwdir, strlen(pwdir));
1285 free(pwdir); 1285 xfree(pwdir);
1286} 1286}
1287 1287
1288static void 1288static void