r16823: Allow to call wbinfo --domain-info="" or --domain-info="." to get domain

info for our own domain.

Guenther

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 69d7a1069f9c8bda91a6ae716e4c70b13381f527..27ec27d0be522f728867e18cd173ebb6f01472e0 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -380,7 +380,10 @@ static BOOL wbinfo_domain_info(const char *domain_name)
        ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
-       fstrcpy(request.domain_name, domain_name);
+       if ((strequal(domain_name, ".")) || (domain_name[0] == '\0'))
+               fstrcpy(request.domain_name, get_winbind_domain());
+       else
+               fstrcpy(request.domain_name, domain_name);
 
        /* Send request */
 
@@ -905,9 +908,9 @@ static BOOL print_domain_users(const char *domain)
        ZERO_STRUCT(response);
        
        if (domain) {
-               /* '.' is the special sign for our own domwin */
+               /* '.' is the special sign for our own domain */
                if ( strequal(domain, ".") )
-                       fstrcpy( request.domain_name, lp_workgroup() );
+                       fstrcpy( request.domain_name, get_winbind_domain() );
                else
                        fstrcpy( request.domain_name, domain );
        }
@@ -945,7 +948,7 @@ static BOOL print_domain_groups(const char *domain)
 
        if (domain) {
                if ( strequal(domain, ".") )
-                       fstrcpy( request.domain_name, lp_workgroup() );
+                       fstrcpy( request.domain_name, get_winbind_domain() );
                else
                        fstrcpy( request.domain_name, domain );
        }