diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
| commit | a999a1fc996234555bd2d8a4a873b39d111c347e (patch) | |
| tree | 737b0bf68f6a93d6e835676b96b8bb3c606d1c91 /source4/ntvfs/posix/vfs_posix.c | |
| parent | 227df641f680d844c85ea0ed1694e41ed355e262 (diff) | |
| parent | 901addd4a18a9a166fc3518a7bce70969f884e6f (diff) | |
| download | samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.gz samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.bz2 samba-a999a1fc996234555bd2d8a4a873b39d111c347e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)
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 = |