s3/smbd: update some more DEBUG macros in smbd_smb2_create_send

[nivanova/samba-autobuild/.git] / source3 / smbd / error.c

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 252eb77416e16ebaed6de279d816fd497aee1c5d..c91f5b0daf4e3ea69f00de115387b99f6370d81d 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -2,27 +2,25 @@
    Unix SMB/CIFS implementation.
    error packet handling
    Copyright (C) Andrew Tridgell 1992-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 
-/* From lib/error.c */
-extern struct unix_error_map unix_dos_nt_errmap[];
-
 bool use_nt_status(void)
 {
        return lp_nt_status_support() && (global_client_caps & CAP_STATUS32);
@@ -55,12 +53,12 @@ bool use_nt_status(void)
  server.
 ****************************************************************************/
 
-void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus, int line, const char *file)
+void error_packet_set(char *outbuf, uint8_t eclass, uint32_t ecode, NTSTATUS ntstatus, int line, const char *file)
 {
        bool force_nt_status = False;
        bool force_dos_status = False;
 
-       if (eclass == (uint8)-1) {
+       if (eclass == (uint8_t)-1) {
                force_nt_status = True;
        } else if (NT_STATUS_IS_DOS(ntstatus)) {
                force_dos_status = True;
@@ -73,17 +71,20 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
                }
                SIVAL(outbuf,smb_rcls,NT_STATUS_V(ntstatus));
                SSVAL(outbuf,smb_flg2, SVAL(outbuf,smb_flg2)|FLAGS2_32_BIT_ERROR_CODES);
-               DEBUG(3,("error packet at %s(%d) cmd=%d (%s) %s\n",
+               /* This must not start with the word 'error', as this
+                * is reserved in the subunit stream protocol, causing
+                * false errors to show up when debugging is turned
+                * on */
+               DEBUG(3,("NT error packet at %s(%d) cmd=%d (%s) %s\n",
                         file, line,
                         (int)CVAL(outbuf,smb_com),
                         smb_fn_name(CVAL(outbuf,smb_com)),
                         nt_errstr(ntstatus)));
        } else {
-               /* We're returning a DOS error only. */
-               if (NT_STATUS_IS_DOS(ntstatus)) {
-                       eclass = NT_STATUS_DOS_CLASS(ntstatus);
-                       ecode = NT_STATUS_DOS_CODE(ntstatus);
-               } else  if (eclass == 0 && NT_STATUS_V(ntstatus)) {
+               /* We're returning a DOS error only,
+                * nt_status_to_dos() pulls DOS error codes out of the
+                * NTSTATUS */
+               if (NT_STATUS_IS_DOS(ntstatus) || (eclass == 0 && NT_STATUS_V(ntstatus))) {
                        ntstatus_to_dos(ntstatus, &eclass, &ecode);
                }
 
@@ -91,7 +92,11 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
                SSVAL(outbuf,smb_rcls,eclass);
                SSVAL(outbuf,smb_err,ecode);  
 
-               DEBUG(3,("error packet at %s(%d) cmd=%d (%s) eclass=%d ecode=%d\n",
+               /* This must not start with the word 'error', as this
+                * is reserved in the subunit stream protocol, causing
+                * false errors to show up when debugging is turned
+                * on */
+               DEBUG(3,("DOS error packet at %s(%d) cmd=%d (%s) eclass=%d ecode=%d\n",
                          file, line,
                          (int)CVAL(outbuf,smb_com),
                          smb_fn_name(CVAL(outbuf,smb_com)),
@@ -100,7 +105,7 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
        }
 }
 
-int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus, int line, const char *file)
+int error_packet(char *outbuf, uint8_t eclass, uint32_t ecode, NTSTATUS ntstatus, int line, const char *file)
 {
        int outsize = srv_set_message(outbuf,0,0,True);
        error_packet_set(outbuf, eclass, ecode, ntstatus, line, file);
@@ -119,7 +124,7 @@ void reply_nt_error(struct smb_request *req, NTSTATUS ntstatus,
  Forces a DOS error on the wire.
 ****************************************************************************/
 
-void reply_force_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
+void reply_force_dos_error(struct smb_request *req, uint8_t eclass, uint32_t ecode,
                    int line, const char *file)
 {
        TALLOC_FREE(req->outbuf);
@@ -131,7 +136,7 @@ void reply_force_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
                        file);
 }
 
-void reply_both_error(struct smb_request *req, uint8 eclass, uint32 ecode,
+void reply_both_error(struct smb_request *req, uint8_t eclass, uint32_t ecode,
                      NTSTATUS status, int line, const char *file)
 {
        TALLOC_FREE(req->outbuf);