diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-11 00:30:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:36 -0500 |
| commit | 934566332835eed5a3b768e07642c569eca37001 (patch) | |
| tree | a072cc62f2fa68fd2da4fcd7db3f358c7184369b /source3/param | |
| parent | 3c45a093c435a106e08746aa3f3db824192340f1 (diff) | |
| download | samba-934566332835eed5a3b768e07642c569eca37001.tar.gz samba-934566332835eed5a3b768e07642c569eca37001.tar.bz2 samba-934566332835eed5a3b768e07642c569eca37001.zip | |
r4143: Make strict locking an enum. Auto means use oplock optimization.
Jeremy.
(This used to be commit 0dd4adeae2042d0ea64398a78b3f48eb0150c133)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 094eff81c0..d8aef215b8 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -386,7 +386,7 @@ typedef struct BOOL bMap_archive; BOOL bStoreDosAttributes; BOOL bLocking; - BOOL bStrictLocking; + int iStrictLocking; BOOL bPosixLocking; BOOL bShareModes; BOOL bOpLocks; @@ -511,7 +511,7 @@ static service sDefault = { True, /* bMap_archive */ False, /* bStoreDosAttributes */ True, /* bLocking */ - True, /* bStrictLocking */ + True, /* iStrictLocking */ True, /* bPosixLocking */ True, /* bShareModes */ True, /* bOpLocks */ @@ -1075,7 +1075,7 @@ static struct parm_struct parm_table[] = { {"oplock break wait time", P_INTEGER, P_GLOBAL, &Globals.oplock_break_wait_time, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL}, {"oplock contention limit", P_INTEGER, P_LOCAL, &sDefault.iOplockContentionLimit, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, {"posix locking", P_BOOL, P_LOCAL, &sDefault.bPosixLocking, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, - {"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, + {"strict locking", P_ENUM, P_LOCAL, &sDefault.iStrictLocking, NULL, enum_bool_auto, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, {"share modes", P_BOOL, P_LOCAL, &sDefault.bShareModes, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, {N_("Ldap Options"), P_SEP, P_SEPARATOR}, @@ -1858,7 +1858,7 @@ 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_locking, bLocking) -FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking) +FN_LOCAL_INTEGER(lp_strict_locking, iStrictLocking) FN_LOCAL_BOOL(lp_posix_locking, bPosixLocking) FN_LOCAL_BOOL(lp_share_modes, bShareModes) FN_LOCAL_BOOL(lp_oplocks, bOpLocks) |