--- samba-3.0.6/source/rpc_server/srv_samr_nt.c.orig	2004-09-06 12:36:10.000000000 -0400
+++ samba-3.0.6/source/rpc_server/srv_samr_nt.c	2004-09-06 12:36:16.000000000 -0400
@@ -3668,6 +3668,13 @@
 		return NT_STATUS_NO_SUCH_USER;
 	}
 
+	/* 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;
+	}
+	
 	/* delete the unix side */
 	/*
 	 * note: we don't check if the delete really happened
@@ -3676,13 +3683,6 @@
 	 */
 	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))