svn commit: samba r2480 - in trunk/source/rpc_server: .

[jra at samba.org]

Author: jra
Date: 2004-09-22 00:33:08 +0000 (Wed, 22 Sep 2004)
New Revision: 2480

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/rpc_server&rev=2480&nolog=1

Log:
Patch from Igor Belyi <sambauser at katehok.ac93.org>. Ensure pdb
user is deleted first before deleting UNIX user (LDAP backend
needs this ordering).
Jeremy.

Modified:
   trunk/source/rpc_server/srv_samr_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_samr_nt.c
===================================================================
--- trunk/source/rpc_server/srv_samr_nt.c	2004-09-21 22:16:36 UTC (rev 2479)
+++ trunk/source/rpc_server/srv_samr_nt.c	2004-09-22 00:33:08 UTC (rev 2480)
@@ -3747,7 +3747,14 @@
 		return NT_STATUS_NO_SUCH_USER;
 	}
 
-	/* delete the unix side */
+	/* First delete the samba side */
+	if (!pdb_delete_sam_account(sam_pass)) {
+		DEBUG(5,("_samr_delete_dom_user:Failed to delete entry for user %s.\n", pdb_get_username(sam_pass)));
+		pdb_free_sam(&sam_pass);
+		return NT_STATUS_CANNOT_DELETE;
+	}
+
+	/* Now delete the unix side */
 	/*
 	 * note: we don't check if the delete really happened
 	 * as the script is not necessary present
@@ -3755,13 +3762,7 @@
 	 */
 	smb_delete_user(pdb_get_username(sam_pass));
 
-	/* and delete the samba side */
-	if (!pdb_delete_sam_account(sam_pass)) {
-		DEBUG(5,("_samr_delete_dom_user:Failed to delete entry for user %s.\n", pdb_get_username(sam_pass)));
-		pdb_free_sam(&sam_pass);
-		return NT_STATUS_CANNOT_DELETE;
-	}
-	
+
 	pdb_free_sam(&sam_pass);
 
 	if (!close_policy_hnd(p, &q_u->user_pol))