Patch from Simo:

  o sed 's/pdb_clear_sam/pdb_free_sam/g'
  o add pdb_reset_sam()
  o password changing should be ok now as well.
(This used to be commit 96d0e7c3301ad990f6c83b9c216720cb32661fb5)

1 files changed, 9 insertions, 9 deletions

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 0bc21dbbd6..01fc9cdd53 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -376,7 +376,7 @@ static BOOL update_smbpassword_file(char *user, char *password)
 
 	if(ret == False) {
 		DEBUG(0,("pdb_getsampwnam returned NULL\n"));
-		pdb_clear_sam(sampass);
+		pdb_free_sam(sampass);
 		return False;
 	}
 
@@ -393,7 +393,7 @@ static BOOL update_smbpassword_file(char *user, char *password)
 		DEBUG(3,("change_oem_password returned False\n"));
 	}
 
-	pdb_clear_sam(sampass);
+	pdb_free_sam(sampass);
 	return ret;
 }
 
@@ -558,14 +558,14 @@ BOOL pass_check_smb(char *user, char *domain, uchar *chal,
 	if (ret == False)
 	{
 		DEBUG(1,("Couldn't find user '%s' in passdb file.\n", user));
-		pdb_clear_sam(sampass);
+		pdb_free_sam(sampass);
 		return(False);
 	}
 
 	/* Quit if the account was disabled. */
 	if(pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
 		DEBUG(1,("Account for user '%s' was disabled.\n", user));
-		pdb_clear_sam(sampass);
+		pdb_free_sam(sampass);
 		return(False);
 	}
 
@@ -575,7 +575,7 @@ BOOL pass_check_smb(char *user, char *domain, uchar *chal,
 	if (smb_pass->smb_userid != pass->pw_uid)
 	{
 		DEBUG(0,("Error : UNIX and SMB uids in password files do not match for user '%s'!\n", user));
-		pdb_clear_sam(sampass);
+		pdb_free_sam(sampass);
 		return(False);
 	}
 #endif
@@ -585,25 +585,25 @@ BOOL pass_check_smb(char *user, char *domain, uchar *chal,
 		if (lp_null_passwords()) 
 		{
 			DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", user));
-			pdb_clear_sam(sampass);
+			pdb_free_sam(sampass);
 			return(True);
 		} 
 		else 
 		{
 			DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", user));
-			pdb_clear_sam(sampass);
+			pdb_free_sam(sampass);
 			return(False);
 		}		
 	}
 
 	if (smb_password_ok(sampass, chal, lm_pwd, nt_pwd))
 	{
-		pdb_clear_sam(sampass);
+		pdb_free_sam(sampass);
 		return(True);
 	}
 	
 	DEBUG(2,("pass_check_smb failed - invalid password for user [%s]\n", user));
-	pdb_clear_sam(sampass);
+	pdb_free_sam(sampass);
 	return False;
 }