[Pkg-shadow-commits] r1415 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-20 09:51:36 +0000 (Tue, 20 Nov 2007)
New Revision: 1415

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
passwd also use crypt_make_salt().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-20 09:33:52 UTC (rev 1414)
+++ upstream/trunk/ChangeLog	2007-11-20 09:51:36 UTC (rev 1415)
@@ -6,7 +6,8 @@
 	number of rounds.
 	* libmisc/salt.c, lib/getdef.c: ENCRYPT_METHOD and MD5_CRYPT_ENAB
 	are needed also when USE_PAM (e.g. for chpasswd).
-	* src/newusers.c, src/gpasswd.c: Use the new crypt_make_salt prototype
+	* src/passwd.c, src/newusers.c, src/gpasswd.c: Use the new
+	crypt_make_salt prototype
 	* src/chpasswd.c, src/chgpasswd.c: Add option -c, --crypt-method
 	and -s, --sha-rounds to specify the crypt method and number of
 	rounds in case of one of the SHA methods. The new prototype of

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2007-11-20 09:33:52 UTC (rev 1414)
+++ upstream/trunk/src/passwd.c	2007-11-20 09:51:36 UTC (rev 1415)
@@ -309,7 +309,7 @@
 	/*
 	 * Encrypt the password, then wipe the cleartext password.
 	 */
-	cp = pw_encrypt (pass, crypt_make_salt ());
+	cp = pw_encrypt (pass, crypt_make_salt (NULL, NULL));
 	memzero (pass, sizeof pass);
 
 #ifdef HAVE_LIBCRACK_HIST