[Pkg-freeipa-devel] freeipa: Changes to 'master-next'

[Timo Aaltonen]

 debian/changelog                       |    1 +
 debian/patches/fix-replicainstall.diff |   11 +++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 13 insertions(+)

New commits:
commit 89131c7cf5f50de37a24e352b3649902a389f3b9
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Mar 2 14:10:56 2016 +0200

    fix-replicainstall.diff: Use ldap instead of ldaps for conncheck.

diff --git a/debian/changelog b/debian/changelog
index 533998c..5de6f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
   * server: Enable mod_proxy_ajp and mod_proxy_http on postinst, disable
     on postrm.
   * control: Add zip to python-ipaserver depends.
+  * fix-replicainstall.diff: Use ldap instead of ldaps for conncheck.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/patches/fix-replicainstall.diff b/debian/patches/fix-replicainstall.diff
new file mode 100644
index 0000000..ba6425d
--- /dev/null
+++ b/debian/patches/fix-replicainstall.diff
@@ -0,0 +1,11 @@
+--- a/ipaserver/install/server/replicainstall.py
++++ b/ipaserver/install/server/replicainstall.py
+@@ -990,7 +990,7 @@ def promote_check(installer):
+         raise RuntimeError("CA cert file is not available! Please reinstall"
+                            "the client and try again.")
+ 
+-    ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
++    ldapuri = 'ldap://%s' % ipautil.format_netloc(config.master_host_name)
+     remote_api = create_api(mode=None)
+     remote_api.bootstrap(in_server=True, context='installer',
+                          ldap_uri=ldapuri)
diff --git a/debian/patches/series b/debian/patches/series
index c236adc..7b754d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-ipa-otpd-install.diff
 fix-certmonger-script-install.diff
 use-httpd-user.diff
 fix-custodia-conf.diff
+fix-replicainstall.diff