===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- src/usr.bin/ssh/ssh.c	2007/11/03 01:24:06	1.306
+++ src/usr.bin/ssh/ssh.c	2007/11/03 02:00:32	1.307
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.306 2007/11/03 01:24:06 deraadt Exp $ */
+/* $OpenBSD: ssh.c,v 1.307 2007/11/03 02:00:32 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1240,8 +1240,8 @@
 #endif /* SMARTCARD */
 	if ((pw = getpwuid(original_real_uid)) == NULL)
 		fatal("load_public_identity_files: getpwuid failed");
-	pwname = strdup(pw->pw_name);
-	pwdir = strdup(pw->pw_dir);
+	pwname = xstrdup(pw->pw_name);
+	pwdir = xstrdup(pw->pw_dir);
 	if (gethostname(thishost, sizeof(thishost)) == -1)
 		fatal("load_public_identity_files: gethostname: %s",
 		    strerror(errno));
@@ -1260,9 +1260,9 @@
 		options.identity_keys[i] = public;
 	}
 	bzero(pwname, strlen(pwname));
-	free(pwname);
+	xfree(pwname);
 	bzero(pwdir, strlen(pwdir));
-	free(pwdir);
+	xfree(pwdir);
 }
 
 static void