diff options
| author | Jeremy Allison <jra@samba.org> | 2004-05-04 23:01:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:24 -0500 |
| commit | 1843f6905caf30de6493de07316a416696394d3e (patch) | |
| tree | 5d0e4772266a0b0c72ac1ad528e286fa3934b4c3 /source3 | |
| parent | 741545b4978cf638f4ed8ccd533240d51e6cb24b (diff) | |
| download | samba-1843f6905caf30de6493de07316a416696394d3e.tar.gz samba-1843f6905caf30de6493de07316a416696394d3e.tar.xz samba-1843f6905caf30de6493de07316a416696394d3e.zip | |
r478: Added Volkers fix to be able to force DOS errors when needed.
Jeremy.
(This used to be commit a9d1738ebab42ab9bab73f18341d79e086e290b3)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/smb_macros.h | 7 | ||||
| -rw-r--r-- | source3/smbd/error.c | 8 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index c3bdba30b15..e847714443a 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -171,9 +171,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__) +#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,False,__LINE__,__FILE__) +#define ERROR_FORCE_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,True,__LINE__,__FILE__) +#define ERROR_NT(status) error_packet(outbuf,status,0,0,False,__LINE__,__FILE__) +#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,False,__LINE__,__FILE__) /* this is how errors are generated */ #define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) diff --git a/source3/smbd/error.c b/source3/smbd/error.c index 795bf0949cc..9c81d465e7a 100644 --- a/source3/smbd/error.c +++ b/source3/smbd/error.c @@ -42,7 +42,7 @@ int cached_error_packet(char *outbuf,files_struct *fsp,int line,const char *file /* We can now delete the auxiliary struct */ free((char *)wbmpx); fsp->wbmpx_ptr = NULL; - return error_packet(outbuf,NT_STATUS_OK,eclass,err,line,file); + return error_packet(outbuf,NT_STATUS_OK,eclass,err,False,line,file); } /**************************************************************************** @@ -76,7 +76,7 @@ int unix_error_packet(char *outbuf,int def_class,uint32 def_code, } } - return error_packet(outbuf,ntstatus,eclass,ecode,line,file); + return error_packet(outbuf,ntstatus,eclass,ecode,False,line,file); } @@ -85,7 +85,7 @@ int unix_error_packet(char *outbuf,int def_class,uint32 def_code, ****************************************************************************/ int error_packet(char *outbuf,NTSTATUS ntstatus, - uint8 eclass,uint32 ecode,int line, const char *file) + uint8 eclass,uint32 ecode,BOOL force_dos, int line, const char *file) { int outsize = set_message(outbuf,0,0,True); extern uint32 global_client_caps; @@ -106,7 +106,7 @@ int error_packet(char *outbuf,NTSTATUS ntstatus, * when talking with clients that normally expect nt status codes. JRA. */ - if ((lp_nt_status_support() || (SVAL(outbuf,smb_flg2) & FLAGS2_32_BIT_ERROR_CODES)) && (global_client_caps & CAP_STATUS32)) { + if ((lp_nt_status_support() || (SVAL(outbuf,smb_flg2) & FLAGS2_32_BIT_ERROR_CODES)) && (global_client_caps & CAP_STATUS32) && (!force_dos)) { if (NT_STATUS_V(ntstatus) == 0 && eclass) ntstatus = dos_to_ntstatus(eclass, ecode); SIVAL(outbuf,smb_rcls,NT_STATUS_V(ntstatus)); diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 718d1bb67b2..966bb63c1ea 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -736,7 +736,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize if (flags & AS_GUEST) flags &= ~AS_USER; else - return(ERROR_DOS(ERRSRV,ERRaccess)); + return(ERROR_FORCE_DOS(ERRSRV,ERRbaduid)); } /* this code is to work around a bug is MS client 3 without |