From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Tue, 20 Nov 2007 09:51:36 +0000 (+0000)
Subject: passwd also use crypt_make_salt().
X-Git-Tag: 4.1.0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90de2288973bf5c4dbcab762daf32047d29e707f;p=thirdparty%2Fshadow.git

passwd also use crypt_make_salt().
---

diff --git a/ChangeLog b/ChangeLog
index cba2b88ae..b1e392345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/src/passwd.c b/src/passwd.c
index 1f57e705b..0c349aaba 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -309,7 +309,7 @@ static int new_password (const struct passwd *pw)
 	/*
 	 * 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