svn commit: samba r6502 - in branches/SAMBA_3_0/source: include lib locking smbd

herb at samba.org herb at samba.org
Wed Apr 27 18:32:37 GMT 2005


Author: herb
Date: 2005-04-27 18:32:37 +0000 (Wed, 27 Apr 2005)
New Revision: 6502

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6502

Log:
add LOCKING debug class - pull PRINTINGDB class definition from trunk
so our numbers don't get out of sync


Modified:
   branches/SAMBA_3_0/source/include/debug.h
   branches/SAMBA_3_0/source/lib/debug.c
   branches/SAMBA_3_0/source/lib/util.c
   branches/SAMBA_3_0/source/locking/brlock.c
   branches/SAMBA_3_0/source/locking/locking.c
   branches/SAMBA_3_0/source/locking/posix.c
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/debug.h
===================================================================
--- branches/SAMBA_3_0/source/include/debug.h	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/include/debug.h	2005-04-27 18:32:37 UTC (rev 6502)
@@ -94,6 +94,8 @@
 #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

Modified: branches/SAMBA_3_0/source/lib/debug.c
===================================================================
--- branches/SAMBA_3_0/source/lib/debug.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/lib/debug.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -164,6 +164,8 @@
 	"idmap",	     /* DBGC_IDMAP	  */
 	"quota",	     /* DBGC_QUOTA	  */
 	"acls",		     /* DBGC_ACLS	  */
+	"printerdb",	     /* DBGC_PRINTERDB	  */
+	"locking",	     /* DBGC_LOCKING	  */
 	NULL
 };
 

Modified: branches/SAMBA_3_0/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/lib/util.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -1793,6 +1793,9 @@
 	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 @@
 	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.

Modified: branches/SAMBA_3_0/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_0/source/locking/brlock.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/locking/brlock.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -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

Modified: branches/SAMBA_3_0/source/locking/locking.c
===================================================================
--- branches/SAMBA_3_0/source/locking/locking.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/locking/locking.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -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;
 

Modified: branches/SAMBA_3_0/source/locking/posix.c
===================================================================
--- branches/SAMBA_3_0/source/locking/posix.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/locking/posix.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -24,6 +24,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /*
  * The POSIX locking database handle.
  */

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2005-04-27 14:05:02 UTC (rev 6501)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2005-04-27 18:32:37 UTC (rev 6502)
@@ -2129,6 +2129,9 @@
 	return -1;
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Reply to a lockread (core+ protocol).
 ****************************************************************************/
@@ -2222,6 +2225,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a read.
 ****************************************************************************/
@@ -2610,6 +2616,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Reply to a writeunlock (core+).
 ****************************************************************************/
@@ -2674,6 +2683,9 @@
 	return outsize;
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a write.
 ****************************************************************************/
@@ -3121,6 +3133,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Reply to a lock.
 ****************************************************************************/
@@ -3201,6 +3216,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a tdis.
 ****************************************************************************/
@@ -4652,6 +4670,9 @@
 	return(outsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
 /****************************************************************************
  Get a lock pid, dealing with large count requests.
 ****************************************************************************/
@@ -4989,6 +5010,9 @@
 	return chain_reply(inbuf,outbuf,length,bufsize);
 }
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
 /****************************************************************************
  Reply to a SMBreadbmpx (read block multiplex) request.
 ****************************************************************************/



More information about the samba-cvs mailing list