diff options
| author | Andreas Schneider <asn@samba.org> | 2018-12-13 13:10:49 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-01-28 10:29:25 +0100 |
| commit | 7ceffb31d0b60427c9777f96c8db48c02ee36b77 (patch) | |
| tree | c16acc35c64812bcee571b95a24f7ef1f6f4495e /source4/torture | |
| parent | d731ddf869dc11c5bb0d009dea5adad699acea3d (diff) | |
| download | samba-7ceffb31d0b60427c9777f96c8db48c02ee36b77.tar.gz | |
s4:torture: Use C99 initializers for dirs in smb2 oplock test
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smb2/oplock.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index 143078a37d1..d6156eb4d8c 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -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, |