Revert "TODO: reply_outbuf_ex"

This reverts commit 143f542cd2d2f2a6467f7632d68c5eae4663e27c.

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 51c859642cee0ad27e032af259e8b070c4bd86ba..f8656c7301462f5cd5745dc6ad709e524f6100ef 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -117,8 +117,6 @@
 #define reply_nterror(req,status) reply_nt_error(req,status,__LINE__,__FILE__)
 #define reply_force_doserror(req,eclass,ecode) reply_force_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_outbuf_ex(req,status,eclass,ecode,words,bytes) \
-       reply_outbuf__ex(req,eclass,ecode,status,words,bytes,__LINE__,__FILE__)
 
 #if 0
 /* defined in IDL */

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index d31d21a0f316d1bf28ec68bdedaa6dbfff1f2cb2..c91f5b0daf4e3ea69f00de115387b99f6370d81d 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -145,20 +145,6 @@ void reply_both_error(struct smb_request *req, uint8_t eclass, uint32_t ecode,
                         line, file);
 }
 
-void reply_outbuf__ex(struct smb_request *req,
-                     uint8_t eclass, uint32_t ecode, NTSTATUS status,
-                     uint8_t num_words, uint32_t num_bytes,
-                     int line, const char *file)
-{
-       TALLOC_FREE(req->outbuf);
-       reply_outbuf(req, num_words, num_bytes);
-       if (eclass == 0 && ecode == 0 && NT_STATUS_IS_OK(status)) {
-               return;
-       }
-       error_packet_set((char *)req->outbuf, eclass, ecode, status,
-                        line, file);
-}
-
 void reply_openerror(struct smb_request *req, NTSTATUS status)
 {
        if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index f2a714d04ff2fd616f54966eb2848b99615af1cc..fb30a9e0eaa178c4bba6d038f7f39b56f0092398 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -305,10 +305,6 @@ void reply_force_dos_error(struct smb_request *req, uint8_t eclass, uint32_t eco
                    int line, const char *file);
 void reply_both_error(struct smb_request *req, uint8_t eclass, uint32_t ecode,
                      NTSTATUS status, int line, const char *file);
-void reply_outbuf__ex(struct smb_request *req,
-                     uint8_t eclass, uint32_t ecode, NTSTATUS status,
-                     uint8_t num_words, uint32_t num_bytes,
-                     int line, const char *file);
 void reply_openerror(struct smb_request *req, NTSTATUS status);
 
 /* The following definitions come from smbd/file_access.c  */