[Pkg-samba-maint] [samba] 09/10: patch for https://bugzilla.samba.org/show_bug.cgi?id=12045

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit 4854621d4545976d0a1889c89acbd3fbe298c196
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Oct 19 21:39:52 2016 +0200

    patch for https://bugzilla.samba.org/show_bug.cgi?id=12045
---
 debian/changelog                                   |  1 +
 ...il-out-of-stabilize-if-we-can-not-get-the.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 source3/lib/gencache.c                             |  2 +-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b4079a4..98be07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ samba (2:4.5.0+dfsg-1) UNRELEASED; urgency=medium
       - libtdb-dev (>= 1.3.10~)
       - libtevent-dev (>= 0.9.29~)
       - python-talloc-dev (>= 2.1.8~)
+  * Add patch for https://bugzilla.samba.org/show_bug.cgi?id=12045
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 10 Sep 2016 21:18:20 +0200
 
diff --git a/debian/patches/gencache-Bail-out-of-stabilize-if-we-can-not-get-the.patch b/debian/patches/gencache-Bail-out-of-stabilize-if-we-can-not-get-the.patch
new file mode 100644
index 0000000..480dbc6
--- /dev/null
+++ b/debian/patches/gencache-Bail-out-of-stabilize-if-we-can-not-get-the.patch
@@ -0,0 +1,35 @@
+From 5bd28ffcf5bb20bc4f3b9c359d99dd2751fe6c93 Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl at samba.org>
+Date: Mon, 19 Sep 2016 14:29:21 -0700
+Subject: [PATCH] gencache: Bail out of stabilize if we can not get the
+ allrecord lock
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=12045
+
+Signed-off-by: Volker Lendecke <vl at samba.org>
+Reviewed-by: Jeremy Allison <jra at samba.org>
+
+Autobuild-User(master): Jeremy Allison <jra at samba.org>
+Autobuild-Date(master): Tue Sep 20 04:09:33 CEST 2016 on sn-devel-144
+
+(cherry picked from commit b208499960eefef02d305a3bd59b03a7c2aafcac)
+---
+ source3/lib/gencache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
+index 84d273e..97e0b40 100644
+--- a/source3/lib/gencache.c
++++ b/source3/lib/gencache.c
+@@ -664,7 +664,7 @@ bool gencache_stabilize(void)
+ 		return false;
+ 	}
+ 
+-	res = tdb_lockall(cache_notrans->tdb);
++	res = tdb_lockall_nonblock(cache_notrans->tdb);
+ 	if (res != 0) {
+ 		tdb_transaction_cancel(cache->tdb);
+ 		DEBUG(10, ("Could not get allrecord lock on "
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 6487f46..ce2c8c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ systemd-syslog.target-is-obsolete.patch
 Add-documentation-to-systemd-Unit-files.patch
 fix_kill_path_in_units.patch
 bug_12283_segfault_tevent_internals.patch
+gencache-Bail-out-of-stabilize-if-we-can-not-get-the.patch
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 84d273e..97e0b40 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -664,7 +664,7 @@ bool gencache_stabilize(void)
 		return false;
 	}
 
-	res = tdb_lockall(cache_notrans->tdb);
+	res = tdb_lockall_nonblock(cache_notrans->tdb);
 	if (res != 0) {
 		tdb_transaction_cancel(cache->tdb);
 		DEBUG(10, ("Could not get allrecord lock on "

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git