summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2005-04-27 18:32:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:43 -0500
commited1f7121a39d863066ef47e985b77fe3dbedbc9b (patch)
treee24fc83bd3a3f078620859a3c77a93372d763977
parent7a8ee799259c7c0e3d5d6b3d34ce05195f53d4cb (diff)
downloadsamba-ed1f7121a39d863066ef47e985b77fe3dbedbc9b.tar.gz
samba-ed1f7121a39d863066ef47e985b77fe3dbedbc9b.tar.bz2
samba-ed1f7121a39d863066ef47e985b77fe3dbedbc9b.zip
r6502: add LOCKING debug class - pull PRINTINGDB class definition from trunk
so our numbers don't get out of sync (This used to be commit 58e307664e02ebf0415f19ed625d2f166d9cb1cc)
-rw-r--r--source3/include/debug.h2
-rw-r--r--source3/lib/debug.c2
-rw-r--r--source3/lib/util.c6
-rw-r--r--source3/locking/brlock.c3
-rw-r--r--source3/locking/locking.c3
-rw-r--r--source3/locking/posix.c3
-rw-r--r--source3/smbd/reply.c24
7 files changed, 43 insertions, 0 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 05a9a3f0c5..062bbe1a0a 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -94,6 +94,8 @@ extern int DEBUGLEVEL;
#define DBGC_IDMAP 13
#define DBGC_QUOTA 14
#define DBGC_ACLS 15
+#define DBGC_PRINTERDB 16
+#define DBGC_LOCKING 17
/* So you can define DBGC_CLASS before including debug.h */
#ifndef DBGC_CLASS
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index b69a35ecd5..43d1f64eb1 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -164,6 +164,8 @@ static const char *default_classname_table[] = {
"idmap", /* DBGC_IDMAP */
"quota", /* DBGC_QUOTA */
"acls", /* DBGC_ACLS */
+ "printerdb", /* DBGC_PRINTERDB */
+ "locking", /* DBGC_LOCKING */
NULL
};
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 596f0827a5..b0cd9aa9e7 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1793,6 +1793,9 @@ void free_namearray(name_compare_entry *name_array)
SAFE_FREE(name_array);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Simple routine to do POSIX file locking. Cruft in NFS and 64->32 bit mapping
is dealt with in posix.c
@@ -1843,6 +1846,9 @@ BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
return(True);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/*******************************************************************
Is the name specified one of my netbios names.
Returns true if it is equal, false otherwise.
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 09c96b1286..da7fc1e67d 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -27,6 +27,9 @@
#include "includes.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
#define ZERO_ZERO 0
/* This contains elements that differentiate locks. The smbpid is a
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index e10e8a1fa0..75b40d74a4 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -37,6 +37,9 @@
#include "includes.h"
uint16 global_smbpid;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/* the locking database handle */
static TDB_CONTEXT *tdb;
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 95d4518c17..5b001b7141 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -24,6 +24,9 @@
#include "includes.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/*
* The POSIX locking database handle.
*/
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c3cb81ddfc..aa33e59b7e 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2129,6 +2129,9 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
return -1;
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a lockread (core+ protocol).
****************************************************************************/
@@ -2222,6 +2225,9 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a read.
****************************************************************************/
@@ -2610,6 +2616,9 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a writeunlock (core+).
****************************************************************************/
@@ -2674,6 +2683,9 @@ int reply_writeunlock(connection_struct *conn, char *inbuf,char *outbuf,
return outsize;
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a write.
****************************************************************************/
@@ -3121,6 +3133,9 @@ int reply_writeclose(connection_struct *conn,
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a lock.
****************************************************************************/
@@ -3201,6 +3216,9 @@ int reply_unlock(connection_struct *conn, char *inbuf,char *outbuf, int size,
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a tdis.
****************************************************************************/
@@ -4652,6 +4670,9 @@ int reply_setdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Get a lock pid, dealing with large count requests.
****************************************************************************/
@@ -4989,6 +5010,9 @@ no oplock granted on this file (%s).\n", fsp->fnum, fsp->fsp_name));
return chain_reply(inbuf,outbuf,length,bufsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a SMBreadbmpx (read block multiplex) request.
****************************************************************************/