sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

net: Be more tolerant while joining.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-04-17 00:06:00 +02:00
parent b42304c299
commit 70b7b331d9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/utils/net_ads.c
View File

@ -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;