[Pkg-openldap-devel] [openldap] 01/01: Fix slapd-smbk5pwd upgrade with no smbk5pwd instances

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 9948501326ef2f479452c9c92fc8b77c00224895
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Dec 1 19:39:59 2016 -0800

    Fix slapd-smbk5pwd upgrade with no smbk5pwd instances
---
 debian/changelog              | 4 +++-
 debian/slapd-smbk5pwd.preinst | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b5d885..bb3d927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,13 @@ openldap (2.4.44+dfsg-2) unstable; urgency=medium
     override_dh_install.
   * Remove manual chmod of schema files since dh_fixperms sets correct 
     permissions automatically.
+  * Fix slapd-smbk5pwd failing to upgrade when there are no instances of the 
+    overlay configured.
 
   [ Helmut Grohne ]
   * Fix FTCBFS: Pass CC to make explicitly. (Closes: #839251)
 
- -- Ryan Tandy <ryan at nardis.ca>  Mon, 28 Nov 2016 19:46:46 -0800
+ -- Ryan Tandy <ryan at nardis.ca>  Thu, 01 Dec 2016 19:40:20 -0800
 
 openldap (2.4.44+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/slapd-smbk5pwd.preinst b/debian/slapd-smbk5pwd.preinst
index ef22232..eddad8e 100644
--- a/debian/slapd-smbk5pwd.preinst
+++ b/debian/slapd-smbk5pwd.preinst
@@ -9,9 +9,8 @@ set -e
 is_krb5_enabled() {							# {{{
 # Cannot depend on a working slapcat here. If a new slapd was already 
 # unpacked, slap* binaries may be broken until it is configured.
-	find "$SLAPD_CONF" \
-		-type f -iname 'olcOverlay={*}smbk5pwd.ldif' \
-		-exec grep -qi '^olcSmbK5PwdEnable:\s\+krb5' {} \+
+	grep -qri --include='olcOverlay=*smbk5pwd.ldif' \
+		'^olcSmbK5PwdEnable:\s\+krb5' "$SLAPD_CONF"
 }
 # }}}
 ensure_krb5_disabled() {						# {{{

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