[SAMSRV]

SampRemoveUserFromAllGroups:
- Do not treat a STATUS_MEMBER_NOT_IN_GROUP, returned by SampRemoveMemberFromGroup, as error but as success.
- Clear the Groups attribute at the end.

svn path=/trunk/; revision=64169

diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c
index 04ca49f..a442780 100644 (file)
--- a/reactos/dll/win32/samsrv/user.c
+++ b/reactos/dll/win32/samsrv/user.c
@@ -361,6 +361,8 @@ SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject)
 
         Status = SampRemoveMemberFromGroup(GroupObject,
                                            UserObject->RelativeId);
 
         Status = SampRemoveMemberFromGroup(GroupObject,
                                            UserObject->RelativeId);

+        if (Status == STATUS_MEMBER_NOT_IN_GROUP)
+            Status = STATUS_SUCCESS;

 
         SampCloseDbObject(GroupObject);
 
 
         SampCloseDbObject(GroupObject);
 


@@ -370,6 +372,13 @@ SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject)
         }
     }
 
         }
     }
 

+    /* Remove all groups from the Groups attribute */
+    Status = SampSetObjectAttribute(UserObject,
+                                    L"Groups",
+                                    REG_BINARY,
+                                    NULL,
+                                    0);
+

 done:
     if (GroupsBuffer != NULL)
         midl_user_free(GroupsBuffer);
 done:
     if (GroupsBuffer != NULL)
         midl_user_free(GroupsBuffer);