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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-25 06:33:56 +0000 (Tue, 25 Mar 2008)
New Revision: 1788

Removed:
   branches/samba/experimental/debian/patches/smbstatus-locking.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/series
Log:
* debian/patches/smbstatus-locking.patch: merged upstream

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-03-25 06:21:52 UTC (rev 1787)
+++ branches/samba/experimental/debian/changelog	2008-03-25 06:33:56 UTC (rev 1788)
@@ -30,6 +30,7 @@
       uses of lock_path() which we map to cache_path().
     - debian/patches/fhs-assignpaths.patch: patch source/m4/check_path.m4
       instead of source/configure.in.
+  * debian/patches/smbstatus-locking.patch: merged upstream
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 05 Mar 2008 22:45:28 +0100
 

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2008-03-25 06:21:52 UTC (rev 1787)
+++ branches/samba/experimental/debian/patches/series	2008-03-25 06:33:56 UTC (rev 1788)
@@ -8,7 +8,6 @@
 pam-examples.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch
-smbstatus-locking.patch
 undefined-symbols.patch
 VERSION.patch
 adapt_machine_creation_script.patch

Deleted: branches/samba/experimental/debian/patches/smbstatus-locking.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbstatus-locking.patch	2008-03-25 06:21:52 UTC (rev 1787)
+++ branches/samba/experimental/debian/patches/smbstatus-locking.patch	2008-03-25 06:33:56 UTC (rev 1788)
@@ -1,37 +0,0 @@
-Goal: Unknown
-
-Fixes: #164179. Patch later corrected in #164489
-
-Status wrt upstream: Should maybe be forwarded
-
-Note: 
-
-Index: samba-3.2.0pre1/source/utils/status.c
-===================================================================
---- 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 @@
- 	if ( show_locks ) {
- 		int result;
- 
-+		tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
-+
-+		if (!tdb) {
-+			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);
-+		}
-+
- 		if (!locking_init(1)) {
- 			d_printf("Can't initialise locking module - exiting\n");
- 			ret = 1;