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

Volker

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 46eae155d582cb3f93655791fb44ef86d6986aab..3602e90956178c6141468d0ce66ab242b7cdf67c 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -3491,6 +3491,13 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens)
        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,14 +3540,15 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens)
 
                DEBUG(3, ("%s\n", name));
 
-               if (p == NULL)
-                       continue;
-
-               *p++ = '\0';
-
-               fstrcpy(domain, name);
-               strupper_m(domain);
-               fstrcpy(user, p);
+               if (p == NULL) {
+                       fstrcpy(domain, opt_target_workgroup);
+                       fstrcpy(user, name);
+               } else {
+                       *p++ = '\0';
+                       fstrcpy(domain, name);
+                       strupper_m(domain);
+                       fstrcpy(user, p);
+               }
 
                get_user_sids(domain, user, &(result[i].token));
                i+=1;