summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-13 17:44:34 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-16 15:21:11 +1100
commit3cf091cf68023eeea9ebd0f2cadb14e658c98421 (patch)
treee204d98ccbbbc77160ad1223155ee4994d050b89
parent6917575fe3d0e34acae0d4a14a407a80c11daf99 (diff)
downloadsamba-3cf091cf68023eeea9ebd0f2cadb14e658c98421.tar.gz
samba-3cf091cf68023eeea9ebd0f2cadb14e658c98421.tar.bz2
samba-3cf091cf68023eeea9ebd0f2cadb14e658c98421.zip
s3-smbd: Avoid starting log lines with the word 'error'
-rw-r--r--source3/smbd/error.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 815b8579d2..d038acfe02 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)),