diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-19 18:03:57 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:15 +0200 |
| commit | c3c8f4fe9cf6411d8a14f54ef0d273f07ed42bbf (patch) | |
| tree | ecddc83dcbb2674416315651519bc35d15bb4571 /lib/param/loadparm.c | |
| parent | 2f47965ba920ea65e100ac010772c0e91ced89de (diff) | |
| download | samba-c3c8f4fe9cf6411d8a14f54ef0d273f07ed42bbf.tar.gz samba-c3c8f4fe9cf6411d8a14f54ef0d273f07ed42bbf.tar.xz samba-c3c8f4fe9cf6411d8a14f54ef0d273f07ed42bbf.zip | |
lib/param: rename getservicebyname to lpcfg_getservicebyname to avoid conflicts
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param/loadparm.c')
| -rw-r--r-- | lib/param/loadparm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 65378864bbe..fc5829379ee 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -283,7 +283,7 @@ FN_LOCAL_BOOL(autoloaded, autoloaded) FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain) /* local prototypes */ -static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, +static struct loadparm_service *lpcfg_getservicebyname(struct loadparm_context *lp_ctx, const char *pszServiceName); static bool lpcfg_service_ok(struct loadparm_service *service); static bool do_section(const char *pszSectionName, void *); @@ -615,7 +615,7 @@ struct loadparm_service *lpcfg_add_service(struct loadparm_context *lp_ctx, /* it might already exist */ if (name) { - struct loadparm_service *service = getservicebyname(lp_ctx, + struct loadparm_service *service = lpcfg_getservicebyname(lp_ctx, name); if (service != NULL) { /* Clean all parametric options for service */ @@ -819,7 +819,7 @@ bool lpcfg_parm_is_cmdline(struct loadparm_context *lp_ctx, const char *name) * Find a service by name. Otherwise works like get_service. */ -static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, +static struct loadparm_service *lpcfg_getservicebyname(struct loadparm_context *lp_ctx, const char *pszServiceName) { int iService; @@ -1145,7 +1145,9 @@ static bool handle_copy(struct loadparm_context *lp_ctx, int unused, DEBUG(3, ("Copying service from service %s\n", pszParmValue)); - if ((serviceTemp = getservicebyname(lp_ctx, pszParmValue)) != NULL) { + serviceTemp = lpcfg_getservicebyname(lp_ctx, pszParmValue); + + if (serviceTemp != NULL) { if (serviceTemp == lp_ctx->currentService) { DEBUG(0, ("Can't copy service %s - unable to copy self!\n", pszParmValue)); } else { |