svn commit: samba r6880 - in branches/SAMBA_3_0/source/utils: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-05-18 11:57:53 +0000 (Wed, 18 May 2005)
New Revision: 6880

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6880

Log:
Fix bug 2070 after positive feedback from Leon Vernikov. Thanks!

Volker

Modified:
   branches/SAMBA_3_0/source/utils/net_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2005-05-18 11:50:09 UTC (rev 6879)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2005-05-18 11:57:53 UTC (rev 6880)
@@ -3491,6 +3491,13 @@
 	int i;
 	struct user_token *result;
 
+	if (lp_winbind_use_default_domain() &&
+	    (opt_target_workgroup == NULL)) {
+		d_printf("winbind use default domain = yes set, please "
+			 "specify a workgroup\n");
+		return False;
+	}
+
 	/* Send request to winbind daemon */
 
 	ZERO_STRUCT(request);
@@ -3533,15 +3540,16 @@
 
 		DEBUG(3, ("%s\n", name));
 
-		if (p == NULL)
-			continue;
+		if (p == NULL) {
+			fstrcpy(domain, opt_target_workgroup);
+			fstrcpy(user, name);
+		} else {
+			*p++ = '\0';
+			fstrcpy(domain, name);
+			strupper_m(domain);
+			fstrcpy(user, p);
+		}
 
-		*p++ = '\0';
-
-		fstrcpy(domain, name);
-		strupper_m(domain);
-		fstrcpy(user, p);
-
 		get_user_sids(domain, user, &(result[i].token));
 		i+=1;
 	}