sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3:param: remove "add_ipc" parameter from lp_load_with_registry_shares().

Browse Source 
This is not called from the server (which loads registry shares lazily),
so add_ipc is always false...

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
This commit is contained in:
Michael Adam 2014-07-30 17:47:32 +02:00 committed by Ira Cooper
parent 97e87681b3
commit 1f60ceedb8
5 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -1069,7 +1069,6 @@ bool lp_load_global_no_reinit(const char *file_name);
bool lp_load_client_no_reinit(const char *file_name);
bool lp_load_with_registry_shares(const char *pszFname,
bool save_defaults,
bool add_ipc,
bool initialize_globals);
int lp_numservices(void);
void lp_dump(FILE *f, bool show_defaults, int maxtoprint);

3
source3/param/loadparm.c
View File

@ -3887,13 +3887,12 @@ bool lp_load_client_no_reinit(const char *file_name)
bool lp_load_with_registry_shares(const char *pszFname,
bool save_defaults,
bool add_ipc,
bool initialize_globals)
{
return lp_load_ex(pszFname,
false, /* global_only */
save_defaults,
add_ipc,
false, /* add_ipc */
initialize_globals,
true, /* allow_include_registry */
true); /* load_all_shares*/

1
source3/param/test_lp_load.c
View File

@ -63,7 +63,6 @@ int main(int argc, const char **argv)
printf("call lp_load() #%d: ", i+1);
if (!lp_load_with_registry_shares(config_file,
True, /* save defaults */
False, /*add_ipc */
True)) /*init globals */
{
printf("ERROR.\n");

2
source3/utils/sharesec.c
View File

@ -599,7 +599,7 @@ int main(int argc, const char *argv[])
setlinebuf(stdout);
lp_load_with_registry_shares(get_dyn_CONFIGFILE(), False, False, True);
lp_load_with_registry_shares(get_dyn_CONFIGFILE(), False, True);
/* check for initializing secrets.tdb first */

2
source3/utils/testparm.c
View File

@ -491,7 +491,7 @@ static void do_per_share_checks(int s)
fprintf(stderr,"Load smb config files from %s\n",config_file);
if (!lp_load_with_registry_shares(config_file, True, False, True)) {
if (!lp_load_with_registry_shares(config_file, True, True)) {
fprintf(stderr,"Error loading services.\n");
ret = 1;
goto done;