Index: source/nsswitch/winbindd_async.c
===================================================================
--- source/nsswitch/winbindd_async.c	(revision 17010)
+++ source/nsswitch/winbindd_async.c	(working copy)
@@ -4,7 +4,7 @@
    Async helpers for blocking functions
 
    Copyright (C) Volker Lendecke 2005
-   Copyright (C) Volker Lendecke 2006
+   Copyright (C) Gerald Carter 2006
    
    The helpers always consist of three functions: 
 
Index: source/nsswitch/winbindd_group.c
===================================================================
--- source/nsswitch/winbindd_group.c	(revision 17010)
+++ source/nsswitch/winbindd_group.c	(working copy)
@@ -41,9 +41,16 @@
 		       const char *gr_name, gid_t unix_gid)
 {
 	fstring full_group_name;
+	BOOL can_assume = False;
 
-	fill_domain_username( full_group_name, dom_name, gr_name, False);
+	/* I *hate* winbind use default domain!!!! Somehow I will figure out 
+	   how to remove this parameter.    -jerry */
 
+	if ( (lp_server_role() == ROLE_DOMAIN_MEMBER) && strequal(dom_name, lp_workgroup() )
+		can_assume = True;
+
+	fill_domain_username( full_group_name, dom_name, gr_name, can_assume);
+
 	gr->gr_gid = unix_gid;
     
 	/* Group name and password */