Consolidate create/delete account paths in pdbedit

Use common paths like for smbpasswd, so that all utilities
behave the same way. As for smbpasswd this changes the behavior
of pdbedit to create/delete unix users is the add/delete user
scripts are provided, or ldapsam:editposix is configured.

Signed-off-by: Günther Deschner <gd@samba.org>

1 files changed, 319 insertions, 257 deletions

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 328b2cb1f4..000f8c8d56 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -53,6 +53,7 @@
 #define MASK_ALWAYS_GOOD	0x0000001F
 #define MASK_USER_GOOD		0x00405FE0
 
+
 /*********************************************************
  Add all currently available users to another db
  ********************************************************/
@@ -321,167 +322,187 @@ static int print_sam_info (struct samu *sam_pwent, bool verbosity, bool smbpwdst
  Get an Print User Info
 **********************************************************/
 
-static int print_user_info (struct pdb_methods *in, const char *username, bool verbosity, bool smbpwdstyle)
+static int print_user_info(const char *username,
+			   bool verbosity, bool smbpwdstyle)
 {
-	struct samu *sam_pwent=NULL;
-	bool ret;
+	struct samu *sam_pwent = NULL;
+	bool bret;
+	int ret;
 
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
+	sam_pwent = samu_new(NULL);
+	if (!sam_pwent) {
 		return -1;
 	}
 
-	ret = NT_STATUS_IS_OK(in->getsampwnam (in, sam_pwent, username));
-
-	if (ret==False) {
+	bret = pdb_getsampwnam(sam_pwent, username);
+	if (!bret) {
 		fprintf (stderr, "Username not found!\n");
 		TALLOC_FREE(sam_pwent);
 		return -1;
 	}
 
-	ret=print_sam_info (sam_pwent, verbosity, smbpwdstyle);
+	ret = print_sam_info(sam_pwent, verbosity, smbpwdstyle);
+
 	TALLOC_FREE(sam_pwent);
-	
 	return ret;
 }
-	
+
 /*********************************************************
  List Users
 **********************************************************/
-static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwdstyle)
+static int print_users_list(bool verbosity, bool smbpwdstyle)
 {
 	struct pdb_search *u_search;
 	struct samr_displayentry userentry;
-
-	u_search = pdb_search_init(talloc_tos(), PDB_USER_SEARCH);
-	if (u_search == NULL) {
-		DEBUG(0, ("pdb_search_init failed\n"));
+	struct samu *sam_pwent;
+	TALLOC_CTX *tosctx;
+	DOM_SID user_sid;
+	bool bret;
+	int ret;
+
+	tosctx = talloc_tos();
+	if (!tosctx) {
+		DEBUG(0, ("talloc failed\n"));
 		return 1;
 	}
 
-	if (!in->search_users(in, u_search, 0)) {
-		DEBUG(0, ("Could not start searching users\n"));
-		TALLOC_FREE(u_search);
-		return 1;
+	u_search = pdb_search_users(tosctx, 0);
+	if (!u_search) {
+		DEBUG(0, ("User Search failed!\n"));
+		ret = 1;
+		goto done;
 	}
 
 	while (u_search->next_entry(u_search, &userentry)) {
-		struct samu *sam_pwent;
-		DOM_SID user_sid;
-		NTSTATUS status;
 
-		sam_pwent = samu_new(talloc_tos());
+		sam_pwent = samu_new(tosctx);
 		if (sam_pwent == NULL) {
 			DEBUG(0, ("talloc failed\n"));
-			break;
+			ret = 1;
+			goto done;
 		}
 
 		sid_compose(&user_sid, get_global_sam_sid(), userentry.rid);
 
-		status = in->getsampwsid(in, sam_pwent, &user_sid);
-
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(2, ("getsampwsid failed: %s\n",
-				  nt_errstr(status)));
+		bret = pdb_getsampwsid(sam_pwent, &user_sid);
+		if (!bret) {
+			DEBUG(2, ("getsampwsid failed\n"));
 			TALLOC_FREE(sam_pwent);
 			continue;
 		}
 
-		if (verbosity)
+		if (verbosity) {
 			printf ("---------------\n");
-		print_sam_info (sam_pwent, verbosity, smbpwdstyle);
+		}
+		print_sam_info(sam_pwent, verbosity, smbpwdstyle);
 		TALLOC_FREE(sam_pwent);
 	}
-	TALLOC_FREE(u_search);
 
-	return 0;
+	ret = 0;
+
+done:
+	TALLOC_FREE(tosctx);
+	return ret;
 }
 
 /*********************************************************
  Fix a list of Users for uninitialised passwords
 **********************************************************/
-static int fix_users_list (struct pdb_methods *in)
+static int fix_users_list(void)
 {
 	struct pdb_search *u_search;
 	struct samr_displayentry userentry;
+	struct samu *sam_pwent;
+	TALLOC_CTX *tosctx;
+	DOM_SID user_sid;
+	NTSTATUS status;
+	bool bret;
+	int ret;
 
-	u_search = pdb_search_init(talloc_tos(), PDB_USER_SEARCH);
-	if (u_search == NULL) {
-		DEBUG(0, ("pdb_search_init failed\n"));
+	tosctx = talloc_tos();
+	if (!tosctx) {
+		fprintf(stderr, "Out of memory!\n");
 		return 1;
 	}
 
-	if (!in->search_users(in, u_search, 0)) {
-		DEBUG(0, ("Could not start searching users\n"));
-		TALLOC_FREE(u_search);
-		return 1;
+	u_search = pdb_search_users(tosctx, 0);
+	if (!u_search) {
+		fprintf(stderr, "User Search failed!\n");
+		ret = 1;
+		goto done;
 	}
 
 	while (u_search->next_entry(u_search, &userentry)) {
-		struct samu *sam_pwent;
-		DOM_SID user_sid;
-		NTSTATUS status;
 
-		sam_pwent = samu_new(talloc_tos());
+		sam_pwent = samu_new(tosctx);
 		if (sam_pwent == NULL) {
-			DEBUG(0, ("talloc failed\n"));
-			break;
+			fprintf(stderr, "Out of memory!\n");
+			ret = 1;
+			goto done;
 		}
 
 		sid_compose(&user_sid, get_global_sam_sid(), userentry.rid);
 
-		status = in->getsampwsid(in, sam_pwent, &user_sid);
-
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(2, ("getsampwsid failed: %s\n",
-				  nt_errstr(status)));
+		bret = pdb_getsampwsid(sam_pwent, &user_sid);
+		if (!bret) {
+			DEBUG(2, ("getsampwsid failed\n"));
 			TALLOC_FREE(sam_pwent);
 			continue;
 		}
 
-		if (!NT_STATUS_IS_OK(pdb_update_sam_account(sam_pwent))) {
+		status = pdb_update_sam_account(sam_pwent);
+		if (!NT_STATUS_IS_OK(status)) {
 			printf("Update of user %s failed!\n",
 			       pdb_get_username(sam_pwent));
 		}
 		TALLOC_FREE(sam_pwent);
 	}
-	TALLOC_FREE(u_search);
-	return 0;
+
+	ret = 0;
+
+done:
+	TALLOC_FREE(tosctx);
+	return ret;
 }
 
 /*********************************************************
  Set User Info
 **********************************************************/
 
-static int set_user_info (struct pdb_methods *in, const char *username, 
-			  const char *fullname, const char *homedir, 
-			  const char *acct_desc, 
-			  const char *drive, const char *script, 
-			  const char *profile, const char *account_control,
-			  const char *user_sid, const char *user_domain,
-			  const bool badpw, const bool hours)
+static int set_user_info(const char *username, const char *fullname,
+			 const char *homedir, const char *acct_desc,
+			 const char *drive, const char *script,
+			 const char *profile, const char *account_control,
+			 const char *user_sid, const char *user_domain,
+			 const bool badpw, const bool hours)
 {
 	bool updated_autolock = False, updated_badpw = False;
-	struct samu *sam_pwent=NULL;
+	struct samu *sam_pwent;
+	uint8_t hours_array[MAX_HOURS_LEN];
+	uint32_t hours_len;
+	uint32_t acb_flags;
+	uint32_t not_settable;
+	uint32_t new_flags;
+	DOM_SID u_sid;
+	int u_rid;
 	bool ret;
-	
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
+
+	sam_pwent = samu_new(NULL);
+	if (!sam_pwent) {
 		return 1;
 	}
-	
-	ret = NT_STATUS_IS_OK(in->getsampwnam (in, sam_pwent, username));
-	if (ret==False) {
+
+	ret = pdb_getsampwnam(sam_pwent, username);
+	if (!ret) {
 		fprintf (stderr, "Username not found!\n");
 		TALLOC_FREE(sam_pwent);
 		return -1;
 	}
 
 	if (hours) {
-		uint8 hours_array[MAX_HOURS_LEN];
-		uint32 hours_len;
-		
 		hours_len = pdb_get_hours_len(sam_pwent);
 		memset(hours_array, 0xff, hours_len);
-		
+
 		pdb_set_hours(sam_pwent, hours_array, PDB_CHANGED);
 	}
 
@@ -509,27 +530,28 @@ static int set_user_info (struct pdb_methods *in, const char *username,
 		pdb_set_domain(sam_pwent, user_domain, PDB_CHANGED);
 
 	if (account_control) {
-		uint32 not_settable = ~(ACB_DISABLED|ACB_HOMDIRREQ|ACB_PWNOTREQ|
-					ACB_PWNOEXP|ACB_AUTOLOCK);
+		not_settable = ~(ACB_DISABLED | ACB_HOMDIRREQ |
+				 ACB_PWNOTREQ | ACB_PWNOEXP | ACB_AUTOLOCK);
 
-		uint32 newflag = pdb_decode_acct_ctrl(account_control);
+		new_flags = pdb_decode_acct_ctrl(account_control);
 
-		if (newflag & not_settable) {
+		if (new_flags & not_settable) {
 			fprintf(stderr, "Can only set [NDHLX] flags\n");
 			TALLOC_FREE(sam_pwent);
 			return -1;
 		}
 
+		acb_flags = pdb_get_acct_ctrl(sam_pwent);
+
 		pdb_set_acct_ctrl(sam_pwent,
-				  (pdb_get_acct_ctrl(sam_pwent) & not_settable) | newflag,
+				  (acb_flags & not_settable) | new_flags,
 				  PDB_CHANGED);
 	}
 	if (user_sid) {
-		DOM_SID u_sid;
 		if (!string_to_sid(&u_sid, user_sid)) {
-			/* not a complete sid, may be a RID, try building a SID */
-			int u_rid;
-			
+			/* not a complete sid, may be a RID,
+			 * try building a SID */
+
 			if (sscanf(user_sid, "%d", &u_rid) != 1) {
 				fprintf(stderr, "Error passed string is not a complete user SID or RID!\n");
 				return -1;
@@ -537,7 +559,7 @@ static int set_user_info (struct pdb_methods *in, const char *username,
 			sid_copy(&u_sid, get_global_sam_sid());
 			sid_append_rid(&u_sid, u_rid);
 		}
-		pdb_set_user_sid (sam_pwent, &u_sid, PDB_CHANGED);
+		pdb_set_user_sid(sam_pwent, &u_sid, PDB_CHANGED);
 	}
 
 	if (badpw) {
@@ -545,9 +567,9 @@ static int set_user_info (struct pdb_methods *in, const char *username,
 		pdb_set_bad_password_time(sam_pwent, 0, PDB_CHANGED);
 	}
 
-	if (NT_STATUS_IS_OK(in->update_sam_account (in, sam_pwent)))
-		print_user_info (in, username, True, False);
-	else {
+	if (NT_STATUS_IS_OK(pdb_update_sam_account(sam_pwent))) {
+		print_user_info(username, True, False);
+	} else {
 		fprintf (stderr, "Unable to modify entry!\n");
 		TALLOC_FREE(sam_pwent);
 		return -1;
@@ -559,177 +581,201 @@ static int set_user_info (struct pdb_methods *in, const char *username,
 /*********************************************************
  Add New User
 **********************************************************/
-static int new_user (struct pdb_methods *in, const char *username,
-			const char *fullname, const char *homedir,
-			const char *drive, const char *script,
-			const char *profile, char *user_sid, bool stdin_get)
+static int new_user(const char *username, const char *fullname,
+		    const char *homedir, const char *drive,
+		    const char *script, const char *profile,
+		    char *user_sid, bool stdin_get)
 {
+	char *pwd1 = NULL, *pwd2 = NULL;
+	char *err = NULL, *msg = NULL;
 	struct samu *sam_pwent;
-	char *password1, *password2;
-	int rc_pwd_cmp;
-	struct passwd *pwd;
-
-	get_global_sam_sid();
-
-	if ( !(pwd = getpwnam_alloc(talloc_autofree_context(), username )) ) {
-		DEBUG(0,("Cannot locate Unix account for %s\n", username));
+	TALLOC_CTX *tosctx;
+	NTSTATUS status;
+	DOM_SID u_sid;
+	int u_rid;
+	int flags;
+	int ret;
+
+	tosctx = talloc_tos();
+	if (!tosctx) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
-		DEBUG(0, ("Memory allocation failure!\n"));
-		return -1;
-	}
 
-	if (!NT_STATUS_IS_OK(samu_alloc_rid_unix(sam_pwent, pwd ))) {
-		TALLOC_FREE( sam_pwent );
-		TALLOC_FREE( pwd );
-		DEBUG(0, ("could not create account to add new user %s\n", username));
-		return -1;
+	if (user_sid) {
+		if (!string_to_sid(&u_sid, user_sid)) {
+			/* not a complete sid, may be a RID,
+			 * try building a SID */
+
+			if (sscanf(user_sid, "%d", &u_rid) != 1) {
+				fprintf(stderr, "Error passed string is not a complete user SID or RID!\n");
+				ret = -1;
+				goto done;
+			}
+			sid_copy(&u_sid, get_global_sam_sid());
+			sid_append_rid(&u_sid, u_rid);
+		}
 	}
 
-	password1 = get_pass( "new password:", stdin_get);
-	password2 = get_pass( "retype new password:", stdin_get);
-	if ((rc_pwd_cmp = strcmp (password1, password2))) {
+	pwd1 = get_pass( "new password:", stdin_get);
+	pwd2 = get_pass( "retype new password:", stdin_get);
+	ret = strcmp(pwd1, pwd2);
+	if (ret != 0) {
 		fprintf (stderr, "Passwords do not match!\n");
-		TALLOC_FREE(sam_pwent);
-	} else {
-		pdb_set_plaintext_passwd(sam_pwent, password1);
+		goto done;
 	}
 
-	memset(password1, 0, strlen(password1));
-	SAFE_FREE(password1);
-	memset(password2, 0, strlen(password2));
-	SAFE_FREE(password2);
+	flags = LOCAL_ADD_USER | LOCAL_SET_PASSWORD;
 
-	/* pwds do _not_ match? */
-	if (rc_pwd_cmp)
-		return -1;
+	status = local_password_change(username, flags, pwd1, &err, &msg);
+	if (!NT_STATUS_IS_OK(status)) {
+		if (err) fprintf(stderr, err);
+		ret = -1;
+		goto done;
+	}
+
+	sam_pwent = samu_new(tosctx);
+	if (!sam_pwent) {
+		fprintf(stderr, "Out of memory!\n");
+		ret = -1;
+		goto done;
+	}
+
+	if (!pdb_getsampwnam(sam_pwent, username)) {
+		fprintf(stderr, "User %s not found!\n", username);
+		ret = -1;
+		goto done;
+	}
 
 	if (fullname)
 		pdb_set_fullname(sam_pwent, fullname, PDB_CHANGED);
 	if (homedir)
-		pdb_set_homedir (sam_pwent, homedir, PDB_CHANGED);
+		pdb_set_homedir(sam_pwent, homedir, PDB_CHANGED);
 	if (drive)
-		pdb_set_dir_drive (sam_pwent, drive, PDB_CHANGED);
+		pdb_set_dir_drive(sam_pwent, drive, PDB_CHANGED);
 	if (script)
 		pdb_set_logon_script(sam_pwent, script, PDB_CHANGED);
 	if (profile)
-		pdb_set_profile_path (sam_pwent, profile, PDB_CHANGED);
-	if (user_sid) {
-		DOM_SID u_sid;
-		if (!string_to_sid(&u_sid, user_sid)) {
-			/* not a complete sid, may be a RID, try building a SID */
-			int u_rid;
-			
-			if (sscanf(user_sid, "%d", &u_rid) != 1) {
-				fprintf(stderr, "Error passed string is not a complete user SID or RID!\n");
-				TALLOC_FREE(sam_pwent);
-				return -1;
-			}
-			sid_copy(&u_sid, get_global_sam_sid());
-			sid_append_rid(&u_sid, u_rid);
-		}
-		pdb_set_user_sid (sam_pwent, &u_sid, PDB_CHANGED);
+		pdb_set_profile_path(sam_pwent, profile, PDB_CHANGED);
+	if (user_sid)
+		pdb_set_user_sid(sam_pwent, &u_sid, PDB_CHANGED);
+
+	status = pdb_update_sam_account(sam_pwent);
+	if (!NT_STATUS_IS_OK(status)) {
+		fprintf(stderr,
+			"Failed to modify entry for user %s.!\n",
+			username);
+		ret = -1;
+		goto done;
 	}
-	
-	pdb_set_acct_ctrl (sam_pwent, ACB_NORMAL, PDB_CHANGED);
-	
-	if (NT_STATUS_IS_OK(in->add_sam_account (in, sam_pwent))) { 
-		print_user_info (in, username, True, False);
-	} else {
-		fprintf (stderr, "Unable to add user! (does it already exist?)\n");
-		TALLOC_FREE(sam_pwent);
-		return -1;
-	}
-	TALLOC_FREE(sam_pwent);
-	return 0;
+
+	print_user_info(username, True, False);
+	ret = 0;
+
+done:
+	if (pwd1) memset(pwd1, 0, strlen(pwd1));
+	if (pwd2) memset(pwd2, 0, strlen(pwd2));
+	SAFE_FREE(pwd1);
+	SAFE_FREE(pwd2);
+	SAFE_FREE(err);
+	SAFE_FREE(msg);
+	TALLOC_FREE(tosctx);
+	return ret;
 }
 
 /*********************************************************
  Add New Machine
 **********************************************************/
 
-static int new_machine (struct pdb_methods *in, const char *machine_in)
+static int new_machine(const char *machinename)
 {
-	struct samu *sam_pwent=NULL;
-	fstring machinename;
-	fstring machineaccount;
-	struct passwd  *pwd = NULL;
-	
-	get_global_sam_sid();
-
-	if (strlen(machine_in) == 0) {
+	char *err = NULL, *msg = NULL;
+	TALLOC_CTX *tosctx;
+	NTSTATUS status;
+	char *compatpwd;
+	char *name;
+	int flags;
+	int len;
+	int ret;
+
+	len = strlen(machinename);
+	if (len == 0) {
 		fprintf(stderr, "No machine name given\n");
 		return -1;
 	}
 
-	fstrcpy(machinename, machine_in); 
-	machinename[15]= '\0';
-
-	if (machinename[strlen (machinename) -1] == '$')
-		machinename[strlen (machinename) -1] = '\0';
-	
-	strlower_m(machinename);
-	
-	fstrcpy(machineaccount, machinename);
-	fstrcat(machineaccount, "$");
-
-	if ( !(pwd = getpwnam_alloc(talloc_autofree_context(), machineaccount )) ) {
-		DEBUG(0,("Cannot locate Unix account for %s\n", machineaccount));
+	tosctx = talloc_tos();
+	if (!tosctx) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
-		fprintf(stderr, "Memory allocation error!\n");
-		TALLOC_FREE(pwd);
+	compatpwd = talloc_strdup(tosctx, machinename);
+	if (!compatpwd) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	if ( !NT_STATUS_IS_OK(samu_alloc_rid_unix(sam_pwent, pwd )) ) {
-		fprintf(stderr, "Could not init sam from pw\n");
-		TALLOC_FREE(pwd);
+	if (machinename[len-1] == '$') {
+		name = talloc_strdup(tosctx, machinename);
+		compatpwd[len-1] = '\0';
+	} else {
+		name = talloc_asprintf(tosctx, "%s$", machinename);
+	}
+	if (!name) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	TALLOC_FREE(pwd);
+	strlower_m(name);
+
+	flags = LOCAL_ADD_USER | LOCAL_TRUST_ACCOUNT | LOCAL_SET_PASSWORD;
+
+	status = local_password_change(name, flags, compatpwd, &err, &msg);
 
-	pdb_set_plaintext_passwd (sam_pwent, machinename);
-	pdb_set_username (sam_pwent, machineaccount, PDB_CHANGED);	
-	pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST, PDB_CHANGED);
-	
-	if (NT_STATUS_IS_OK(in->add_sam_account (in, sam_pwent))) {
-		print_user_info (in, machineaccount, True, False);
+	if (NT_STATUS_IS_OK(status)) {
+		print_user_info(name, True, False);
+		ret = 0;
 	} else {
-		fprintf (stderr, "Unable to add machine! (does it already exist?)\n");
-		TALLOC_FREE(sam_pwent);
-		return -1;
+		if (err) fprintf(stderr, err);
+		ret = -1;
 	}
-	TALLOC_FREE(sam_pwent);
-	return 0;
+
+	TALLOC_FREE(tosctx);
+	SAFE_FREE(err);
+	SAFE_FREE(msg);
+	return ret;
 }
 
 /*********************************************************
  Delete user entry
 **********************************************************/
 
-static int delete_user_entry (struct pdb_methods *in, const char *username)
+static int delete_user_entry(const char *username)
 {
-	struct samu *samaccount = NULL;
+	struct samu *samaccount;
 
-	if ( (samaccount = samu_new( NULL )) == NULL ) {
+	samaccount = samu_new(NULL);
+	if (!samaccount) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	if (!NT_STATUS_IS_OK(in->getsampwnam(in, samaccount, username))) {
-		fprintf (stderr, "user %s does not exist in the passdb\n", username);
+	if (!pdb_getsampwnam(samaccount, username)) {
+		fprintf (stderr,
+			 "user %s does not exist in the passdb\n", username);
+		TALLOC_FREE(samaccount);
 		return -1;
 	}
 
-	if (!NT_STATUS_IS_OK(in->delete_sam_account (in, samaccount))) {
+	if (!NT_STATUS_IS_OK(pdb_delete_sam_account(samaccount))) {
 		fprintf (stderr, "Unable to delete user %s\n", username);
+		TALLOC_FREE(samaccount);
 		return -1;
 	}
+
+	TALLOC_FREE(samaccount);
 	return 0;
 }
 
@@ -737,35 +783,42 @@ static int delete_user_entry (struct pdb_methods *in, const char *username)
  Delete machine entry
 **********************************************************/
 
-static int delete_machine_entry (struct pdb_methods *in, const char *machinename)
+static int delete_machine_entry(const char *machinename)
 {
-	fstring name;
 	struct samu *samaccount = NULL;
+	const char *name;
 
 	if (strlen(machinename) == 0) {
 		fprintf(stderr, "No machine name given\n");
 		return -1;
 	}
-	
-	fstrcpy(name, machinename);
-	name[15] = '\0';
-	if (name[strlen(name)-1] != '$')
-		fstrcat (name, "$");
 
-	if ( (samaccount = samu_new( NULL )) == NULL ) {
+	samaccount = samu_new(NULL);
+	if (!samaccount) {
+		fprintf(stderr, "Out of memory!\n");
 		return -1;
 	}
 
-	if (!NT_STATUS_IS_OK(in->getsampwnam(in, samaccount, name))) {
-		fprintf (stderr, "machine %s does not exist in the passdb\n", name);
+	if (machinename[strlen(machinename)-1] != '$') {
+		name = talloc_asprintf(samaccount, "%s$", machinename);
+	} else {
+		name = machinename;
+	}
+
+	if (!pdb_getsampwnam(samaccount, name)) {
+		fprintf (stderr,
+			 "machine %s does not exist in the passdb\n", name);
 		return -1;
+		TALLOC_FREE(samaccount);
 	}
 
-	if (!NT_STATUS_IS_OK(in->delete_sam_account (in, samaccount))) {
+	if (!NT_STATUS_IS_OK(pdb_delete_sam_account(samaccount))) {
 		fprintf (stderr, "Unable to delete machine %s\n", name);
+		TALLOC_FREE(samaccount);
 		return -1;
 	}
 
+	TALLOC_FREE(samaccount);
 	return 0;
 }
 
@@ -789,7 +842,7 @@ int main (int argc, char **argv)
 	static const char *user_name = NULL;
 	static char *home_dir = NULL;
 	static char *home_drive = NULL;
-	static char *backend = NULL;
+	static const char *backend = NULL;
 	static char *backend_in = NULL;
 	static char *backend_out = NULL;
 	static int transfer_groups = False;
@@ -808,8 +861,9 @@ int main (int argc, char **argv)
 	static int hours_reset = False;
 	static char *pwd_time_format = NULL;
 	static int pw_from_stdin = False;
-	struct pdb_methods *bin, *bout, *bdef;
+	struct pdb_methods *bin, *bout;
 	TALLOC_CTX *frame = talloc_stackframe();
+	NTSTATUS status;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -846,16 +900,16 @@ int main (int argc, char **argv)
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
-	
-	bin = bout = bdef = NULL;
+
+	bin = bout = NULL;
 
 	load_case_tables();
 
 	setup_logging("pdbedit", True);
-	
+
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
 			    POPT_CONTEXT_KEEP_FIRST);
-	
+
 	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case 'C':
@@ -874,9 +928,6 @@ int main (int argc, char **argv)
 		exit(1);
 	}
 
-	if(!initialize_password_db(False, NULL))
-		exit(1);
-
 	if (!init_names())
 		exit(1);
 
@@ -906,22 +957,24 @@ int main (int argc, char **argv)
 			(hours_reset ? BIT_LOGONHOURS : 0);
 
 	if (setparms & BIT_BACKEND) {
-		if (!NT_STATUS_IS_OK(make_pdb_method_name( &bdef, backend ))) {
-			fprintf(stderr, "Can't initialize passdb backend.\n");
-			return 1;
-		}
+		/* HACK: set the global passdb backend by overwriting globals.
+		 * This way we can use regular pdb functions for default
+		 * operations that do not involve passdb migrations */
+		lp_set_passdb_backend(backend);
 	} else {
-		if (!NT_STATUS_IS_OK(make_pdb_method_name(&bdef, lp_passdb_backend()))) {
-			fprintf(stderr, "Can't initialize passdb backend.\n");
-			return 1;
-		}
+		backend = lp_passdb_backend();
+	}
+
+	if (!initialize_password_db(False, NULL)) {
+		fprintf(stderr, "Can't initialize passdb backend.\n");
+		exit(1);
 	}
-	
+
 	/* the lowest bit options are always accepted */
 	checkparms = setparms & ~MASK_ALWAYS_GOOD;
 
 	if (checkparms & BIT_FIX_INIT) {
-		return fix_users_list(bdef);
+		return fix_users_list();
 	}
 
 	/* account policy operations */
@@ -973,45 +1026,49 @@ int main (int argc, char **argv)
 
 	/* import and export operations */
 
-	if ( ((checkparms & BIT_IMPORT) 
-		|| (checkparms & BIT_EXPORT))
-		&& !(checkparms & ~(BIT_IMPORT +BIT_EXPORT +BIT_USER)) ) 
-	{
-		NTSTATUS status;
-
-		bin = bout = bdef;
+	if (((checkparms & BIT_IMPORT) ||
+	     (checkparms & BIT_EXPORT)) &&
+	    !(checkparms & ~(BIT_IMPORT +BIT_EXPORT +BIT_USER))) {
 
 		if (backend_in) {
 			status = make_pdb_method_name(&bin, backend_in);
+		} else {
+			status = make_pdb_method_name(&bin, backend);
+		}
 
-			if ( !NT_STATUS_IS_OK(status) ) {
-				fprintf(stderr, "Unable to initialize %s.\n", backend_in);
-				return 1;
-			}
+		if (!NT_STATUS_IS_OK(status)) {
+			fprintf(stderr, "Unable to initialize %s.\n",
+				backend_in ? backend_in : backend);
+			return 1;
 		}
 
 		if (backend_out) {
 			status = make_pdb_method_name(&bout, backend_out);
+		} else {
+			status = make_pdb_method_name(&bout, backend);
+		}
 
-			if ( !NT_STATUS_IS_OK(status) ) {
-				fprintf(stderr, "Unable to initialize %s.\n", backend_out);
-				return 1;
-			}
+		if (!NT_STATUS_IS_OK(status)) {
+			fprintf(stderr, "Unable to initialize %s.\n",
+				backend_out ? backend_out : backend);
+			return 1;
 		}
 
 		if (transfer_account_policies) {
 
-			if (!(checkparms & BIT_USER))
+			if (!(checkparms & BIT_USER)) {
 				return export_account_policies(bin, bout);
+			}
 
 		} else 	if (transfer_groups) {
 
-			if (!(checkparms & BIT_USER))
+			if (!(checkparms & BIT_USER)) {
 				return export_groups(bin, bout);
+			}
 
 		} else {
-				return export_database(bin, bout, 
-					(checkparms & BIT_USER) ? user_name : NULL );
+			return export_database(bin, bout,
+				(checkparms & BIT_USER) ? user_name : NULL);
 		}
 	}
 
@@ -1020,7 +1077,7 @@ int main (int argc, char **argv)
 	if ((checkparms & BIT_USER) && !(checkparms & ~BIT_USER)) {
 		checkparms += BIT_LIST;
 	}
-	
+
 	/* modify flag is optional to maintain backwards compatibility */
 	/* fake up BIT_MODIFY if BIT_USER  and at least one of MASK_USER_GOOD is defined */
 	if (!((checkparms & ~MASK_USER_GOOD) & ~BIT_USER) && (checkparms & MASK_USER_GOOD)) {
@@ -1030,13 +1087,13 @@ int main (int argc, char **argv)
 	/* list users operations */
 	if (checkparms & BIT_LIST) {
 		if (!(checkparms & ~BIT_LIST)) {
-			return print_users_list (bdef, verbose, spstyle);
+			return print_users_list(verbose, spstyle);
 		}
 		if (!(checkparms & ~(BIT_USER + BIT_LIST))) {
-			return print_user_info (bdef, user_name, verbose, spstyle);
+			return print_user_info(user_name, verbose, spstyle);
 		}
 	}
-	
+
 	/* mask out users options */
 	checkparms &= ~MASK_USER_GOOD;
 
@@ -1051,7 +1108,7 @@ int main (int argc, char **argv)
 		checkparms |= BIT_MODIFY;
 		checkparms &= ~BIT_LOGONHOURS;
 	}
-	
+
 	/* account operation */
 	if ((checkparms & BIT_CREATE) || (checkparms & BIT_MODIFY) || (checkparms & BIT_DELETE)) {
 		/* check use of -u option */
@@ -1063,27 +1120,32 @@ int main (int argc, char **argv)
 		/* account creation operations */
 		if (!(checkparms & ~(BIT_CREATE + BIT_USER + BIT_MACHINE))) {
 		       	if (checkparms & BIT_MACHINE) {
-				return new_machine (bdef, user_name);
+				return new_machine(user_name);
 			} else {
-				return new_user (bdef, user_name, full_name, home_dir, 
-					home_drive, logon_script, profile_path, user_sid, pw_from_stdin);
+				return new_user(user_name, full_name,
+						home_dir, home_drive,
+						logon_script, profile_path,
+						user_sid, pw_from_stdin);
 			}
 		}
 
 		/* account deletion operations */
 		if (!(checkparms & ~(BIT_DELETE + BIT_USER + BIT_MACHINE))) {
 		       	if (checkparms & BIT_MACHINE) {
-				return delete_machine_entry (bdef, user_name);
+				return delete_machine_entry(user_name);
 			} else {
-				return delete_user_entry (bdef, user_name);
+				return delete_user_entry(user_name);
 			}
 		}
 
 		/* account modification operations */
 		if (!(checkparms & ~(BIT_MODIFY + BIT_USER))) {
-			return set_user_info (bdef, user_name, full_name, home_dir,
-				acct_desc, home_drive, logon_script, profile_path, account_control,
-				user_sid, user_domain, badpw_reset, hours_reset);
+			return set_user_info(user_name, full_name,
+					     home_dir, acct_desc,
+					     home_drive, logon_script,
+					     profile_path, account_control,
+					     user_sid, user_domain,
+					     badpw_reset, hours_reset);
 		}
 	}