r24311: add a reply_force_nterror() macro

metze
(This used to be commit b9ae00f4980c305f2f7334b139f9bc72fd9afbd6)

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 15789a938ab10d1385d8c18a8e3b99f364917db4..7c786b03c841de7f0de6ff5fae197ea4dab5e8f2 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -170,6 +170,7 @@
 #define ERROR_BOTH(status,class,code) error_packet(inbuf,outbuf,class,code,status,__LINE__,__FILE__)
 
 #define reply_nterror(req,status) reply_nt_error(req,status,__LINE__,__FILE__)
+#define reply_force_nterror(req,status) reply_force_nt_error(req,status,__LINE__,__FILE__)
 #define reply_doserror(req,eclass,ecode) reply_dos_error(req,eclass,ecode,__LINE__,__FILE__)
 #define reply_botherror(req,status,eclass,ecode) reply_both_error(req,eclass,ecode,status,__LINE__,__FILE__)
 #define reply_unixerror(req,defclass,deferror) reply_unix_error(req,defclass,deferror,NT_STATUS_OK,__LINE__,__FILE__)

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 023e1b7dcc458907a09f69074872a5ed9994b3a3..dd9ff85640a8a99f03c407205afb26728101c306 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -140,6 +140,14 @@ void reply_nt_error(struct smb_request *req, NTSTATUS ntstatus,
        error_packet_set((char *)req->outbuf, 0, 0, ntstatus, line, file);
 }
 
+void reply_force_nt_error(struct smb_request *req, NTSTATUS ntstatus,
+                         int line, const char *file)
+{
+       TALLOC_FREE(req->outbuf);
+       reply_outbuf(req, 0, 0);
+       error_packet_set((char *)req->outbuf, -1, -1, ntstatus, line, file);
+}
+
 void reply_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
                    int line, const char *file)
 {