[ros-diffs] [ekohl] 61005: [SAMSRV] SamrDeleteUser: Prepare the removal of a user from groups and aliases.

Author: ekohl
Date: Sat Nov 16 09:07:37 2013
New Revision: 61005

URL: http://svn.reactos.org/svn/reactos?rev=61005&view=rev
Log:
[SAMSRV]
SamrDeleteUser: Prepare the removal of a user from groups and aliases.

Modified:
    trunk/reactos/dll/win32/samsrv/samrpc.c
    trunk/reactos/dll/win32/samsrv/samsrv.h
    trunk/reactos/dll/win32/samsrv/user.c

Modified: trunk/reactos/dll/win32/samsrv/samrpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?…
==============================================================================
--- trunk/reactos/dll/win32/samsrv/samrpc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/samrpc.c	[iso-8859-1] Sat Nov 16 09:07:37 2013
@@ -5427,9 +5427,21 @@
         goto done;
     }
 
-    /* FIXME: Remove the user from all groups */
-
-    /* FIXME: Remove the user from all aliases */
+    /* Remove the user from all groups */
+    Status = SampRemoveUserFromAllGroups(UserObject);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SampRemoveUserFromAllGroups() failed (Status 0x%08lx)\n",
Status);
+        goto done;
+    }
+
+    /* Remove the user from all aliases */
+    Status = SampRemoveUserFromAllAliases(UserObject);
+    if (!NT_SUCCESS(Status))
+    {
+        TRACE("SampRemoveUserFromAllAliases() failed (Status 0x%08lx)\n",
Status);
+        goto done;
+    }
 
     /* Delete the user from the database */
     Status = SampDeleteAccountDbObject(UserObject);

Modified: trunk/reactos/dll/win32/samsrv/samsrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?…
==============================================================================
--- trunk/reactos/dll/win32/samsrv/samsrv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/samsrv.h	[iso-8859-1] Sat Nov 16 09:07:37 2013
@@ -384,6 +384,9 @@
 SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject);
 
 NTSTATUS
+SampRemoveUserFromAllAliases(IN PSAM_DB_OBJECT UserObject);
+
+NTSTATUS
 SampSetUserPassword(IN PSAM_DB_OBJECT UserObject,
                     IN PENCRYPTED_NT_OWF_PASSWORD NtPassword,
                     IN BOOLEAN NtPasswordPresent,

Modified: trunk/reactos/dll/win32/samsrv/user.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re…
==============================================================================
--- trunk/reactos/dll/win32/samsrv/user.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samsrv/user.c	[iso-8859-1] Sat Nov 16 09:07:37 2013
@@ -380,6 +380,14 @@
         midl_user_free(GroupsBuffer);
 
     return Status;
+}
+
+
+NTSTATUS
+SampRemoveUserFromAllAliases(IN PSAM_DB_OBJECT UserObject)
+{
+    FIXME("(%p)\n", UserObject);
+    return STATUS_SUCCESS;
 }