diff options
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 5 | ||||
| -rw-r--r-- | source3/wscript | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0eb63fe3f36..05a5ae20abe 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4849,6 +4849,10 @@ uint32_t lp_get_async_dns_timeout(void) bool lp_smb3_unix_extensions(void) { + /* + * FIXME: If this gets always enabled, check source3/selftest/tests.py + * and source3/wscript for HAVE_SMB3_UNIX_EXTENSIONS. + */ #if defined(DEVELOPER) return lp__smb3_unix_extensions(); #else diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 93c45c9b2eb..93fb4a97f89 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -92,6 +92,8 @@ have_inotify = ("HAVE_INOTIFY" in config_hash) have_ldwrap = ("HAVE_LDWRAP" in config_hash) with_pthreadpool = ("WITH_PTHREADPOOL" in config_hash) +have_smb3_unix_extensions = ("HAVE_SMB3_UNIX_EXTENSIONS" in config_hash) + def is_module_enabled(module): if module in config_hash["STRING_SHARED_MODULES"]: return True @@ -1708,7 +1710,8 @@ for t in CLUSTERED_LOCAL_TESTS: smbtorture3, "-N 1000 -o 2000"]) -planpythontestsuite("fileserver", "samba.tests.smb3unix") +if have_smb3_unix_extensions: + planpythontestsuite("fileserver", "samba.tests.smb3unix") planpythontestsuite("fileserver", "samba.tests.reparsepoints") planpythontestsuite("fileserver_smb1", "samba.tests.smb2symlink") planpythontestsuite("fileserver_smb1", "samba.tests.smb1posix") diff --git a/source3/wscript b/source3/wscript index e77cd127e60..0dbf02ed530 100644 --- a/source3/wscript +++ b/source3/wscript @@ -111,6 +111,7 @@ def configure(conf): if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') conf.env.developer = True + conf.DEFINE('HAVE_SMB3_UNIX_EXTENSIONS', '1') if sys.platform != 'openbsd5': conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True) |