diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-11-11 17:05:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:46 -0500 |
| commit | b6b84f98c0420f45c498b025d9edbeb7f830205a (patch) | |
| tree | 458be5abc42d9fc7f67f9de0d4e604a910c70e36 /source3/param | |
| parent | 5f3a692748e5927d195e02844e6cbb31540da965 (diff) | |
| download | samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.tar.gz samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.tar.bz2 samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.zip | |
r19668: Convert the locking params to use struct share_param instead of snum
(This used to be commit 609dbec600048718b86cd1ecdc2ce49bbdeb803c)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index fea41a880f..68dd9d5a97 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1752,6 +1752,8 @@ static char *lp_string(const char *s) #define FN_LOCAL_PARM_BOOL(fn_name,val) \ BOOL fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} +#define FN_LOCAL_PARM_INTEGER(fn_name,val) \ + int fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} #define FN_LOCAL_PARM_STRING(fn_name,val) \ char *fn_name(const struct share_params *p) {return(lp_string((LP_SNUM_OK(p->service) && ServicePtrs[(p->service)]->val) ? ServicePtrs[(p->service)]->val : sDefault.val));} #define FN_LOCAL_CHAR(fn_name,val) \ @@ -2020,9 +2022,9 @@ FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden) FN_LOCAL_BOOL(lp_map_archive, bMap_archive) FN_LOCAL_BOOL(lp_store_dos_attributes, bStoreDosAttributes) FN_LOCAL_BOOL(lp_dmapi_support, bDmapiSupport) -FN_LOCAL_BOOL(lp_locking, bLocking) -FN_LOCAL_INTEGER(lp_strict_locking, iStrictLocking) -FN_LOCAL_BOOL(lp_posix_locking, bPosixLocking) +FN_LOCAL_PARM_BOOL(lp_locking, bLocking) +FN_LOCAL_PARM_INTEGER(lp_strict_locking, iStrictLocking) +FN_LOCAL_PARM_BOOL(lp_posix_locking, bPosixLocking) FN_LOCAL_BOOL(lp_share_modes, bShareModes) FN_LOCAL_BOOL(lp_oplocks, bOpLocks) FN_LOCAL_BOOL(lp_level2_oplocks, bLevel2OpLocks) |