diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-28 10:33:54 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-28 10:33:54 +1100 |
| commit | b33873ae5d13993030f41f5304d78640fe07d25c (patch) | |
| tree | b4d6dfd9833b603b16474b0d5ab7918474c7a8bd /source4/ntvfs/posix/vfs_posix.c | |
| parent | 17207133ea446670e2123b510a593456928882fb (diff) | |
| parent | 6dec6fbfaddf74c4567e83b354590cfbe3d6d0a9 (diff) | |
| download | samba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.gz samba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.bz2 samba-b33873ae5d13993030f41f5304d78640fe07d25c.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit ba864cfd7ce4b69179431131cac9661cbf48bf32)
Diffstat (limited to 'source4/ntvfs/posix/vfs_posix.c')
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index e058e6f546..ca874d1db1 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -91,6 +91,10 @@ static void pvfs_setup_options(struct pvfs_state *pvfs) PVFS_SHARE_DELAY, PVFS_SHARE_DELAY_DEFAULT); + pvfs->oplock_break_timeout = share_int_option(scfg, + PVFS_OPLOCK_TIMEOUT, + PVFS_OPLOCK_TIMEOUT_DEFAULT); + pvfs->share_name = talloc_strdup(pvfs, scfg->name); pvfs->fs_attribs = |