From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 18 Nov 2009 21:49:24 +0000 (+0000)
Subject: Don't allow any other jobs if a -q job is active
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9241830b3b07c7bd2cf10a6238ef2261a83b3b37;p=openldap

Don't allow any other jobs if a -q job is active
---

diff --git a/servers/slapd/alock.c b/servers/slapd/alock.c
index 9c4fd72f5c..090ac1e097 100644
--- a/servers/slapd/alock.c
+++ b/servers/slapd/alock.c
@@ -409,7 +409,8 @@ alock_open ( alock_info_t * info,
 				++live_count;
 
 			} else if (res == ALOCK_UNIQUE
-				&& locktype == ALOCK_UNIQUE) {
+				&& (( locktype & ALOCK_SMASK ) == ALOCK_UNIQUE
+				|| nosave )) {
 				close (info->al_fd);
 				ber_memfree (slot_data.al_appname);
 				return ALOCK_BUSY;