Author: tridge Date: 2006-04-11 04:36:09 +0000 (Tue, 11 Apr 2006) New Revision: 15032
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15032 Log: change BENCH-NBENCH to always break to none, rather than accepting a levelII break offer from the server. Modified: branches/SAMBA_4_0/source/include/smb.h branches/SAMBA_4_0/source/torture/nbench/nbio.c Changeset: Modified: branches/SAMBA_4_0/source/include/smb.h =================================================================== --- branches/SAMBA_4_0/source/include/smb.h 2006-04-11 01:43:16 UTC (rev 15031) +++ branches/SAMBA_4_0/source/include/smb.h 2006-04-11 04:36:09 UTC (rev 15032) @@ -551,6 +551,11 @@ #define BATCH_OPLOCK_RETURN 2 #define LEVEL_II_OPLOCK_RETURN 3 +/* oplock levels sent in oplock break */ +#define OPLOCK_BREAK_TO_NONE 0 +#define OPLOCK_BREAK_TO_LEVEL_II 1 + + #define CMD_REPLY 0x8000 /* The maximum length of a trust account password. Modified: branches/SAMBA_4_0/source/torture/nbench/nbio.c =================================================================== --- branches/SAMBA_4_0/source/torture/nbench/nbio.c 2006-04-11 01:43:16 UTC (rev 15031) +++ branches/SAMBA_4_0/source/torture/nbench/nbio.c 2006-04-11 04:36:09 UTC (rev 15032) @@ -181,10 +181,11 @@ /* a handler function for oplock break requests */ -static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private) +static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, + uint16_t fnum, BOOL shared, uint8_t level, void *private) { struct smbcli_tree *tree = private; - return smbcli_oplock_ack(tree, fnum, level); + return smbcli_oplock_ack(tree, fnum, OPLOCK_BREAK_TO_NONE); } void nb_setup(struct smbcli_state *cli, int id)