From 3cf091cf68023eeea9ebd0f2cadb14e658c98421 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 13 Feb 2012 17:44:34 +1100 Subject: [PATCH] s3-smbd: Avoid starting log lines with the word 'error' --- source3/smbd/error.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source3/smbd/error.c b/source3/smbd/error.c index 815b8579d2a..d038acfe023 100644 --- a/source3/smbd/error.c +++ b/source3/smbd/error.c @@ -71,7 +71,11 @@ 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)), @@ -88,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)), -- 2.34.1