diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
| commit | 2e92be3aaf01c574d32d1a10e1359888638b68bc (patch) | |
| tree | 5280182dda3e36282bd11699e022e015ad531bdc /source3/smbd/reply.c | |
| parent | 8429cec72ff15efdd5ab742ba71ede36db43ef14 (diff) | |
| download | samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.gz samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.bz2 samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.zip | |
client.c: Changed shadowed variable.
locking.c: Removed USE_OPLOCKS - now the default.
params.c: Removed unused variable.
proto.h: Updated.
reply.c: Removed USE_OPLOCKS - now the default.
server.c: Removed USE_OPLOCKS - now the default.
smb.h: Removed USE_OPLOCKS - now the default.
smbparse.c: Changed shadowed variable.
status.c: Removed USE_OPLOCKS - now the default.
util.c: Removed USE_OPLOCKS - now the default.
Jeremy (jallison@whistle.com)
(This used to be commit b93509846d6291771787af457500eec8984ee6bd)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a8f674183c..fa641931eb 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1621,7 +1621,6 @@ int reply_readbraw(char *inbuf, char *outbuf) int fd; char *fname; -#ifdef USE_OPLOCKS /* * Special check if an oplock break has been issued * and the readraw request croses on the wire, we must @@ -1635,7 +1634,6 @@ int reply_readbraw(char *inbuf, char *outbuf) DEBUG(5,("readbraw - oplock break finished\n")); return -1; } -#endif cnum = SVAL(inbuf,smb_tid); fnum = GETFNUM(inbuf,smb_vwv0); @@ -3373,7 +3371,7 @@ int reply_lockingX(char *inbuf,char *outbuf,int length,int bufsize) unsigned char locktype = CVAL(inbuf,smb_vwv3); #if 0 unsigned char oplocklevel = CVAL(inbuf,smb_vwv3+1); -#endif /* USE_OPLOCKS */ +#endif uint16 num_ulocks = SVAL(inbuf,smb_vwv6); uint16 num_locks = SVAL(inbuf,smb_vwv7); uint32 count, offset; @@ -3391,7 +3389,6 @@ int reply_lockingX(char *inbuf,char *outbuf,int length,int bufsize) data = smb_buf(inbuf); -#ifdef USE_OPLOCKS /* Check if this is an oplock break on a file we have granted an oplock on. */ @@ -3432,7 +3429,6 @@ dev = %x, inode = %x\n", fnum, dev, inode)); fsp->granted_oplock = False; return -1; } -#endif /* USE_OPLOCKS */ /* Data now points at the beginning of the list of smb_unlkrng structs */ |