s3: tests: Our tests for "smbd async dosmode = yes" haven't been working correctly...

If must be "smbd async dosmode", not "smbd:async dosmode"

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14758

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 054ceb38a09b610f70620afd6272be5262bbbbea..dc1c14e9628d4c0ed7f8e14b4475e7a031f2d2a2 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1470,7 +1470,7 @@ sub setup_simpleserver
        read only = no
        vfs objects = aio_pthread
        aio_pthread:aio open = yes
-       smbd:async dosmode = no
+       smbd async dosmode = no
 
 [vfs_aio_pthread_async_dosmode_default1]
        path = $prefix_abs/share
@@ -1478,7 +1478,7 @@ sub setup_simpleserver
        vfs objects = aio_pthread
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
 
 [vfs_aio_pthread_async_dosmode_default2]
        path = $prefix_abs/share
@@ -1486,7 +1486,7 @@ sub setup_simpleserver
        vfs objects = aio_pthread xattr_tdb
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
 
 [vfs_aio_pthread_async_dosmode_force_sync1]
        path = $prefix_abs/share
@@ -1494,7 +1494,7 @@ sub setup_simpleserver
        vfs objects = aio_pthread
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
        # This simulates non linux systems
        smbd:force sync user path safe threadpool = yes
        smbd:force sync user chdir safe threadpool = yes
@@ -1507,7 +1507,7 @@ sub setup_simpleserver
        vfs objects = aio_pthread xattr_tdb
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
        # This simulates non linux systems
        smbd:force sync user path safe threadpool = yes
        smbd:force sync user chdir safe threadpool = yes
@@ -1834,7 +1834,7 @@ sub setup_fileserver_smb1
        read only = no
        vfs objects = aio_pthread
        aio_pthread:aio open = yes
-       smbd:async dosmode = no
+       smbd async dosmode = no
 
 [vfs_aio_pthread_async_dosmode_default1]
        path = $prefix_abs/share
@@ -1842,7 +1842,7 @@ sub setup_fileserver_smb1
        vfs objects = aio_pthread
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
 
 [vfs_aio_pthread_async_dosmode_default2]
        path = $prefix_abs/share
@@ -1850,7 +1850,7 @@ sub setup_fileserver_smb1
        vfs objects = aio_pthread xattr_tdb
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
 
 [vfs_aio_pthread_async_dosmode_force_sync1]
        path = $prefix_abs/share
@@ -1858,7 +1858,7 @@ sub setup_fileserver_smb1
        vfs objects = aio_pthread
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
        # This simulates non linux systems
        smbd:force sync user path safe threadpool = yes
        smbd:force sync user chdir safe threadpool = yes
@@ -1871,7 +1871,7 @@ sub setup_fileserver_smb1
        vfs objects = aio_pthread xattr_tdb
        store dos attributes = yes
        aio_pthread:aio open = yes
-       smbd:async dosmode = yes
+       smbd async dosmode = yes
        # This simulates non linux systems
        smbd:force sync user path safe threadpool = yes
        smbd:force sync user chdir safe threadpool = yes

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index bf1c1cd425a82cbb41cf50cfd25fc6f2935bd3da..ce5a91c9f10cb313a6fbe3d6e414d09aee37a698 100644 (file)
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -166,7 +166,7 @@ static int catia_connect(struct vfs_handle_struct *handle,
         * Unless we have an async implementation of get_dos_attributes turn
         * this off.
         */
-       lp_do_parameter(SNUM(handle->conn), "smbd:async dosmode", "false");
+       lp_do_parameter(SNUM(handle->conn), "smbd async dosmode", "false");
 
        return SMB_VFS_NEXT_CONNECT(handle, service, user);
 }