debian/changelog

@@ -11,6 +11,7 @@ freeipa (4.6.3-2) UNRELEASED; urgency=medium
   * control: Drop hardcoded libcurl3 dependency from client.
   * control*, rules: Add support for client-only build.
   * Fold admintools into the client package.
+  * fix-bind-ldap-so-path.diff: Use multiarch path to bind/ldap.so.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 04 Feb 2018 00:25:41 +0200
 

debian/patches/fix-bind-ldap-so-path.diff

+--- a/ipaplatform/debian/paths.py
++++ b/ipaplatform/debian/paths.py
+@@ -60,6 +60,7 @@ class DebianPathNamespace(BasePathNamesp
+     SBIN_SERVICE = "/usr/sbin/service"
+     CERTMONGER_COMMAND_TEMPLATE = "/usr/lib/ipa/certmonger/%s"
+     UPDATE_CA_TRUST = "/usr/sbin/update-ca-certificates"
++    BIND_LDAP_SO = "/usr/lib/{0}/bind/ldap.so".format(MULTIARCH)
+     BIND_LDAP_DNS_IPA_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/"
+     BIND_LDAP_DNS_ZONE_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/master/"
+     LIBSOFTHSM2_SO = "/usr/lib/softhsm/libsofthsm2.so"

debian/patches/series

@@ -12,3 +12,4 @@ fix-named-conf-template.diff
 fix-opendnssec-setup.diff
 fix-httpd-group.diff
 support-pam-mkhomedir.diff
+fix-bind-ldap-so-path.diff

debian/patches/support-pam-mkhomedir.diff

 --- a/ipaplatform/debian/tasks.py
 +++ b/ipaplatform/debian/tasks.py
-@@ -9,14 +9,15 @@ This module contains default Debian-spec
+@@ -9,14 +9,20 @@ This module contains default Debian-spec
  from ipaplatform.base.tasks import BaseTaskNamespace
  from ipaplatform.redhat.tasks import RedHatTaskNamespace
  
@@ -13,12 +13,17 @@
                                               was_sssd_configured):
 -        # Debian doesn't use authconfig, nothing to restore
 -        return True
++        ret = True
 +        try:
-+            ipautil.run(["pam-auth-update", "--package", "--remove", "mkhomedir"])
++            ipautil.run(["pam-auth-update",
++                         "--package", "--remove", "mkhomedir"])
++        except ipautil.CalledProcessError:
++            ret = False
++        return ret
  
      @staticmethod
      def set_nisdomain(nisdomain):
-@@ -25,8 +26,11 @@ class DebianTaskNamespace(RedHatTaskName
+@@ -25,8 +31,13 @@ class DebianTaskNamespace(RedHatTaskName
  
      @staticmethod
      def modify_nsswitch_pam_stack(sssd, mkhomedir, statestore):
@@ -27,6 +32,8 @@
 +        if mkhomedir:
 +            try:
 +                ipautil.run(["pam-auth-update", "--package", "--enable", "mkhomedir"])
++            except ipautil.CalledProcessError:
++                return False
 +        else:
 +            return True