s4:torture: Use C99 initializers for dirs in smb2 oplock test
authorAndreas Schneider <asn@samba.org>
Thu, 13 Dec 2018 12:10:49 +0000 (13:10 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 28 Jan 2019 09:29:25 +0000 (10:29 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source4/torture/smb2/oplock.c

index 143078a37d11ba5746afb10f13588da06dbf1c8c..d6156eb4d8cf0e78e31ffe1a5f8ced8652dbe1a5 100644 (file)
@@ -4086,14 +4086,26 @@ static struct hold_oplock_info {
        uint32_t share_access;
        struct smb2_handle handle;
 } hold_info[] = {
-       { BASEDIR "\\notshared_close", true,
-         NTCREATEX_SHARE_ACCESS_NONE, },
-       { BASEDIR "\\notshared_noclose", false,
-         NTCREATEX_SHARE_ACCESS_NONE, },
-       { BASEDIR "\\shared_close", true,
-         NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, },
-       { BASEDIR "\\shared_noclose", false,
-         NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, },
+       {
+               .fname          = BASEDIR "\\notshared_close",
+               .close_on_break = true,
+               .share_access   = NTCREATEX_SHARE_ACCESS_NONE,
+       },
+       {
+               .fname          = BASEDIR "\\notshared_noclose",
+               .close_on_break = false,
+               .share_access   = NTCREATEX_SHARE_ACCESS_NONE,
+       },
+       {
+               .fname          = BASEDIR "\\shared_close",
+               .close_on_break = true,
+               .share_access   = NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
+       },
+       {
+               .fname          = BASEDIR "\\shared_noclose",
+               .close_on_break = false,
+               .share_access   = NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
+       },
 };
 
 static bool torture_oplock_handler_hold(struct smb2_transport *transport,