summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-01-19 14:29:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:18 -0500
commitfe830f22c9249be5876385fb7c36cda0c3656b21 (patch)
tree5648941847d8a4515e23b15236144664c7fd95f6
parented36771b3b9ef8f466f2f2a547802c2e4d6bdf64 (diff)
downloadsamba-fe830f22c9249be5876385fb7c36cda0c3656b21.tar.gz
samba-fe830f22c9249be5876385fb7c36cda0c3656b21.tar.bz2
samba-fe830f22c9249be5876385fb7c36cda0c3656b21.zip
r20903: Replace the hardcoded "smb.conf" string with the dyn_CONFIGFILE
(This used to be commit ff8f27108d247aa9e46176f2b29fc8d2da103906)
-rw-r--r--source3/utils/net_ads.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index bd67983954..48127f6c8a 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -936,8 +936,8 @@ static NTSTATUS check_ads_config( void )
}
if ( lp_security() == SEC_ADS && !*lp_realm()) {
- d_fprintf(stderr, "realm must be set in in smb.conf for ADS "
- "join to succeed.\n");
+ d_fprintf(stderr, "realm must be set in in %s for ADS "
+ "join to succeed.\n", dyn_CONFIGFILE);
return NT_STATUS_INVALID_PARAMETER;
}
@@ -1405,9 +1405,9 @@ int net_ads_join(int argc, const char **argv)
}
if (strcmp(ads->config.realm, lp_realm()) != 0) {
- d_fprintf(stderr, "realm of remote server (%s) and realm in smb.conf "
+ d_fprintf(stderr, "realm of remote server (%s) and realm in %s "
"(%s) DO NOT match. Aborting join\n", ads->config.realm,
- lp_realm());
+ dyn_CONFIGFILE, lp_realm());
nt_status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
@@ -1470,10 +1470,11 @@ int net_ads_join(int argc, const char **argv)
/* Check the short name of the domain */
if ( !strequal(lp_workgroup(), short_domain_name) ) {
- d_printf("The workgroup in smb.conf does not match the short\n");
+ d_printf("The workgroup in %s does not match the short\n", dyn_CONFIGFILE);
d_printf("domain name obtained from the server.\n");
d_printf("Using the name [%s] from the server.\n", short_domain_name);
- d_printf("You should set \"workgroup = %s\" in smb.conf.\n", short_domain_name);
+ d_printf("You should set \"workgroup = %s\" in %s.\n",
+ short_domain_name, dyn_CONFIGFILE);
}
d_printf("Using short domain name -- %s\n", short_domain_name);