From fe518a828b36a505772682e4d125cc5559dbeef6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Aug 2002 07:19:05 +0000
Subject: Put in patch from metze (Stefan Metzmacher) to: - Rename user ->
 account - Add sam_* functions (api.c) - Several small fixes (This used to be
 commit eafcc387045f4f265631a952297caf3f6db779d8)

---
 source3/sam/get_set_account.c | 906 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 906 insertions(+)
 create mode 100644 source3/sam/get_set_account.c

(limited to 'source3/sam/get_set_account.c')

diff --git a/source3/sam/get_set_account.c b/source3/sam/get_set_account.c
new file mode 100644
index 0000000000..b0104fa1c3
--- /dev/null
+++ b/source3/sam/get_set_account.c
@@ -0,0 +1,906 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SAM_ACCOUNT_HANDLE access routines
+   Copyright (C) Andrew Bartlett			2002
+   Copyright (C) Stefan (metze) Metzmacher		2002
+   Copyright (C) Jelmer Vernooij 			2002
+      
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_SAM
+
+NTSTATUS sam_get_account_domain_sid(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+{
+	NTSTATUS status;
+	SAM_DOMAIN_HANDLE *domain;
+	if (!sampass || !sid) return NT_STATUS_UNSUCCESSFUL;
+
+	if (!NT_STATUS_IS_OK(status = sam_get_account_domain(sampass, &domain))){
+		DEBUG(0, ("sam_get_account_domain_sid: Can't get domain for account\n"));
+		return status;
+	}
+
+	return sam_get_domain_sid(domain, sid);
+}
+
+NTSTATUS sam_get_account_domain_name(const SAM_ACCOUNT_HANDLE *sampass, char **domain_name)
+{
+	NTSTATUS status;
+	SAM_DOMAIN_HANDLE *domain;
+	if (!sampass || !domain_name) return NT_STATUS_UNSUCCESSFUL;
+
+	if (!NT_STATUS_IS_OK(status = sam_get_account_domain(sampass, &domain))){
+		DEBUG(0, ("sam_get_account_domain_name: Can't get domain for account\n"));
+		return status;
+	}
+
+	return sam_get_domain_name(domain, domain_name);
+}
+
+NTSTATUS sam_get_account_acct_ctrl(const SAM_ACCOUNT_HANDLE *sampass, uint16 *acct_ctrl)
+{
+	if(!sampass || !acct_ctrl) return NT_STATUS_UNSUCCESSFUL;
+
+	*acct_ctrl = sampass->private.acct_ctrl;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_logon_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *logon_time)
+{
+	if(!sampass || !logon_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*logon_time = sampass->private.logon_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_logoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *logoff_time)
+{
+	if(!sampass || !logoff_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*logoff_time = sampass->private.logoff_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_kickoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *kickoff_time)
+{
+	if (!sampass || !kickoff_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*kickoff_time = sampass->private.kickoff_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_pass_last_set_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_last_set_time)
+{
+	if (!sampass || !pass_last_set_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*pass_last_set_time = sampass->private.pass_last_set_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_pass_can_change_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_can_change_time)
+{
+	if (!sampass || !pass_can_change_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*pass_can_change_time = sampass->private.pass_can_change_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_pass_must_change_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_must_change_time)
+{
+	if (!sampass || !pass_must_change_time) return NT_STATUS_UNSUCCESSFUL;
+
+	*pass_must_change_time = sampass->private.pass_must_change_time;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_logon_divs(const SAM_ACCOUNT_HANDLE *sampass, uint16 *logon_divs)
+{
+	if (!sampass || !logon_divs) return NT_STATUS_UNSUCCESSFUL;
+
+	*logon_divs = sampass->private.logon_divs;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_hours_len(const SAM_ACCOUNT_HANDLE *sampass, uint32 *hours_len)
+{
+	if (!sampass || !hours_len) return NT_STATUS_UNSUCCESSFUL;
+
+	*hours_len = sampass->private.hours_len;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_hours(const SAM_ACCOUNT_HANDLE *sampass, uint8 **hours)
+{
+	if (!sampass || !hours) return NT_STATUS_UNSUCCESSFUL;
+
+	*hours = sampass->private.hours;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_nt_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *nt_pwd)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	SMB_ASSERT((!sampass->private.nt_pw.data) 
+		   || sampass->private.nt_pw.length == NT_HASH_LEN);
+
+	*nt_pwd = sampass->private.nt_pw;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_lm_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *lm_pwd)
+{ 
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	SMB_ASSERT((!sampass->private.lm_pw.data) 
+		   || sampass->private.lm_pw.length == LM_HASH_LEN);
+
+	*lm_pwd = sampass->private.lm_pw;
+
+	return NT_STATUS_OK;
+}
+
+/* Return the plaintext password if known.  Most of the time
+   it isn't, so don't assume anything magic about this function.
+   
+   Used to pass the plaintext to sam backends that might 
+   want to store more than just the NTLM hashes.
+*/
+
+NTSTATUS sam_get_account_plaintext_pwd(const SAM_ACCOUNT_HANDLE *sampass, char **plain_pwd)
+{
+	if (!sampass || !plain_pwd) return NT_STATUS_UNSUCCESSFUL;
+
+	*plain_pwd = sampass->private.plaintext_pw;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_sid(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*sid = &(sampass->private.account_sid);
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_pgroup(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*sid = &(sampass->private.group_sid);
+
+	return NT_STATUS_OK;
+}
+
+/**
+ * Get flags showing what is initalised in the SAM_ACCOUNT_HANDLE
+ * @param sampass the SAM_ACCOUNT_HANDLE in question
+ * @return the flags indicating the members initialised in the struct.
+ **/
+ 
+NTSTATUS sam_get_account_init_flag(const SAM_ACCOUNT_HANDLE *sampass, uint32 *initflag)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*initflag = sampass->private.init_flag;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_name(const SAM_ACCOUNT_HANDLE *sampass, char **account_name)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*account_name = sampass->private.account_name;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_domain(const SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HANDLE **domain)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*domain = sampass->private.domain;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_fullname(const SAM_ACCOUNT_HANDLE *sampass, char **fullname)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*fullname = sampass->private.full_name;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_homedir(const SAM_ACCOUNT_HANDLE *sampass, char **homedir)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*homedir = sampass->private.home_dir;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_unix_home_dir(const SAM_ACCOUNT_HANDLE *sampass, char **uhomedir)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*uhomedir = sampass->private.unix_home_dir;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_dir_drive(const SAM_ACCOUNT_HANDLE *sampass, char **dirdrive)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*dirdrive = sampass->private.dir_drive;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_logon_script(const SAM_ACCOUNT_HANDLE *sampass, char **logon_script)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*logon_script = sampass->private.logon_script;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_profile_path(const SAM_ACCOUNT_HANDLE *sampass, char **profile_path)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*profile_path = sampass->private.profile_path;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_description(const SAM_ACCOUNT_HANDLE *sampass, char **description)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*description = sampass->private.acct_desc;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_workstations(const SAM_ACCOUNT_HANDLE *sampass, char **workstations)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*workstations = sampass->private.workstations;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_unknown_str(const SAM_ACCOUNT_HANDLE *sampass, char **unknown_str)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*unknown_str = sampass->private.unknown_str;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_munged_dial(const SAM_ACCOUNT_HANDLE *sampass, char **munged_dial)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	*munged_dial = sampass->private.munged_dial;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_unknown_1(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown1)
+{
+	if (!sampass || !unknown1) return NT_STATUS_UNSUCCESSFUL;
+
+	*unknown1 = sampass->private.unknown_1;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_unknown_2(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown2)
+{
+	if (!sampass || !unknown2) return NT_STATUS_UNSUCCESSFUL;
+
+	*unknown2 = sampass->private.unknown_2;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_account_unknown_3(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown3)
+{
+	if (!sampass || !unknown3) return NT_STATUS_UNSUCCESSFUL;
+
+	*unknown3 = sampass->private.unknown_3;
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Collection of set...() functions for SAM_ACCOUNT_HANDLE_INFO.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_acct_ctrl(SAM_ACCOUNT_HANDLE *sampass, uint16 flags)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+		
+	sampass->private.acct_ctrl = flags;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_logon_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.logon_time = mytime;
+
+	if (store)
+		sam_set_account_init_flag(sampass, FLAG_SAM_LOGONTIME); 
+
+	return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS sam_set_account_logoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.logoff_time = mytime;
+
+	if (store)
+		sam_set_account_init_flag(sampass, FLAG_SAM_LOGOFFTIME); 
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_kickoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.kickoff_time = mytime;
+
+	if (store)
+		sam_set_account_init_flag(sampass, FLAG_SAM_KICKOFFTIME); 
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_pass_can_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.pass_can_change_time = mytime;
+
+	if (store)
+		sam_set_account_init_flag(sampass, FLAG_SAM_CANCHANGETIME); 
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_pass_must_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.pass_must_change_time = mytime;
+
+	if (store)
+		sam_set_account_init_flag(sampass, FLAG_SAM_MUSTCHANGETIME); 
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_pass_last_set_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.pass_last_set_time = mytime;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_hours_len(SAM_ACCOUNT_HANDLE *sampass, uint32 len)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.hours_len = len;
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_logon_divs(SAM_ACCOUNT_HANDLE *sampass, uint16 hours)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.logon_divs = hours;
+	return NT_STATUS_OK;
+}
+
+/**
+ * Set flags showing what is initalised in the SAM_ACCOUNT_HANDLE
+ * @param sampass the SAM_ACCOUNT_HANDLE in question
+ * @param flag The *new* flag to be set.  Old flags preserved
+ *             this flag is only added.  
+ **/
+ 
+NTSTATUS sam_set_account_init_flag(SAM_ACCOUNT_HANDLE *sampass, uint32 flag)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.init_flag |= flag;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *u_sid)
+{
+	if (!sampass || !u_sid)
+		return NT_STATUS_UNSUCCESSFUL;
+	
+	sid_copy(&sampass->private.account_sid, u_sid);
+
+	DEBUG(10, ("sam_set_account_sid: setting account sid %s\n", 
+		    sid_string_static(&sampass->private.account_sid)));
+	
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_sid_from_string(SAM_ACCOUNT_HANDLE *sampass, fstring u_sid)
+{
+	DOM_SID new_sid;
+	if (!sampass || !u_sid)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_account_sid_from_string: setting account sid %s\n",
+		   u_sid));
+
+	if (!string_to_sid(&new_sid, u_sid)) { 
+		DEBUG(1, ("sam_set_account_sid_from_string: %s isn't a valid SID!\n", u_sid));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	 
+	if (!NT_STATUS_IS_OK(sam_set_account_sid(sampass, &new_sid))) {
+		DEBUG(1, ("sam_set_account_sid_from_string: could not set sid %s on SAM_ACCOUNT_HANDLE!\n", u_sid));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_pgroup_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *g_sid)
+{
+	if (!sampass || !g_sid)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sid_copy(&sampass->private.group_sid, g_sid);
+
+	DEBUG(10, ("sam_set_group_sid: setting group sid %s\n", 
+		    sid_string_static(&sampass->private.group_sid)));
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_pgroup_string(SAM_ACCOUNT_HANDLE *sampass, fstring g_sid)
+{
+	DOM_SID new_sid;
+	if (!sampass || !g_sid)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_group_sid_from_string: setting group sid %s\n",
+		   g_sid));
+
+	if (!string_to_sid(&new_sid, g_sid)) { 
+		DEBUG(1, ("sam_set_group_sid_from_string: %s isn't a valid SID!\n", g_sid));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	 
+	if (!NT_STATUS_IS_OK(sam_set_account_pgroup_sid(sampass, &new_sid))) {
+		DEBUG(1, ("sam_set_group_sid_from_string: could not set sid %s on SAM_ACCOUNT_HANDLE!\n", g_sid));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the domain name.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_domain(SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HANDLE *domain)
+{	
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.domain = domain;
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's NT name.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_name(SAM_ACCOUNT_HANDLE *sampass, const char *account_name)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_account_name: setting nt account_name %s, was %s\n", account_name, sampass->private.account_name));
+
+	sampass->private.account_name = talloc_strdup(sampass->mem_ctx, account_name);
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's full name.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_fullname(SAM_ACCOUNT_HANDLE *sampass, const char *full_name)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_account_fullname: setting full name %s, was %s\n", full_name, sampass->private.full_name));
+
+	sampass->private.full_name = talloc_strdup(sampass->mem_ctx, full_name);
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's logon script.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_logon_script(SAM_ACCOUNT_HANDLE *sampass, const char *logon_script, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_logon_script: from %s to %s\n", logon_script, sampass->private.logon_script));
+
+	sampass->private.logon_script = talloc_strdup(sampass->mem_ctx, logon_script);
+	
+	sam_set_account_init_flag(sampass, FLAG_SAM_LOGONSCRIPT);
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's profile path.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_profile_path(SAM_ACCOUNT_HANDLE *sampass, const char *profile_path, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_profile_path: setting profile path %s, was %s\n", profile_path, sampass->private.profile_path));
+ 
+	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;
+}
+
+/*********************************************************************
+ Set the account's directory drive.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_dir_drive(SAM_ACCOUNT_HANDLE *sampass, const char *dir_drive, BOOL store)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_dir_drive: setting dir drive %s, was %s\n", dir_drive,
+			sampass->private.dir_drive));
+ 
+	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;
+}
+
+/*********************************************************************
+ Set the account's home directory.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *home_dir, BOOL store)
+{
+	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_homedir: setting home dir %s, was %s\n", home_dir,
+		sampass->private.home_dir));
+ 
+	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;
+}
+
+/*********************************************************************
+ Set the account's unix home directory.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_unix_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *unix_home_dir)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_unix_homedir: setting home dir %s, was %s\n", unix_home_dir,
+		sampass->private.unix_home_dir));
+ 
+	sampass->private.unix_home_dir = talloc_strdup(sampass->mem_ctx, unix_home_dir);
+		
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's account description.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_acct_desc(SAM_ACCOUNT_HANDLE *sampass, const char *acct_desc)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.acct_desc = talloc_strdup(sampass->mem_ctx, acct_desc);
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's workstation allowed list.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_workstations(SAM_ACCOUNT_HANDLE *sampass, const char *workstations)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	DEBUG(10, ("sam_set_workstations: setting workstations %s, was %s\n", workstations,
+			sampass->private.workstations));
+ 
+	sampass->private.workstations = talloc_strdup(sampass->mem_ctx, workstations);
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's 'unknown_str', whatever the heck this actually is...
+ ********************************************************************/
+
+NTSTATUS sam_set_account_unknown_str(SAM_ACCOUNT_HANDLE *sampass, const char *unknown_str)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.unknown_str = talloc_strdup(sampass->mem_ctx, unknown_str);
+		
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's dial string.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_munged_dial(SAM_ACCOUNT_HANDLE *sampass, const char *munged_dial)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.munged_dial = talloc_strdup(sampass->mem_ctx, munged_dial);
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's NT hash.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_nt_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.nt_pw = data;
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's LM hash.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_lm_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.lm_pw = data;
+
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's plaintext password only (base procedure, see helper
+ below)
+ ********************************************************************/
+
+NTSTATUS sam_set_account_plaintext_pwd(SAM_ACCOUNT_HANDLE *sampass, const char *plain_pwd)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.plaintext_pw = talloc_strdup(sampass->mem_ctx, plain_pwd);
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_unknown_1(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.unknown_1 = unkn;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_unknown_2(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.unknown_2 = unkn;
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_unknown_3(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	sampass->private.unknown_3 = unkn;
+	return NT_STATUS_OK;
+}
+
+NTSTATUS sam_set_account_hours(SAM_ACCOUNT_HANDLE *sampass, const uint8 *hours)
+{
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+
+	if (!hours) {
+		memset ((char *)sampass->private.hours, 0, MAX_HOURS_LEN);
+		return NT_STATUS_OK;
+	}
+	
+	memcpy(sampass->private.hours, hours, MAX_HOURS_LEN);
+
+	return NT_STATUS_OK;
+}
+
+/* Helpful interfaces to the above */
+
+/*********************************************************************
+ Sets the last changed times and must change times for a normal
+ password change.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_pass_changed_now(SAM_ACCOUNT_HANDLE *sampass)
+{
+	uint32 expire;
+	NTTIME temptime;
+
+	if (!sampass)
+		return NT_STATUS_UNSUCCESSFUL;
+	
+	unix_to_nt_time(&temptime, time(NULL));
+	if (!NT_STATUS_IS_OK(sam_set_account_pass_last_set_time(sampass, temptime)))
+		return NT_STATUS_UNSUCCESSFUL;
+
+	if (!account_policy_get(AP_MAX_PASSWORD_AGE, &expire) 
+	    || (expire==(uint32)-1)) {
+
+		get_nttime_max(&temptime);
+		if (!NT_STATUS_IS_OK(sam_set_account_pass_must_change_time(sampass, temptime, False)))
+			return NT_STATUS_UNSUCCESSFUL;
+
+	} else {
+		/* FIXME: Add expire to temptime */
+		
+		if (!NT_STATUS_IS_OK(sam_get_account_pass_last_set_time(sampass,&temptime)) || !NT_STATUS_IS_OK(sam_set_account_pass_must_change_time(sampass, temptime,True)))
+			return NT_STATUS_UNSUCCESSFUL;
+	}
+	
+	return NT_STATUS_OK;
+}
+
+/*********************************************************************
+ Set the account's PLAINTEXT password.  Used as an interface to the above.
+ Also sets the last change time to NOW.
+ ********************************************************************/
+
+NTSTATUS sam_set_account_passwd(SAM_ACCOUNT_HANDLE *sampass, const char *plaintext)
+{
+	DATA_BLOB data;
+	uchar new_lanman_p16[16];
+	uchar new_nt_p16[16];
+
+	if (!sampass || !plaintext)
+		return NT_STATUS_UNSUCCESSFUL;
+	
+	nt_lm_owf_gen(plaintext, new_nt_p16, new_lanman_p16);
+
+	data = data_blob(new_nt_p16, 16);
+	if (!NT_STATUS_IS_OK(sam_set_account_nt_pwd(sampass, data)))
+		return NT_STATUS_UNSUCCESSFUL;
+
+	data = data_blob(new_lanman_p16, 16);
+
+	if (!NT_STATUS_IS_OK(sam_set_account_lm_pwd(sampass, data)))
+		return NT_STATUS_UNSUCCESSFUL;
+
+	if (!NT_STATUS_IS_OK(sam_set_account_plaintext_pwd(sampass, plaintext)))
+		return NT_STATUS_UNSUCCESSFUL;
+	
+	if (!NT_STATUS_IS_OK(sam_set_account_pass_changed_now(sampass)))
+		return NT_STATUS_UNSUCCESSFUL;
+
+	return NT_STATUS_OK;
+}
+
-- 
cgit 


From 68defac58da3f927cd8fb1405f3c648b7dec7f82 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Sep 2002 12:57:12 +0000
Subject: This commit includes part of the patch from metze posted to the list,
 and a few of my own changes.

In particular:  I've added a SAM_ASSERT macro.  This expands to either
SMB_ASSERT() (which should help us track down bugs) or a return of
NT_STATUS_CHECK_FAIL.

Metze's changes are mostly to bring the code into line with current discussions
on things like adding users/groups, flags etc.

I've adjusted a fair bit of the 'const' in the SAM stuff.  Const is currently
used only for pointers, not for local variables or non-pointer paramters.  The
benifits and reasons for extending this further need discussion on
samba-technical.

Also, some of the 'context' paramters should not be const, to allow backend
modules to do fancy caching etc in them.

Andrew Bartlett
(This used to be commit e13bc432628a6131be082caedc75cd8a3d206e5a)
---
 source3/sam/get_set_account.c | 192 +++++++++++++++++-------------------------
 1 file changed, 79 insertions(+), 113 deletions(-)

(limited to 'source3/sam/get_set_account.c')

diff --git a/source3/sam/get_set_account.c b/source3/sam/get_set_account.c
index b0104fa1c3..7bbfe39e14 100644
--- a/source3/sam/get_set_account.c
+++ b/source3/sam/get_set_account.c
@@ -25,11 +25,11 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_SAM
 
-NTSTATUS sam_get_account_domain_sid(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+NTSTATUS sam_get_account_domain_sid(const SAM_ACCOUNT_HANDLE *sampass, const DOM_SID **sid)
 {
 	NTSTATUS status;
 	SAM_DOMAIN_HANDLE *domain;
-	if (!sampass || !sid) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(!sampass || !sid);
 
 	if (!NT_STATUS_IS_OK(status = sam_get_account_domain(sampass, &domain))){
 		DEBUG(0, ("sam_get_account_domain_sid: Can't get domain for account\n"));
@@ -39,11 +39,11 @@ NTSTATUS sam_get_account_domain_sid(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID *
 	return sam_get_domain_sid(domain, sid);
 }
 
-NTSTATUS sam_get_account_domain_name(const SAM_ACCOUNT_HANDLE *sampass, char **domain_name)
+NTSTATUS sam_get_account_domain_name(const SAM_ACCOUNT_HANDLE *sampass, const char **domain_name)
 {
 	NTSTATUS status;
 	SAM_DOMAIN_HANDLE *domain;
-	if (!sampass || !domain_name) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && domain_name);
 
 	if (!NT_STATUS_IS_OK(status = sam_get_account_domain(sampass, &domain))){
 		DEBUG(0, ("sam_get_account_domain_name: Can't get domain for account\n"));
@@ -55,7 +55,7 @@ NTSTATUS sam_get_account_domain_name(const SAM_ACCOUNT_HANDLE *sampass, char **d
 
 NTSTATUS sam_get_account_acct_ctrl(const SAM_ACCOUNT_HANDLE *sampass, uint16 *acct_ctrl)
 {
-	if(!sampass || !acct_ctrl) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && acct_ctrl);
 
 	*acct_ctrl = sampass->private.acct_ctrl;
 
@@ -64,7 +64,7 @@ NTSTATUS sam_get_account_acct_ctrl(const SAM_ACCOUNT_HANDLE *sampass, uint16 *ac
 
 NTSTATUS sam_get_account_logon_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *logon_time)
 {
-	if(!sampass || !logon_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && logon_time) ;
 
 	*logon_time = sampass->private.logon_time;
 
@@ -73,7 +73,7 @@ NTSTATUS sam_get_account_logon_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *l
 
 NTSTATUS sam_get_account_logoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *logoff_time)
 {
-	if(!sampass || !logoff_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && logoff_time) ;
 
 	*logoff_time = sampass->private.logoff_time;
 
@@ -82,7 +82,7 @@ NTSTATUS sam_get_account_logoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *
 
 NTSTATUS sam_get_account_kickoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *kickoff_time)
 {
-	if (!sampass || !kickoff_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && kickoff_time);
 
 	*kickoff_time = sampass->private.kickoff_time;
 
@@ -91,7 +91,7 @@ NTSTATUS sam_get_account_kickoff_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME
 
 NTSTATUS sam_get_account_pass_last_set_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_last_set_time)
 {
-	if (!sampass || !pass_last_set_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && pass_last_set_time);
 
 	*pass_last_set_time = sampass->private.pass_last_set_time;
 
@@ -100,7 +100,7 @@ NTSTATUS sam_get_account_pass_last_set_time(const SAM_ACCOUNT_HANDLE *sampass, N
 
 NTSTATUS sam_get_account_pass_can_change_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_can_change_time)
 {
-	if (!sampass || !pass_can_change_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && pass_can_change_time);
 
 	*pass_can_change_time = sampass->private.pass_can_change_time;
 
@@ -109,7 +109,7 @@ NTSTATUS sam_get_account_pass_can_change_time(const SAM_ACCOUNT_HANDLE *sampass,
 
 NTSTATUS sam_get_account_pass_must_change_time(const SAM_ACCOUNT_HANDLE *sampass, NTTIME *pass_must_change_time)
 {
-	if (!sampass || !pass_must_change_time) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && pass_must_change_time);
 
 	*pass_must_change_time = sampass->private.pass_must_change_time;
 
@@ -118,7 +118,7 @@ NTSTATUS sam_get_account_pass_must_change_time(const SAM_ACCOUNT_HANDLE *sampass
 
 NTSTATUS sam_get_account_logon_divs(const SAM_ACCOUNT_HANDLE *sampass, uint16 *logon_divs)
 {
-	if (!sampass || !logon_divs) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && logon_divs);
 
 	*logon_divs = sampass->private.logon_divs;
 
@@ -127,16 +127,16 @@ NTSTATUS sam_get_account_logon_divs(const SAM_ACCOUNT_HANDLE *sampass, uint16 *l
 
 NTSTATUS sam_get_account_hours_len(const SAM_ACCOUNT_HANDLE *sampass, uint32 *hours_len)
 {
-	if (!sampass || !hours_len) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && hours_len);
 
 	*hours_len = sampass->private.hours_len;
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_get_account_hours(const SAM_ACCOUNT_HANDLE *sampass, uint8 **hours)
+NTSTATUS sam_get_account_hours(const SAM_ACCOUNT_HANDLE *sampass, const uint8 **hours)
 {
-	if (!sampass || !hours) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && hours);
 
 	*hours = sampass->private.hours;
 
@@ -145,7 +145,7 @@ NTSTATUS sam_get_account_hours(const SAM_ACCOUNT_HANDLE *sampass, uint8 **hours)
 
 NTSTATUS sam_get_account_nt_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *nt_pwd)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	SMB_ASSERT((!sampass->private.nt_pw.data) 
 		   || sampass->private.nt_pw.length == NT_HASH_LEN);
@@ -157,7 +157,7 @@ NTSTATUS sam_get_account_nt_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *nt
 
 NTSTATUS sam_get_account_lm_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *lm_pwd)
 { 
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	SMB_ASSERT((!sampass->private.lm_pw.data) 
 		   || sampass->private.lm_pw.length == LM_HASH_LEN);
@@ -176,25 +176,25 @@ NTSTATUS sam_get_account_lm_pwd(const SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB *lm
 
 NTSTATUS sam_get_account_plaintext_pwd(const SAM_ACCOUNT_HANDLE *sampass, char **plain_pwd)
 {
-	if (!sampass || !plain_pwd) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && plain_pwd);
 
 	*plain_pwd = sampass->private.plaintext_pw;
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_get_account_sid(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+NTSTATUS sam_get_account_sid(const SAM_ACCOUNT_HANDLE *sampass, const DOM_SID **sid)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*sid = &(sampass->private.account_sid);
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_get_account_pgroup(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid)
+NTSTATUS sam_get_account_pgroup(const SAM_ACCOUNT_HANDLE *sampass, const DOM_SID **sid)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*sid = &(sampass->private.group_sid);
 
@@ -209,7 +209,7 @@ NTSTATUS sam_get_account_pgroup(const SAM_ACCOUNT_HANDLE *sampass, DOM_SID **sid
  
 NTSTATUS sam_get_account_init_flag(const SAM_ACCOUNT_HANDLE *sampass, uint32 *initflag)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*initflag = sampass->private.init_flag;
 
@@ -218,7 +218,7 @@ NTSTATUS sam_get_account_init_flag(const SAM_ACCOUNT_HANDLE *sampass, uint32 *in
 
 NTSTATUS sam_get_account_name(const SAM_ACCOUNT_HANDLE *sampass, char **account_name)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*account_name = sampass->private.account_name;
 
@@ -227,7 +227,7 @@ NTSTATUS sam_get_account_name(const SAM_ACCOUNT_HANDLE *sampass, char **account_
 
 NTSTATUS sam_get_account_domain(const SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HANDLE **domain)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*domain = sampass->private.domain;
 
@@ -236,7 +236,7 @@ NTSTATUS sam_get_account_domain(const SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HA
 
 NTSTATUS sam_get_account_fullname(const SAM_ACCOUNT_HANDLE *sampass, char **fullname)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*fullname = sampass->private.full_name;
 
@@ -245,7 +245,7 @@ NTSTATUS sam_get_account_fullname(const SAM_ACCOUNT_HANDLE *sampass, char **full
 
 NTSTATUS sam_get_account_homedir(const SAM_ACCOUNT_HANDLE *sampass, char **homedir)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*homedir = sampass->private.home_dir;
 
@@ -254,7 +254,7 @@ NTSTATUS sam_get_account_homedir(const SAM_ACCOUNT_HANDLE *sampass, char **homed
 
 NTSTATUS sam_get_account_unix_home_dir(const SAM_ACCOUNT_HANDLE *sampass, char **uhomedir)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*uhomedir = sampass->private.unix_home_dir;
 
@@ -263,7 +263,7 @@ NTSTATUS sam_get_account_unix_home_dir(const SAM_ACCOUNT_HANDLE *sampass, char *
 
 NTSTATUS sam_get_account_dir_drive(const SAM_ACCOUNT_HANDLE *sampass, char **dirdrive)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*dirdrive = sampass->private.dir_drive;
 
@@ -272,7 +272,7 @@ NTSTATUS sam_get_account_dir_drive(const SAM_ACCOUNT_HANDLE *sampass, char **dir
 
 NTSTATUS sam_get_account_logon_script(const SAM_ACCOUNT_HANDLE *sampass, char **logon_script)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*logon_script = sampass->private.logon_script;
 
@@ -281,7 +281,7 @@ NTSTATUS sam_get_account_logon_script(const SAM_ACCOUNT_HANDLE *sampass, char **
 
 NTSTATUS sam_get_account_profile_path(const SAM_ACCOUNT_HANDLE *sampass, char **profile_path)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*profile_path = sampass->private.profile_path;
 
@@ -290,7 +290,7 @@ NTSTATUS sam_get_account_profile_path(const SAM_ACCOUNT_HANDLE *sampass, char **
 
 NTSTATUS sam_get_account_description(const SAM_ACCOUNT_HANDLE *sampass, char **description)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*description = sampass->private.acct_desc;
 
@@ -299,7 +299,7 @@ NTSTATUS sam_get_account_description(const SAM_ACCOUNT_HANDLE *sampass, char **d
 
 NTSTATUS sam_get_account_workstations(const SAM_ACCOUNT_HANDLE *sampass, char **workstations)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*workstations = sampass->private.workstations;
 
@@ -308,7 +308,7 @@ NTSTATUS sam_get_account_workstations(const SAM_ACCOUNT_HANDLE *sampass, char **
 
 NTSTATUS sam_get_account_unknown_str(const SAM_ACCOUNT_HANDLE *sampass, char **unknown_str)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*unknown_str = sampass->private.unknown_str;
 
@@ -317,7 +317,7 @@ NTSTATUS sam_get_account_unknown_str(const SAM_ACCOUNT_HANDLE *sampass, char **u
 
 NTSTATUS sam_get_account_munged_dial(const SAM_ACCOUNT_HANDLE *sampass, char **munged_dial)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	*munged_dial = sampass->private.munged_dial;
 
@@ -326,7 +326,7 @@ NTSTATUS sam_get_account_munged_dial(const SAM_ACCOUNT_HANDLE *sampass, char **m
 
 NTSTATUS sam_get_account_unknown_1(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown1)
 {
-	if (!sampass || !unknown1) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && unknown1);
 
 	*unknown1 = sampass->private.unknown_1;
 
@@ -335,7 +335,7 @@ NTSTATUS sam_get_account_unknown_1(const SAM_ACCOUNT_HANDLE *sampass, uint32 *un
 
 NTSTATUS sam_get_account_unknown_2(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown2)
 {
-	if (!sampass || !unknown2) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && unknown2);
 
 	*unknown2 = sampass->private.unknown_2;
 
@@ -344,7 +344,7 @@ NTSTATUS sam_get_account_unknown_2(const SAM_ACCOUNT_HANDLE *sampass, uint32 *un
 
 NTSTATUS sam_get_account_unknown_3(const SAM_ACCOUNT_HANDLE *sampass, uint32 *unknown3)
 {
-	if (!sampass || !unknown3) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && unknown3);
 
 	*unknown3 = sampass->private.unknown_3;
 
@@ -357,8 +357,7 @@ NTSTATUS sam_get_account_unknown_3(const SAM_ACCOUNT_HANDLE *sampass, uint32 *un
 
 NTSTATUS sam_set_account_acct_ctrl(SAM_ACCOUNT_HANDLE *sampass, uint16 flags)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 		
 	sampass->private.acct_ctrl = flags;
 
@@ -367,8 +366,7 @@ NTSTATUS sam_set_account_acct_ctrl(SAM_ACCOUNT_HANDLE *sampass, uint16 flags)
 
 NTSTATUS sam_set_account_logon_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.logon_time = mytime;
 
@@ -380,8 +378,7 @@ NTSTATUS sam_set_account_logon_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime,
 
 NTSTATUS sam_set_account_logoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.logoff_time = mytime;
 
@@ -393,8 +390,7 @@ NTSTATUS sam_set_account_logoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime,
 
 NTSTATUS sam_set_account_kickoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.kickoff_time = mytime;
 
@@ -406,8 +402,7 @@ NTSTATUS sam_set_account_kickoff_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime
 
 NTSTATUS sam_set_account_pass_can_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.pass_can_change_time = mytime;
 
@@ -419,8 +414,7 @@ NTSTATUS sam_set_account_pass_can_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIM
 
 NTSTATUS sam_set_account_pass_must_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.pass_must_change_time = mytime;
 
@@ -432,8 +426,7 @@ NTSTATUS sam_set_account_pass_must_change_time(SAM_ACCOUNT_HANDLE *sampass, NTTI
 
 NTSTATUS sam_set_account_pass_last_set_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME mytime)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.pass_last_set_time = mytime;
 
@@ -442,8 +435,7 @@ NTSTATUS sam_set_account_pass_last_set_time(SAM_ACCOUNT_HANDLE *sampass, NTTIME
 
 NTSTATUS sam_set_account_hours_len(SAM_ACCOUNT_HANDLE *sampass, uint32 len)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.hours_len = len;
 	return NT_STATUS_OK;
@@ -451,8 +443,7 @@ NTSTATUS sam_set_account_hours_len(SAM_ACCOUNT_HANDLE *sampass, uint32 len)
 
 NTSTATUS sam_set_account_logon_divs(SAM_ACCOUNT_HANDLE *sampass, uint16 hours)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.logon_divs = hours;
 	return NT_STATUS_OK;
@@ -467,18 +458,16 @@ NTSTATUS sam_set_account_logon_divs(SAM_ACCOUNT_HANDLE *sampass, uint16 hours)
  
 NTSTATUS sam_set_account_init_flag(SAM_ACCOUNT_HANDLE *sampass, uint32 flag)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.init_flag |= flag;
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_set_account_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *u_sid)
+NTSTATUS sam_set_account_sid(SAM_ACCOUNT_HANDLE *sampass, const DOM_SID *u_sid)
 {
-	if (!sampass || !u_sid)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && u_sid);
 	
 	sid_copy(&sampass->private.account_sid, u_sid);
 
@@ -488,11 +477,10 @@ NTSTATUS sam_set_account_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *u_sid)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_set_account_sid_from_string(SAM_ACCOUNT_HANDLE *sampass, fstring u_sid)
+NTSTATUS sam_set_account_sid_from_string(SAM_ACCOUNT_HANDLE *sampass, const char *u_sid)
 {
 	DOM_SID new_sid;
-	if (!sampass || !u_sid)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && u_sid);
 
 	DEBUG(10, ("sam_set_account_sid_from_string: setting account sid %s\n",
 		   u_sid));
@@ -510,10 +498,9 @@ NTSTATUS sam_set_account_sid_from_string(SAM_ACCOUNT_HANDLE *sampass, fstring u_
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_set_account_pgroup_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *g_sid)
+NTSTATUS sam_set_account_pgroup_sid(SAM_ACCOUNT_HANDLE *sampass, const DOM_SID *g_sid)
 {
-	if (!sampass || !g_sid)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && g_sid);
 
 	sid_copy(&sampass->private.group_sid, g_sid);
 
@@ -523,11 +510,10 @@ NTSTATUS sam_set_account_pgroup_sid(SAM_ACCOUNT_HANDLE *sampass, DOM_SID *g_sid)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_set_account_pgroup_string(SAM_ACCOUNT_HANDLE *sampass, fstring g_sid)
+NTSTATUS sam_set_account_pgroup_string(SAM_ACCOUNT_HANDLE *sampass, const char *g_sid)
 {
 	DOM_SID new_sid;
-	if (!sampass || !g_sid)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && g_sid);
 
 	DEBUG(10, ("sam_set_group_sid_from_string: setting group sid %s\n",
 		   g_sid));
@@ -550,8 +536,7 @@ NTSTATUS sam_set_account_pgroup_string(SAM_ACCOUNT_HANDLE *sampass, fstring g_si
 
 NTSTATUS sam_set_account_domain(SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HANDLE *domain)
 {	
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.domain = domain;
 
@@ -564,8 +549,7 @@ NTSTATUS sam_set_account_domain(SAM_ACCOUNT_HANDLE *sampass, SAM_DOMAIN_HANDLE *
 
 NTSTATUS sam_set_account_name(SAM_ACCOUNT_HANDLE *sampass, const char *account_name)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_account_name: setting nt account_name %s, was %s\n", account_name, sampass->private.account_name));
 
@@ -580,8 +564,7 @@ NTSTATUS sam_set_account_name(SAM_ACCOUNT_HANDLE *sampass, const char *account_n
 
 NTSTATUS sam_set_account_fullname(SAM_ACCOUNT_HANDLE *sampass, const char *full_name)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_account_fullname: setting full name %s, was %s\n", full_name, sampass->private.full_name));
 
@@ -596,8 +579,7 @@ NTSTATUS sam_set_account_fullname(SAM_ACCOUNT_HANDLE *sampass, const char *full_
 
 NTSTATUS sam_set_account_logon_script(SAM_ACCOUNT_HANDLE *sampass, const char *logon_script, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_logon_script: from %s to %s\n", logon_script, sampass->private.logon_script));
 
@@ -614,8 +596,7 @@ NTSTATUS sam_set_account_logon_script(SAM_ACCOUNT_HANDLE *sampass, const char *l
 
 NTSTATUS sam_set_account_profile_path(SAM_ACCOUNT_HANDLE *sampass, const char *profile_path, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_profile_path: setting profile path %s, was %s\n", profile_path, sampass->private.profile_path));
  
@@ -635,8 +616,7 @@ NTSTATUS sam_set_account_profile_path(SAM_ACCOUNT_HANDLE *sampass, const char *p
 
 NTSTATUS sam_set_account_dir_drive(SAM_ACCOUNT_HANDLE *sampass, const char *dir_drive, BOOL store)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_dir_drive: setting dir drive %s, was %s\n", dir_drive,
 			sampass->private.dir_drive));
@@ -657,7 +637,7 @@ NTSTATUS sam_set_account_dir_drive(SAM_ACCOUNT_HANDLE *sampass, const char *dir_
 
 NTSTATUS sam_set_account_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *home_dir, BOOL store)
 {
-	if (!sampass) return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_homedir: setting home dir %s, was %s\n", home_dir,
 		sampass->private.home_dir));
@@ -678,8 +658,7 @@ NTSTATUS sam_set_account_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *home_d
 
 NTSTATUS sam_set_account_unix_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *unix_home_dir)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_unix_homedir: setting home dir %s, was %s\n", unix_home_dir,
 		sampass->private.unix_home_dir));
@@ -695,8 +674,7 @@ NTSTATUS sam_set_account_unix_homedir(SAM_ACCOUNT_HANDLE *sampass, const char *u
 
 NTSTATUS sam_set_account_acct_desc(SAM_ACCOUNT_HANDLE *sampass, const char *acct_desc)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.acct_desc = talloc_strdup(sampass->mem_ctx, acct_desc);
 
@@ -709,8 +687,7 @@ NTSTATUS sam_set_account_acct_desc(SAM_ACCOUNT_HANDLE *sampass, const char *acct
 
 NTSTATUS sam_set_account_workstations(SAM_ACCOUNT_HANDLE *sampass, const char *workstations)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	DEBUG(10, ("sam_set_workstations: setting workstations %s, was %s\n", workstations,
 			sampass->private.workstations));
@@ -726,8 +703,7 @@ NTSTATUS sam_set_account_workstations(SAM_ACCOUNT_HANDLE *sampass, const char *w
 
 NTSTATUS sam_set_account_unknown_str(SAM_ACCOUNT_HANDLE *sampass, const char *unknown_str)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.unknown_str = talloc_strdup(sampass->mem_ctx, unknown_str);
 		
@@ -740,8 +716,7 @@ NTSTATUS sam_set_account_unknown_str(SAM_ACCOUNT_HANDLE *sampass, const char *un
 
 NTSTATUS sam_set_account_munged_dial(SAM_ACCOUNT_HANDLE *sampass, const char *munged_dial)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.munged_dial = talloc_strdup(sampass->mem_ctx, munged_dial);
 	return NT_STATUS_OK;
@@ -751,10 +726,9 @@ NTSTATUS sam_set_account_munged_dial(SAM_ACCOUNT_HANDLE *sampass, const char *mu
  Set the account's NT hash.
  ********************************************************************/
 
-NTSTATUS sam_set_account_nt_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
+NTSTATUS sam_set_account_nt_pwd(SAM_ACCOUNT_HANDLE *sampass, const DATA_BLOB data)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.nt_pw = data;
 
@@ -765,10 +739,9 @@ NTSTATUS sam_set_account_nt_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
  Set the account's LM hash.
  ********************************************************************/
 
-NTSTATUS sam_set_account_lm_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
+NTSTATUS sam_set_account_lm_pwd(SAM_ACCOUNT_HANDLE *sampass, const DATA_BLOB data)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.lm_pw = data;
 
@@ -782,8 +755,7 @@ NTSTATUS sam_set_account_lm_pwd(SAM_ACCOUNT_HANDLE *sampass, DATA_BLOB data)
 
 NTSTATUS sam_set_account_plaintext_pwd(SAM_ACCOUNT_HANDLE *sampass, const char *plain_pwd)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.plaintext_pw = talloc_strdup(sampass->mem_ctx, plain_pwd);
 
@@ -792,8 +764,7 @@ NTSTATUS sam_set_account_plaintext_pwd(SAM_ACCOUNT_HANDLE *sampass, const char *
 
 NTSTATUS sam_set_account_unknown_1(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.unknown_1 = unkn;
 
@@ -802,8 +773,7 @@ NTSTATUS sam_set_account_unknown_1(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 
 NTSTATUS sam_set_account_unknown_2(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.unknown_2 = unkn;
 
@@ -812,8 +782,7 @@ NTSTATUS sam_set_account_unknown_2(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 
 NTSTATUS sam_set_account_unknown_3(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	sampass->private.unknown_3 = unkn;
 	return NT_STATUS_OK;
@@ -821,8 +790,7 @@ NTSTATUS sam_set_account_unknown_3(SAM_ACCOUNT_HANDLE *sampass, uint32 unkn)
 
 NTSTATUS sam_set_account_hours(SAM_ACCOUNT_HANDLE *sampass, const uint8 *hours)
 {
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 
 	if (!hours) {
 		memset ((char *)sampass->private.hours, 0, MAX_HOURS_LEN);
@@ -846,8 +814,7 @@ NTSTATUS sam_set_account_pass_changed_now(SAM_ACCOUNT_HANDLE *sampass)
 	uint32 expire;
 	NTTIME temptime;
 
-	if (!sampass)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass);
 	
 	unix_to_nt_time(&temptime, time(NULL));
 	if (!NT_STATUS_IS_OK(sam_set_account_pass_last_set_time(sampass, temptime)))
@@ -881,8 +848,7 @@ NTSTATUS sam_set_account_passwd(SAM_ACCOUNT_HANDLE *sampass, const char *plainte
 	uchar new_lanman_p16[16];
 	uchar new_nt_p16[16];
 
-	if (!sampass || !plaintext)
-		return NT_STATUS_UNSUCCESSFUL;
+	SAM_ASSERT(sampass && plaintext);
 	
 	nt_lm_owf_gen(plaintext, new_nt_p16, new_lanman_p16);
 
-- 
cgit