summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorGordon Ross <gwr@nexenta.com>2016-12-23 14:30:22 -0500
committerGordon Ross <gwr@nexenta.com>2019-05-17 16:29:13 -0400
commite3c4f75e6cff378e04fbbc3b01e48cc1ac546194 (patch)
tree3906601025da0b24e0320300b04eb1e7a8d34235 /usr/src/lib
parentf4a94a44949883c640dbee4b784ad36ee3986666 (diff)
downloadillumos-joyent-e3c4f75e6cff378e04fbbc3b01e48cc1ac546194.tar.gz
10959 intended nbmand locking functionality is confused
Reviewed by: Matt Barden <matt.barden@nexenta.com> Reviewed by: Evan Layton <evan.layton@nexenta.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/smbsrv/libfksmbsrv/common/fksmb_init.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/lib/smbsrv/libfksmbsrv/common/fksmb_init.c b/usr/src/lib/smbsrv/libfksmbsrv/common/fksmb_init.c
index f3e7463cb7..80d62d0534 100644
--- a/usr/src/lib/smbsrv/libfksmbsrv/common/fksmb_init.c
+++ b/usr/src/lib/smbsrv/libfksmbsrv/common/fksmb_init.c
@@ -69,6 +69,17 @@ uint_t smb_audit_flags =
#endif
/*
+ * We don't normally have nbmand support in the test share
+ * used by fksmbd, but we'd still like the locking code
+ * to be testable. Intereactions with NFS etc. are not a
+ * concern in fksmbd, so allow it to use advisory locks.
+ *
+ * Should fix the fksmbd test share so it supports nbmand,
+ * and then set this to zero like the real server.
+ */
+int smb_allow_advisory_locks = 1; /* See smb_vops.c */
+
+/*
* Maximum number of simultaneous authentication, share mapping, pipe open
* requests to be processed.
*/