From 705f36b804093f656498f7963768a418672cd422 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sat, 9 May 2009 00:02:00 +0200
Subject: s3-samr: Fix SetUserInfo level 7 when there has been no name change.

Found by torture test.

Guenther
---
 source3/rpc_server/srv_samr_nt.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 0d87ad84ae..17e111d4ea 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -4013,6 +4013,12 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
 	   code (like UNSUCCESSFUL instead of ALREADY_EXISTS). */
 
 	rc = can_create(mem_ctx, id7->account_name.string);
+
+	/* when there is nothing to change, we're done here */
+	if (NT_STATUS_EQUAL(rc, NT_STATUS_USER_EXISTS) &&
+	    strequal(id7->account_name.string, pdb_get_username(pwd))) {
+		return NT_STATUS_OK;
+	}
 	if (!NT_STATUS_IS_OK(rc)) {
 		return rc;
 	}
-- 
cgit