diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-05-26 05:40:33 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:18 -0500 |
commit | 8b3f08cefcd41e6f8005de84a2cc865c1011194d (patch) | |
tree | 77cd0b79d7721efe12fcf1a481df52d02727ecd0 /source4/include/smb_macros.h | |
parent | 406f345d889d7e804c5d861223fa66abb213bb23 (diff) | |
download | samba-8b3f08cefcd41e6f8005de84a2cc865c1011194d.tar.gz samba-8b3f08cefcd41e6f8005de84a2cc865c1011194d.tar.bz2 samba-8b3f08cefcd41e6f8005de84a2cc865c1011194d.zip |
r898: - remove some unused macros
- remove unused lib/smbpasswd.c
- don't set the pkt size twice when doing SMB signing
(This used to be commit 69a2942f7987647a32d43c71f41ac1a82a82ccda)
Diffstat (limited to 'source4/include/smb_macros.h')
-rw-r--r-- | source4/include/smb_macros.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index 6dc78a1795..bbf904fbfa 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -108,20 +108,10 @@ /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 -#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,__FILE__) -#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,__FILE__) -#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,__FILE__) - -/* this is how errors are generated */ -#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) /* REWRITE TODO: remove these smb_xxx macros */ #define smb_buf(buf) (((char *)(buf)) + MIN_SMB_SIZE + CVAL(buf,HDR_WCT+4)*2) -/* the remaining number of bytes in smb buffer 'buf' from pointer 'p'. */ -#define smb_bufrem(buf, p) (smb_buflen(buf)-PTR_DIFF(p, smb_buf(buf))) - - #define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16)) #define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \ (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) |