summaryrefslogtreecommitdiff
path: root/source3/utils/net_ads.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-10 11:30:37 -0800
committerJeremy Allison <jra@samba.org>2007-12-10 11:30:37 -0800
commit7faee02d0d351c5c039e8f1be7e82ce3a93cbe96 (patch)
treef79fc09f414f9873d9a985e380b6384c24d00315 /source3/utils/net_ads.c
parent0c0054fe1615a504d103da94149d1c1729abb8e2 (diff)
downloadsamba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.gz
samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.bz2
samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.zip
Remove the char[1024] strings from dynconfig. Replace
them with malloc'ing accessor functions. Should save a lot of static space :-). Jeremy. (This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)
Diffstat (limited to 'source3/utils/net_ads.c')
-rw-r--r--source3/utils/net_ads.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 37a02200f5..141031dacb 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -943,7 +943,7 @@ static NTSTATUS check_ads_config( void )
if ( lp_security() == SEC_ADS && !*lp_realm()) {
d_fprintf(stderr, "realm must be set in in %s for ADS "
- "join to succeed.\n", dyn_CONFIGFILE);
+ "join to succeed.\n", get_dyn_CONFIGFILE());
return NT_STATUS_INVALID_PARAMETER;
}
@@ -1494,7 +1494,7 @@ 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 %s "
"(%s) DO NOT match. Aborting join\n",
- ads->config.realm, dyn_CONFIGFILE, lp_realm());
+ ads->config.realm, get_dyn_CONFIGFILE(), lp_realm());
nt_status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
@@ -1571,11 +1571,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 %s does not match the short\n", dyn_CONFIGFILE);
+ 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", short_domain_name);
d_printf("You should set \"workgroup = %s\" in %s.\n",
- short_domain_name, dyn_CONFIGFILE);
+ short_domain_name, get_dyn_CONFIGFILE());
}
d_printf("Using short domain name -- %s\n", short_domain_name);