summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-01-10 13:02:59 +0100
committerJeremy Allison <jra@samba.org>2014-01-15 04:02:58 +0100
commit497a8dddc4901c9df1c30d0251b5706ff11ca6bd (patch)
treed350164ed3b13f1e276c9d7821d97a5818c7b79f /source3
parent666948c776948a8147501d2ba590bcd05e78458d (diff)
downloadsamba-497a8dddc4901c9df1c30d0251b5706ff11ca6bd.tar.gz
samba-497a8dddc4901c9df1c30d0251b5706ff11ca6bd.tar.xz
samba-497a8dddc4901c9df1c30d0251b5706ff11ca6bd.zip
smbd: Avoid duplicate debug header lines
This is what gets created in log.smbd: DEBUGLVL generates an empty header line, CHECK_DEBUGLVL avoids this. [2014/01/10 12:58:24.971658, 10, pid=2329, effective(1001, 1001), real(0, 0)] ../source3/smbd/smbXsrv_open.c:696(smbXsrv_open_global_store) [2014/01/10 12:58:24.971690, 10, pid=2329, effective(1001, 1001), real(0, 0)] ../source3/smbd/smbXsrv_open.c:698(smbXsrv_open_global_store) Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Jan 15 04:02:58 CET 2014 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/smbXsrv_open.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 25dc6f70053..3566dc25918 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -600,7 +600,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
}
DEBUG(10,("smbXsrv_open_global_verify_record\n"));
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
}
@@ -626,7 +626,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
"key '%s' server_id %s does not exist.\n",
hex_encode_talloc(frame, key.dptr, key.dsize),
server_id_str(frame, &global->server_id)));
- if (DEBUGLVL(2)) {
+ if (CHECK_DEBUGLVL(2)) {
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
}
TALLOC_FREE(frame);
@@ -692,7 +692,7 @@ static NTSTATUS smbXsrv_open_global_store(struct smbXsrv_open_global0 *global)
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
DEBUG(10,("smbXsrv_open_global_store: key '%s' stored\n",
hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
@@ -859,7 +859,7 @@ NTSTATUS smbXsrv_open_create(struct smbXsrv_connection *conn,
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -930,7 +930,7 @@ NTSTATUS smbXsrv_open_update(struct smbXsrv_open *op)
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -1008,7 +1008,7 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
error = status;
}
- if (NT_STATUS_IS_OK(status) && DEBUGLVL(10)) {
+ if (NT_STATUS_IS_OK(status) && CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -1270,7 +1270,7 @@ NTSTATUS smb2srv_open_recreate(struct smbXsrv_connection *conn,
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);