From 0e45a0cec95da4173bfaf2084cf13fa5b84c4fde Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 24 Oct 2023 11:43:15 +0200 Subject: [PATCH] s3:param: Make init_globals() public Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- source3/param/loadparm.c | 7 ++++--- source3/param/loadparm.h | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0e92cdb2d7b..6b2f23ce633 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -504,7 +504,8 @@ static bool apply_lp_set_cmdline(void) Initialise the global parameter structure. ***************************************************************************/ -static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) +void loadparm_s3_init_globals(struct loadparm_context *lp_ctx, + bool reinit_globals) { static bool done_init = false; char *s = NULL; @@ -3987,7 +3988,7 @@ static bool lp_load_ex(const char *pszFname, lp_ctx = setup_lp_context(talloc_tos()); - init_globals(lp_ctx, reinit_globals); + loadparm_s3_init_globals(lp_ctx, reinit_globals); free_file_list(); @@ -4041,7 +4042,7 @@ static bool lp_load_ex(const char *pszFname, /* start over */ DEBUG(1, ("lp_load_ex: changing to config backend " "registry\n")); - init_globals(lp_ctx, true); + loadparm_s3_init_globals(lp_ctx, true); TALLOC_FREE(lp_ctx); diff --git a/source3/param/loadparm.h b/source3/param/loadparm.h index 55e1e36289a..78162911953 100644 --- a/source3/param/loadparm.h +++ b/source3/param/loadparm.h @@ -30,9 +30,13 @@ typedef struct stat_ex SMB_STRUCT_STAT; typedef struct files_struct files_struct; struct smbd_server_connection; struct security_descriptor; +struct loadparm_context; /* The following definitions come from param/loadparm.c */ +void loadparm_s3_init_globals(struct loadparm_context *lp_ctx, + bool reinit_globals); + const struct loadparm_substitution *loadparm_s3_global_substitution(void); char *lp_parm_substituted_string(TALLOC_CTX *mem_ctx, -- 2.47.3