Index: samrpc.c
===================================================================
--- samrpc.c	(revision 71099)
+++ samrpc.c	(working copy)
@@ -4,7 +4,7 @@
  * FILE:            reactos/dll/win32/samsrv/samrpc.c
  * PURPOSE:         RPC interface functions
  *
- * PROGRAMMERS:     Eric Kohl
+ * PROGRAMMERS:     Eric Kohl, Curtis Wilson
  */
 
 #include "samsrv.h"
@@ -3132,8 +3132,11 @@
     }
 
     EnumBuffer->EntriesRead = EnumCount;
-    if (EnumCount == 0)
+   if (EnumCount == 0)
+    {
+        Status = STATUS_NO_MORE_ENTRIES; // No entries found
         goto done;
+    }
 
     EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION));
     if (EnumBuffer->Buffer == NULL)