diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a46d88a8d..67a1a80be 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-29  Corinna Vinschen  <corinna@vinschen.de>
+
+	* security.cc (is_group_member): Call NetLocalGroupGetMembers() for
+	local machine only.
+	(get_user_local_groups): Ditto for NetLocalGroupEnum().
+
 2001-10-29  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler.cc (fhandler_base::set_name): Set namehash here to catch
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 40081fbef..971612e17 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -326,11 +326,8 @@ is_group_member (WCHAR *wlogonserver, WCHAR *wgroup,
   NET_API_STATUS ret;
   BOOL retval = FALSE;
 
-  ret = NetLocalGroupGetMembers (wlogonserver, wgroup, 0, (LPBYTE *) &buf,
+  ret = NetLocalGroupGetMembers (NULL, wgroup, 0, (LPBYTE *) &buf,
 				 MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
-  if (ret == ERROR_BAD_NETPATH || ret == RPC_S_SERVER_UNAVAILABLE)
-    ret = NetLocalGroupGetMembers (NULL, wgroup, 0, (LPBYTE *) &buf,
-				   MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
   if (ret)
     return FALSE;
 
@@ -354,11 +351,8 @@ get_user_local_groups (WCHAR *wlogonserver, const char *logonserver,
   DWORD cnt, tot;
   NET_API_STATUS ret;
 
-  ret = NetLocalGroupEnum (wlogonserver, 0, (LPBYTE *) &buf,
+  ret = NetLocalGroupEnum (NULL, 0, (LPBYTE *) &buf,
 			   MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
-  if (ret == ERROR_BAD_NETPATH || ret == RPC_S_SERVER_UNAVAILABLE)
-    ret = NetLocalGroupEnum (NULL, 0, (LPBYTE *) &buf,
-			     MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
   if (ret)
     {
       debug_printf ("%d = NetLocalGroupEnum ()", ret);