From 24618afe2fc4f7ce4f3c9c2ab7650dfc74e82395 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 09:45:10 +0200 Subject: [PATCH] Revert "TODO: reply_outbuf_ex" This reverts commit 143f542cd2d2f2a6467f7632d68c5eae4663e27c. --- source3/include/smb_macros.h | 2 -- source3/smbd/error.c | 14 -------------- source3/smbd/proto.h | 4 ---- 3 files changed, 20 deletions(-) diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index ceba72e33b46..266c17427e8b 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -125,8 +125,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 3cb61251a3d0..3f9ecaa2c5cc 100644 --- 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 2ac53c95acf7..02a8c9873c30 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -317,10 +317,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 */ -- 2.34.1