sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

param: attempt to consolidate handle_debug_level between the two loadparms

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-on: https://gerrit.samba.org/102
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam
2014-02-17 16:33:55 +13:00
committed by Jeremy Allison
parent 84b98a2ce5
commit 3892086589
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/param/loadparm.c
View File

@ -102,8 +102,6 @@ static bool handle_realm(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_debug_list(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
@ -1136,15 +1134,16 @@ static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
return bRetval;
}
static bool handle_debug_list(struct loadparm_context *lp_ctx, int unused,
bool handle_debug_list(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr)
{
lpcfg_string_set(lp_ctx, ptr, pszParmValue);
if (lp_ctx->global) {
return debug_parse_levels(pszParmValue);
if (lp_ctx->s3_fns != NULL) {
lp_ctx->s3_fns->lp_string_set(ptr, pszParmValue);
} else {
lpcfg_string_set(lp_ctx, ptr, pszParmValue);
}
return true;
return debug_parse_levels(pszParmValue);
}
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,

1
lib/param/s3_param.h
View File

@ -14,6 +14,7 @@ struct loadparm_s3_helpers
bool (*set_cmdline)(const char *pszParmName, const char *pszParmValue);
void (*dump)(FILE *f, bool show_defaults, int maxtoprint);
char * (*lp_string)(TALLOC_CTX *ctx, const char *in);
bool (*lp_string_set)(char **dest, const char *src);
struct loadparm_global *globals;
};

11
source3/param/loadparm.c
View File

@ -265,7 +265,6 @@ static bool handle_copy(struct loadparm_context *unused, int snum, const char *p
static bool handle_idmap_backend(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
static bool handle_debug_list(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
static bool handle_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
@ -2953,16 +2952,6 @@ const char *lp_idmap_default_backend(void)
return lp_idmap_backend("*");
}
/***************************************************************************
Handle the DEBUG level list.
***************************************************************************/
static bool handle_debug_list(struct loadparm_context *unused, int snum, const char *pszParmValueIn, char **ptr )
{
string_set(Globals.ctx, ptr, pszParmValueIn);
return debug_parse_levels(pszParmValueIn);
}
/***************************************************************************
Handle ldap suffixes - default to ldapsuffix if sub-suffixes are not defined.
***************************************************************************/

1
source3/param/loadparm_ctx.c
View File

@ -68,6 +68,7 @@ static struct loadparm_s3_helpers s3_fns =
.load = lp_load_for_s4_ctx,
.set_cmdline = lp_set_cmdline,
.dump = lp_dump,
.lp_string_set = lp_string_set,
};
const struct loadparm_s3_helpers *loadparm_s3_helpers(void)