sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s4:torture: Use C99 initializers for dirs in oplock test

Browse Source 
Yes, this was already valid C99 but the compiler on Ubuntu 14.04 simply
sucks. This doesn't happen with this gcc version on other Linux systems.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andreas Schneider 2018-12-13 12:53:39 +01:00 committed by Andreas Schneider
parent 4d1ae1904d
commit 6395a9a85a
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source4/torture/raw/oplock.c
View File

@ -4550,14 +4550,26 @@ static struct hold_oplock_info {
uint32_t share_access;
uint16_t fnum;
} 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 oplock_handler_hold(struct smbcli_transport *transport,