From d4f815731d58db302856abcdac9835a8c2fe2168 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 6 Apr 2004 11:27:59 +0000 Subject: r75: patch from Cal Heldenbrand for 'pam_smbpass migrate' (This used to be commit 673c3f8bc0343cce293bacbf0773212b53182d1d) --- source3/pam_smbpass/pam_smb_auth.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index 4452538d32..d0dca6fa92 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -217,10 +217,10 @@ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl, return PAM_IGNORE; } else { - /* Change the user's password IFF it's null. */ - if ((pdb_get_lanman_passwd(sampass) == NULL) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) + /* mimick 'update encrypted' as long as the 'no pw req' flag is not set */ + if ( pdb_get_acct_ctrl(sampass) & ~ACB_PWNOTREQ ) { - retval = local_password_change( name, 0, pass, err_str, sizeof(err_str), + retval = local_password_change( name, LOCAL_SET_PASSWORD, pass, err_str, sizeof(err_str), msg_str, sizeof(msg_str) ); if (!retval && *err_str) { -- cgit