[Pkg-samba-maint] r1534 - in branches/samba/experimental/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-10-21 00:38:28 +0000 (Sun, 21 Oct 2007)
New Revision: 1534

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/smbstatus-locking.patch
Log:
Update smbstatus-locking.patch to use db_open() instead of
tdb_open(), per upstream recommendation.

Re-enable smbstatus-locking.patch in the series.



Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2007-10-19 21:14:26 UTC (rev 1533)
+++ branches/samba/experimental/debian/changelog	2007-10-21 00:38:28 UTC (rev 1534)
@@ -1,11 +1,13 @@
 samba (3.2.0~pre1-1) experimental; urgency=low
 
   * New upstream (pre-)release
-  
+
   [ Steve Langasek ]
   * fhs.patch: net usershares should also be stored under /var/lib, not under
     /var/run.  No transition handling in maintainer scripts, since this
     feature is not activated by default.
+  * Update smbstatus-locking.patch to use db_open() instead of
+    tdb_open(), per upstream recommendation.
 
   [ Debconf translations ]
   * Hebrew added. Closes: #444054
@@ -17,7 +19,7 @@
     - fhs-filespaths.patch: assign files to new paths
     - fhs-assignpaths.patch: assign paths to FHS-compatible locations
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 29 Sep 2007 12:02:13 +0200
+ -- Steve Langasek <vorlon at debian.org>  Sat, 20 Oct 2007 17:34:08 -0700
 
 samba (3.0.26a-1) unstable; urgency=low
 

Modified: branches/samba/experimental/debian/patches/smbstatus-locking.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbstatus-locking.patch	2007-10-19 21:14:26 UTC (rev 1533)
+++ branches/samba/experimental/debian/patches/smbstatus-locking.patch	2007-10-21 00:38:28 UTC (rev 1534)
@@ -10,28 +10,21 @@
 ===================================================================
 --- samba-3.2.0pre1.orig/source/utils/status.c
 +++ samba-3.2.0pre1/source/utils/status.c
-@@ -277,6 +277,7 @@
- {
- 	int c;
- 	int profile_only = 0;
-+	TDB_CONTEXT *tdb;
- 	BOOL show_processes, show_locks, show_shares;
- 	poptContext pc;
- 	struct poptOption long_options[] = {
-@@ -405,6 +406,16 @@
+@@ -404,6 +404,17 @@
+ 
  	if ( show_locks ) {
  		int result;
- 
-+		tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
++		struct db_context *db;
++		db = db_open(NULL, lock_path("locking.tdb"), 0,
++			     TDB_DEFAULT, O_RDONLY, 0);
 +
-+		if (!tdb) {
++		if (!db) {
 +			d_printf("%s not initialised\n", lock_path("locking.tdb"));
 +			d_printf("This is normal if an SMB client has never connected to your server.\n");
 +			exit(0);
 +		} else {
-+			tdb_close(tdb);
++			TALLOC_FREE(db);
 +		}
-+
+ 
  		if (!locking_init(1)) {
  			d_printf("Can't initialise locking module - exiting\n");
- 			ret = 1;