Don't use SAM FLAGS from smb.h since they're gone - patch from metze

(This used to be commit 82a0abf4c84ddd0672b3c5ea4ba9759abd6778c6)

2 files changed, 3 insertions, 32 deletions

diff --git a/source3/sam/account.c b/source3/sam/account.c
index 9144c23844..1b43db57d9 100644
--- a/source3/sam/account.c
+++ b/source3/sam/account.c
@@ -37,8 +37,6 @@ static void sam_fill_default_account(SAM_ACCOUNT_HANDLE *account)
         /* Don't change these timestamp settings without a good reason.
            They are important for NT member server compatibility. */
 
-	account->private.init_flag		    = FLAG_SAM_UNINIT;
-
 	/* FIXME: We should actually call get_nt_time_max() or sthng 
 	 * here */
 	unix_to_nt_time(&(account->private.logoff_time),get_time_t_max());
diff --git a/source3/sam/get_set_account.c b/source3/sam/get_set_account.c
index 7bbfe39e14..acac281d21 100644
--- a/source3/sam/get_set_account.c
+++ b/source3/sam/get_set_account.c
@@ -355,11 +355,11 @@ NTSTATUS sam_get_account_unknown_3(const SAM_ACCOUNT_HANDLE *sampass, uint32 *un
  Collection of set...() functions for SAM_ACCOUNT_HANDLE_INFO.
  ********************************************************************/
 
-NTSTATUS sam_set_account_acct_ctrl(SAM_ACCOUNT_HANDLE *sampass, uint16 flags)
+NTSTATUS sam_set_account_acct_ctrl(SAM_ACCOUNT_HANDLE *sampass, uint16 acct_ctrl)
 {
 	SAM_ASSERT(sampass);
 		
-	sampass->private.acct_ctrl = flags;
+	sampass->private.acct_ctrl = acct_ctrl;
 
 	return NT_STATUS_OK;
 }
@@ -370,8 +370,6 @@ NTSTATUS sam_set_account_logon_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime,
 
 	sampass->private.logon_time = mytime;
 
-	if (store)
-		sam_set_account_init_flag(sampass, FLAG_SAM_LOGONTIME); 
 
 	return NT_STATUS_UNSUCCESSFUL;
 }
@@ -382,9 +380,6 @@ NTSTATUS sam_set_account_logoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime,
 
 	sampass->private.logoff_time = mytime;
 
-	if (store)
-		sam_set_account_init_flag(sampass, FLAG_SAM_LOGOFFTIME); 
-
 	return NT_STATUS_OK;
 }
 
@@ -394,8 +389,6 @@ NTSTATUS sam_set_account_kickoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime
 
 	sampass->private.kickoff_time = mytime;
 
-	if (store)
-		sam_set_account_init_flag(sampass, FLAG_SAM_KICKOFFTIME); 
 
 	return NT_STATUS_OK;
 }
@@ -406,8 +399,6 @@ NTSTATUS sam_set_account_pass_can_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIM
 
 	sampass->private.pass_can_change_time = mytime;
 
-	if (store)
-		sam_set_account_init_flag(sampass, FLAG_SAM_CANCHANGETIME); 
 
 	return NT_STATUS_OK;
 }
@@ -418,9 +409,6 @@ NTSTATUS sam_set_account_pass_must_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTI
 
 	sampass->private.pass_must_change_time = mytime;
 
-	if (store)
-		sam_set_account_init_flag(sampass, FLAG_SAM_MUSTCHANGETIME); 
-
 	return NT_STATUS_OK;
 }
 
@@ -585,7 +573,6 @@ NTSTATUS sam_set_account_logon_script(SAM_ACCOUNT_HANDLE *sampass, const char *l
 
 	sampass->private.logon_script = talloc_strdup(sampass->mem_ctx, logon_script);
 	
-	sam_set_account_init_flag(sampass, FLAG_SAM_LOGONSCRIPT);
 
 	return NT_STATUS_OK;
 }
@@ -602,11 +589,6 @@ NTSTATUS sam_set_account_profile_path(SAM_ACCOUNT_HANDLE *sampass, const char *p
  
 	sampass->private.profile_path = talloc_strdup(sampass->mem_ctx, profile_path);
 		
-	if (store) {
-		DEBUG(10, ("sam_set_profile_path: setting profile path sam flag!\n"));
-		sam_set_account_init_flag(sampass, FLAG_SAM_PROFILE);
-	}
-
 	return NT_STATUS_OK;
 }
 
@@ -623,11 +605,6 @@ NTSTATUS sam_set_account_dir_drive(SAM_ACCOUNT_HANDLE *sampass, const char *dir_
  
 	sampass->private.dir_drive = talloc_strdup(sampass->mem_ctx, dir_drive);
 		
-	if (store) {
-		DEBUG(10, ("sam_set_dir_drive: setting dir drive sam flag!\n"));
-		sam_set_account_init_flag(sampass, FLAG_SAM_DRIVE);
-	}
-
 	return NT_STATUS_OK;
 }
 
@@ -644,11 +621,6 @@ NTSTATUS sam_set_account_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *home_d
  
 	sampass->private.home_dir = talloc_strdup(sampass->mem_ctx, home_dir);
 		
-	if (store) {
-		DEBUG(10, ("sam_set_homedir: setting home dir sam flag!\n"));
-		sam_set_account_init_flag(sampass, FLAG_SAM_SMBHOME);
-	}
-
 	return NT_STATUS_OK;
 }
 
@@ -719,6 +691,7 @@ NTSTATUS sam_set_account_munged_dial(SAM_ACCOUNT_HANDLE *sampass, const char *mu
 	SAM_ASSERT(sampass);
 
 	sampass->private.munged_dial = talloc_strdup(sampass->mem_ctx, munged_dial);
+	
 	return NT_STATUS_OK;
 }