diff options
| author | Gerald Carter <jerry@samba.org> | 2004-04-06 11:27:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:07 -0500 |
| commit | d4f815731d58db302856abcdac9835a8c2fe2168 (patch) | |
| tree | a7f1b5f8ad2d9b12aa76b26ad1d7407cbcce6b4f /source3 | |
| parent | 13d636c0ff090241f857aad6dfa38942d7f2a626 (diff) | |
| download | samba-d4f815731d58db302856abcdac9835a8c2fe2168.tar.gz samba-d4f815731d58db302856abcdac9835a8c2fe2168.tar.bz2 samba-d4f815731d58db302856abcdac9835a8c2fe2168.zip | |
r75: patch from Cal Heldenbrand <calzplace@yahoo.com> for 'pam_smbpass migrate'
(This used to be commit 673c3f8bc0343cce293bacbf0773212b53182d1d)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/pam_smbpass/pam_smb_auth.c | 6 |
1 files 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) { |