Branch 'dev/boddie-new/combined' - pykolab/setup

Paul Boddie boddie at kolabsys.com
Fri Sep 12 22:09:03 CEST 2014


 pykolab/setup/setup_ldap.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69b068bafb25086299674b3c6c28e9141880cec6
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Sep 12 22:08:21 2014 +0200

    Ensure that a local server really is available if indicated.

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index 74cc828..d2bbbf2 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -194,7 +194,7 @@ def _execute(*args, **kw):
             conf.command_set('ldap', 'ldap_uri', ldap_default)
 
     ldap_server = ldap_uri and get_host_from_url(ldap_uri) or "localhost"
-    local_server = ldap_server == "localhost"
+    local_server = ldap_server == "localhost" and have_ldap_server
 
     # Pre-execution checks.
 




More information about the commits mailing list