summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2011-11-18 14:04:09 +0100
committerSimo Sorce <ssorce@redhat.com>2011-12-06 08:29:53 -0500
commit3de257fe54117550cc4fe82dc0614f2d07bc98de (patch)
treea3615682cda7e0dd3518411e5b23f274d9b4693d
parentedb6ed5007e7b0b4ac118d567b94e04d996d8997 (diff)
downloadfreeipa-3de257fe54117550cc4fe82dc0614f2d07bc98de.tar.gz
freeipa-3de257fe54117550cc4fe82dc0614f2d07bc98de.tar.xz
freeipa-3de257fe54117550cc4fe82dc0614f2d07bc98de.zip
activate CLDAP
-rwxr-xr-xinstall/tools/ipa-adtrust-install3
-rw-r--r--ipaserver/install/adtrustinstance.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index c6fd3478a..248ea35ea 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -214,6 +214,7 @@ def main():
print "\t\tUDP Ports:"
print "\t\t * 138: netbios-dgm"
print "\t\t * 139: netbios-ssn"
+ print "\t\t * 389: (C)LDAP"
print "\t\t * 445: microsoft-ds"
print ""
print "\tAdditionally you have to make sure the FreeIPA LDAP server cannot reached"
@@ -221,8 +222,6 @@ def main():
print "\tfollowing ports for these servers:"
print "\t\tTCP Ports:"
print "\t\t * 389, 636: LDAP/LDAPS"
- print "\t\tUDP Ports:"
- print "\t\t * 389: (C)LDAP"
print "\tYou may want to choose to REJECT the network packets instead of DROPing them"
print "\tto avoid timeouts on the AD domain controllers."
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 7808b3dea..f4379019d 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -254,6 +254,9 @@ class ADTRUSTInstance(service.Service):
conf_fd.write('config backend = registry\n')
conf_fd.close()
+ def __add_cldap_module(self):
+ self._ldap_mod("ipa-cldap-conf.ldif", self.sub_dict)
+
def __write_smb_registry(self):
template = os.path.join(ipautil.SHARE_DIR, "smb.conf.template")
conf = ipautil.template_file(template, self.sub_dict)
@@ -415,6 +418,7 @@ class ADTRUSTInstance(service.Service):
self.__set_smb_ldap_password)
self.step("Adding cifs Kerberos principal", self.__setup_principal)
self.step("Adding admin(group) SIDs", self.__add_admin_sids)
+ self.step("Activation CLDAP plugin", self.__add_cldap_module)
self.step("configuring smbd to start on boot", self.__enable)
if not self.no_msdcs:
self.step("adding special DNS service records", \