Index: cmdUser.c
===================================================================
--- cmdUser.c	(revision 71051)
+++ cmdUser.c	(working copy)
@@ -4,7 +4,7 @@
  * FILE:            base/applications/network/net/cmdUser.c
  * PURPOSE:
  *
- * PROGRAMMERS:     Eric Kohl
+ * PROGRAMMERS:     Eric Kohl, Curtis Wilson
  */
 
 #include "net.h"
@@ -45,15 +45,18 @@
 
     NetApiBufferFree(pServer);
 
+do
+{
     Status = NetUserEnum(NULL,
-                         0,
-                         0,
-                         (LPBYTE*)&pBuffer,
-                         MAX_PREFERRED_LENGTH,
-                         &dwRead,
-                         &dwTotal,
-                         &ResumeHandle);
-    if (Status != NERR_Success)
+                0,
+                0,
+                (LPBYTE*)&pBuffer,
+                MAX_PREFERRED_LENGTH,
+                &dwRead,
+                &dwTotal,
+                &ResumeHandle);
+
+    if ((Status != NERR_Success) && (Status != ERROR_MORE_DATA))
         return Status;
 
     qsort(pBuffer,
@@ -69,8 +72,13 @@
             PrintToConsole(L"%s\n", pBuffer[i].usri0_name);
     }
 
-    NetApiBufferFree(pBuffer);
-
+    if(pBuffer != NULL)
+    {
+        NetApiBufferFree(pBuffer);
+        pBuffer = NULL;
+    }
+}
+while(Status == ERROR_MORE_DATA);
     return NERR_Success;
 }