diff options
| -rw-r--r-- | lib/param/loadparm.c | 2 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index fc209a7586..6d91891a1e 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -314,7 +314,7 @@ static struct loadparm_context *global_loadparm_context; #define FN_LOCAL_PARM_INTEGER(fn_name, val) FN_LOCAL_INTEGER(fn_name, val) -#define FN_LOCAL_CHAR(fn_name,val) \ +#define FN_LOCAL_PARM_CHAR(fn_name,val) \ _PUBLIC_ char lpcfg_ ## fn_name(struct loadparm_service *service, \ struct loadparm_service *sDefault) { \ return((service != NULL)? service->val : sDefault->val); \ diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 61f00448ca..c4071c9d33 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -147,7 +147,7 @@ FN_LOCAL_INTEGER(aio_write_size, iAioWriteSize) FN_LOCAL_INTEGER(map_readonly, iMap_readonly) FN_LOCAL_INTEGER(directory_name_cache_size, iDirectoryNameCacheSize) FN_LOCAL_INTEGER(smb_encrypt, ismb_encrypt) -FN_LOCAL_CHAR(magicchar, magic_char) +FN_LOCAL_PARM_CHAR(magicchar, magic_char) FN_LOCAL_STRING(cups_options, szCupsOptions) FN_LOCAL_PARM_BOOL(change_notify, bChangeNotify) FN_LOCAL_PARM_BOOL(kernel_change_notify, bKernelChangeNotify) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 62cba4df57..d3fb839897 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1113,7 +1113,7 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK bool lp_ ## fn_name(const struct share_params *p) {return(bool)(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} #define FN_LOCAL_PARM_INTEGER(fn_name,val) \ int lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} -#define FN_LOCAL_CHAR(fn_name,val) \ +#define FN_LOCAL_PARM_CHAR(fn_name,val) \ char lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} |