From a5407922577e5f228df3e53f8b8996123672a06b Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 21 Feb 2014 15:40:43 +1300 Subject: [PATCH] param: move lp_set_enum_parm to lib/param Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 21 ++++++++++++++++++++- source3/param/loadparm.c | 20 -------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 614b191c029..06a8f02b620 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -400,7 +400,6 @@ bool lp_bool(const char *s) return ret; } - /** * Return parametric option from a given service. Type is a part of option before ':' * Parametric option has following syntax: 'Type: option = value' @@ -1063,6 +1062,26 @@ bool lpcfg_file_list_changed(struct loadparm_context *lp_ctx) return false; } +/* + * set the value for a P_ENUM + */ +bool lp_set_enum_parm( struct parm_struct *parm, const char *pszParmValue, + int *ptr ) +{ + int i; + + for (i = 0; parm->enum_list[i].name; i++) { + if ( strequal(pszParmValue, parm->enum_list[i].name)) { + *ptr = parm->enum_list[i].value; + return true; + } + } + DEBUG(0, ("WARNING: Ignoring invalid value '%s' for parameter '%s'\n", + pszParmValue, parm->label)); + return false; +} + + /*************************************************************************** Handle the "realm" parameter ***************************************************************************/ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ad485c989ec..c534ef66226 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2633,26 +2633,6 @@ const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx) return lp_string(ctx, Globals.ldap_suffix); } -/**************************************************************************** - set the value for a P_ENUM - ***************************************************************************/ - -static bool lp_set_enum_parm( struct parm_struct *parm, const char *pszParmValue, - int *ptr ) -{ - int i; - - for (i = 0; parm->enum_list[i].name; i++) { - if ( strequal(pszParmValue, parm->enum_list[i].name)) { - *ptr = parm->enum_list[i].value; - return true; - } - } - DEBUG(0, ("WARNING: Ignoring invalid value '%s' for parameter '%s'\n", - pszParmValue, parm->label)); - return false; -} - /*************************************************************************** ***************************************************************************/ -- 2.34.1