diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-19 18:08:47 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:15 +0200 |
| commit | 1a921138120027fea677d4e3514e8f95cc56b57d (patch) | |
| tree | 2467bca0a01fa1bd071d6fa05ea4edb82e5001a6 | |
| parent | 47c431279eed8d27ad6a49b1e5a1749ce110ead2 (diff) | |
| download | samba-1a921138120027fea677d4e3514e8f95cc56b57d.tar.gz samba-1a921138120027fea677d4e3514e8f95cc56b57d.tar.xz samba-1a921138120027fea677d4e3514e8f95cc56b57d.zip | |
param: add getservicebyname to s3_helpers
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/loadparm.h | 1 | ||||
| -rw-r--r-- | lib/param/s3_param.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 2b890db5c4..c9baed5c7c 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -262,6 +262,7 @@ bool lp_is_security_and_server_role_valid(int server_role, int security); struct loadparm_global * get_globals(void); char * lp_string(TALLOC_CTX *, const char *); bool lp_string_set(char **, const char *); +int getservicebyname(const char *, struct loadparm_service *); /** * Check if two parameters are equal. diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h index 276810427e..4ec922f07b 100644 --- a/lib/param/s3_param.h +++ b/lib/param/s3_param.h @@ -9,6 +9,7 @@ struct loadparm_s3_helpers struct loadparm_service * (*get_service)(const char *service_name); struct loadparm_service * (*get_default_loadparm_service)(void); struct loadparm_service * (*get_servicebynum)(int snum); + int (*getservicebyname)(const char *, struct loadparm_service *); int (*get_numservices)(void); bool (*load)(const char *filename); bool (*set_cmdline)(const char *pszParmName, const char *pszParmValue); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b206f6be7a..16dd70f265 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1173,8 +1173,6 @@ FN_LOCAL_BOOL(autoloaded, autoloaded) static int map_parameter_canonical(const char *pszParmName, bool *inverse); static const char *get_boolean(bool bool_value); -static int getservicebyname(const char *pszServiceName, - struct loadparm_service *pserviceDest); static bool do_parameter(const char *pszParmName, const char *pszParmValue, void *userdata); static bool do_section(const char *pszSectionName, void *userdata); @@ -2071,7 +2069,7 @@ bool lp_canonicalize_boolean(const char *str, const char**canon_str) Find a service by name. Otherwise works like get_service. ***************************************************************************/ -static int getservicebyname(const char *pszServiceName, struct loadparm_service *pserviceDest) +int getservicebyname(const char *pszServiceName, struct loadparm_service *pserviceDest) { int iService = -1; char *canon_name; diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index ed21e4fb5e..d13304ff21 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -63,6 +63,7 @@ static struct loadparm_s3_helpers s3_fns = .get_parm_ptr = lp_parm_ptr, .get_service = lp_service_for_s4_ctx, .get_servicebynum = lp_servicebynum_for_s4_ctx, + .getservicebyname = getservicebyname, .get_default_loadparm_service = lp_default_loadparm_service, .get_numservices = lp_numservices, .load = lp_load_for_s4_ctx, |