diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-19 22:40:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:30 -0500 |
| commit | 2d80a96120a5fe2fe726f00746d36d85044c4bdb (patch) | |
| tree | 5b0251fdb656623c814357fb6e1dd98366906175 /source/include | |
| parent | 3b24dae9e73b244540a68b631b428a4d0f57440b (diff) | |
| download | samba-2d80a96120a5fe2fe726f00746d36d85044c4bdb.tar.gz samba-2d80a96120a5fe2fe726f00746d36d85044c4bdb.tar.xz samba-2d80a96120a5fe2fe726f00746d36d85044c4bdb.zip | |
r22391: Looks bigger than it is. Make "inbuf" available
to all callers of smb_setlen (via set_message()
calls). This will allow the server to reflect back
the correct encryption context.
Jeremy.
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/smb_macros.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h index 2b596d3c6b8..4a49ef3ed4f 100644 --- a/source/include/smb_macros.h +++ b/source/include/smb_macros.h @@ -162,15 +162,15 @@ #define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \ (fsp)->wbmpx_ptr->wr_discard) /* Macro to turn the cached error into an error packet */ -#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,__FILE__) +#define CACHED_ERROR(fsp) cached_error_packet(inbuf,outbuf,fsp,__LINE__,__FILE__) -#define ERROR_DOS(class,code) error_packet(outbuf,class,code,NT_STATUS_OK,__LINE__,__FILE__) -#define ERROR_NT(status) error_packet(outbuf,0,0,status,__LINE__,__FILE__) -#define ERROR_FORCE_NT(status) error_packet(outbuf,-1,-1,status,__LINE__,__FILE__) -#define ERROR_BOTH(status,class,code) error_packet(outbuf,class,code,status,__LINE__,__FILE__) +#define ERROR_DOS(class,code) error_packet(inbuf,outbuf,class,code,NT_STATUS_OK,__LINE__,__FILE__) +#define ERROR_NT(status) error_packet(inbuf,outbuf,0,0,status,__LINE__,__FILE__) +#define ERROR_FORCE_NT(status) error_packet(inbuf,outbuf,-1,-1,status,__LINE__,__FILE__) +#define ERROR_BOTH(status,class,code) error_packet(inbuf,outbuf,class,code,status,__LINE__,__FILE__) /* this is how errors are generated */ -#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,NT_STATUS_OK,__LINE__,__FILE__) +#define UNIXERROR(defclass,deferror) unix_error_packet(inbuf,outbuf,defclass,deferror,NT_STATUS_OK,__LINE__,__FILE__) /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 |