net: Be more tolerant while joining.

Guenther
(This used to be commit 70b7b331d9e2d915e6209fca5900f41fae4866fd)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 88051ec4a1bfc55fa9c254dcfcd4e326e49de752..c8bfc2630cc8283870f92a90cf949b766f9f3784 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1199,7 +1199,7 @@ int net_ads_join(int argc, const char **argv)
 
        /* Check the short name of the domain */
 
-       if (!strequal(lp_workgroup(), r->out.netbios_domain_name)) {
+       if (!modify_config && !strequal(lp_workgroup(), r->out.netbios_domain_name)) {
                d_printf("The workgroup in %s does not match the short\n", get_dyn_CONFIGFILE());
                d_printf("domain name obtained from the server.\n");
                d_printf("Using the name [%s] from the server.\n", r->out.netbios_domain_name);
@@ -1209,11 +1209,16 @@ int net_ads_join(int argc, const char **argv)
 
        d_printf("Using short domain name -- %s\n", r->out.netbios_domain_name);
 
-       d_printf("Joined '%s' to realm '%s'\n", r->in.machine_name,
-               r->out.dns_domain_name);
+       if (r->out.dns_domain_name) {
+               d_printf("Joined '%s' to realm '%s'\n", r->in.machine_name,
+                       r->out.dns_domain_name);
+       } else {
+               d_printf("Joined '%s' to domain '%s'\n", r->in.machine_name,
+                       r->out.netbios_domain_name);
+       }
 
 #if defined(WITH_DNS_UPDATES)
-       {
+       if (r->out.domain_is_ad) {
                /* We enter this block with user creds */
                ADS_STRUCT *ads_dns = NULL;