svn commit: samba r13877 - in branches/SAMBA_4_0/source/smb_server/smb: .

[metze at samba.org]

Author: metze
Date: 2006-03-06 18:29:48 +0000 (Mon, 06 Mar 2006)
New Revision: 13877

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13877

Log:
remove smbsrv_send_dos_error() and use smbsrv_send_error(..,NT_STATUS_DOS())

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
   branches/SAMBA_4_0/source/smb_server/smb/receive.c
   branches/SAMBA_4_0/source/smb_server/smb/reply.c
   branches/SAMBA_4_0/source/smb_server/smb/request.c
   branches/SAMBA_4_0/source/smb_server/smb/trans2.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-03-06 17:47:29 UTC (rev 13876)
+++ branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-03-06 18:29:48 UTC (rev 13877)
@@ -379,7 +379,7 @@
 	trans.in.function	 = SVAL(req->in.vwv, 36);
 
 	if (req->in.wct != 19 + trans.in.setup_count) {
-		smbsrv_send_dos_error(req, ERRSRV, ERRerror);
+		smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));
 		return;
 	}
 

Modified: branches/SAMBA_4_0/source/smb_server/smb/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/receive.c	2006-03-06 17:47:29 UTC (rev 13876)
+++ branches/SAMBA_4_0/source/smb_server/smb/receive.c	2006-03-06 18:29:48 UTC (rev 13877)
@@ -568,7 +568,7 @@
 	uint16_t data_size;
 
 	if (req->in.wct < 2 || req->out.wct < 2) {
-		smbsrv_send_dos_error(req, ERRSRV, ERRerror);
+		smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));
 		return;
 	}
 
@@ -623,7 +623,7 @@
 error:
 	SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE);
 	SSVAL(req->out.vwv, VWV(1), 0);
-	smbsrv_send_dos_error(req, ERRSRV, ERRerror);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));
 }
 
 /*

Modified: branches/SAMBA_4_0/source/smb_server/smb/reply.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/reply.c	2006-03-06 17:47:29 UTC (rev 13876)
+++ branches/SAMBA_4_0/source/smb_server/smb/reply.c	2006-03-06 18:29:48 UTC (rev 13877)
@@ -33,7 +33,7 @@
 	if ((req)->in.wct != (wcount)) { \
 		DEBUG(1,("Unexpected WCT %d at %s(%d) - expected %d\n", \
 			 (req)->in.wct, __FILE__, __LINE__, wcount)); \
-		smbsrv_send_dos_error(req, ERRSRV, ERRerror); \
+		smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror)); \
 		return; \
 	}} while (0)
 
@@ -200,7 +200,7 @@
   
 	DEBUG(0,("unknown command type %d (0x%X)\n", type, type));
 
-	smbsrv_send_dos_error(req, ERRSRV, ERRunknownsmb);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRunknownsmb));
 }
 
 
@@ -941,7 +941,7 @@
 ****************************************************************************/
 void smbsrv_reply_writebraw(struct smbsrv_request *req)
 {
-	smbsrv_send_dos_error(req, ERRSRV, ERRuseSTD);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
 }
 
 
@@ -1854,7 +1854,7 @@
 void smbsrv_reply_readbmpx(struct smbsrv_request *req)
 {
 	/* tell the client to not use a multiplexed read - its too broken to use */
-	smbsrv_send_dos_error(req, ERRSRV, ERRuseSTD);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
 }
 
 
@@ -1890,7 +1890,7 @@
 ****************************************************************************/
 void smbsrv_reply_writebmpx(struct smbsrv_request *req)
 {
-	smbsrv_send_dos_error(req, ERRSRV, ERRuseSTD);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
 }
 
 
@@ -1899,7 +1899,7 @@
 ****************************************************************************/
 void smbsrv_reply_writebs(struct smbsrv_request *req)
 {
-	smbsrv_send_dos_error(req, ERRSRV, ERRuseSTD);
+	smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
 }
 
 

Modified: branches/SAMBA_4_0/source/smb_server/smb/request.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/request.c	2006-03-06 17:47:29 UTC (rev 13876)
+++ branches/SAMBA_4_0/source/smb_server/smb/request.c	2006-03-06 18:29:48 UTC (rev 13877)
@@ -312,26 +312,7 @@
 	smbsrv_send_reply_nosign(req);
 }
 
-
-
 /* 
-   construct and send an error packet with a forced DOS error code
-   this is needed to match win2000 behaviour for some parts of the protocol
-*/
-void smbsrv_send_dos_error(struct smbsrv_request *req, uint8_t eclass, uint16_t ecode)
-{
-	/* if the basic packet hasn't been setup yet then do it now */
-	if (req->out.buffer == NULL) {
-		smbsrv_setup_reply(req, 0, 0);
-	}
-
-	SCVAL(req->out.hdr, HDR_RCLS, eclass);
-	SSVAL(req->out.hdr, HDR_ERR, ecode);
-	SSVAL(req->out.hdr, HDR_FLG2, SVAL(req->out.hdr, HDR_FLG2) & ~FLAGS2_32_BIT_ERROR_CODES);	
-	smbsrv_send_reply(req);
-}
-
-/* 
    setup the header of a reply to include an NTSTATUS code
 */
 void smbsrv_setup_error(struct smbsrv_request *req, NTSTATUS status)

Modified: branches/SAMBA_4_0/source/smb_server/smb/trans2.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/trans2.c	2006-03-06 17:47:29 UTC (rev 13876)
+++ branches/SAMBA_4_0/source/smb_server/smb/trans2.c	2006-03-06 18:29:48 UTC (rev 13877)
@@ -1610,7 +1610,7 @@
 	trans->in.setup_count = CVAL(req->in.vwv, VWV(13));
 
 	if (req->in.wct != 14 + trans->in.setup_count) {
-		smbsrv_send_dos_error(req, ERRSRV, ERRerror);
+		smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));
 		return;
 	}