diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -35,6 +35,9 @@ | |||
35 | bz #1377: getpwuid results were being clobbered by another getpw* call | 35 | bz #1377: getpwuid results were being clobbered by another getpw* call |
36 | inside tilde_expand_filename(); save the data we need carefully | 36 | inside tilde_expand_filename(); save the data we need carefully |
37 | ok djm | 37 | ok djm |
38 | - dtucker@cvs.openbsd.org 2007/11/03 02:00:32 | ||
39 | [ssh.c] | ||
40 | Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@ | ||
38 | 41 | ||
39 | 20071030 | 42 | 20071030 |
40 | - (djm) OpenBSD CVS Sync | 43 | - (djm) OpenBSD CVS Sync |
@@ -3452,4 +3455,4 @@ | |||
3452 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3455 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3453 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3456 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3454 | 3457 | ||
3455 | $Id: ChangeLog,v 1.4804 2007/12/02 12:16:32 dtucker Exp $ | 3458 | $Id: ChangeLog,v 1.4805 2007/12/02 12:21:16 dtucker Exp $ |
@@ -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 | ||
1288 | static void | 1288 | static void |