Merge 3.0's change to how we add users onto HEAD, including a few other bits

of sync-up for the rpc_server/srv_samr_nt.c

Andrew Bartlett

1 files changed, 4 insertions, 12 deletions

diff --git a/source/utils/pdbedit.c b/source/utils/pdbedit.c
index d7de709e212..3a3d06a6452 100644
--- a/source/utils/pdbedit.c
+++ b/source/utils/pdbedit.c
@@ -351,20 +351,12 @@ static int new_user (struct pdb_context *in, const char *username,
 			const char *profile, char *user_sid, char *group_sid)
 {
 	SAM_ACCOUNT *sam_pwent=NULL;
-	struct passwd  *pwd = NULL;
+	NTSTATUS nt_status;
 	char *password1, *password2, *staticpass;
 	
-	ZERO_STRUCT(sam_pwent);
-
-	if ((pwd = getpwnam_alloc(username))) {
-		pdb_init_sam_pw (&sam_pwent, pwd);
-		passwd_free(&pwd);
-	} else {
-		fprintf (stderr, "WARNING: user %s does not exist in system passwd\n", username);
-		pdb_init_sam(&sam_pwent);
-		if (!pdb_set_username(sam_pwent, username, PDB_CHANGED)) {
-			return -1;
-		}
+	if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_new(&sam_pwent, username))) {
+		DEBUG(0, ("could not create account to add new user %s\n", username));
+		return -1;
 	}
 
 	staticpass = getpass("new password:");