summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-04-17 00:06:00 +0200
committerGünther Deschner <gd@samba.org>2008-04-17 00:08:24 +0200
commit6f4b7fcf9777aa72ad587b8664b078c5dcb8d11f (patch)
tree45265245e19f8b604895669d8b91279f10ca4601 /source3/utils
parent189c0153e02bcab5769227ae362c81fa6f4a91e2 (diff)
downloadsamba-6f4b7fcf9777aa72ad587b8664b078c5dcb8d11f.tar.gz
samba-6f4b7fcf9777aa72ad587b8664b078c5dcb8d11f.tar.bz2
samba-6f4b7fcf9777aa72ad587b8664b078c5dcb8d11f.zip
net: Be more tolerant while joining.
Guenther (This used to be commit 70b7b331d9e2d915e6209fca5900f41fae4866fd)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_ads.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 88051ec4a1..c8bfc2630c 100644
--- 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;