mirror of
https://github.com/samba-team/samba.git
synced 2025-07-31 20:22:15 +03:00
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 52dc5eaef2
)
This commit is contained in:
@ -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);
|
||||
|
Reference in New Issue
Block a user