Martin Kosek wrote:
On Tue, 2011-11-08 at 14:49 -0500, Rob Crittenden wrote:
These functions are leftovers from when the managed entries plugin was
being developed and not widely available. They are no longer needed.

rob

NACK.

has_upg() does not check if the managed entry plugin present in dirsrv
but rather if the UPG rule is enabled. If the UPG rule is not enabled,
user gidNumber is set to ipausers' GID.

has_upg() behavior was lately being fixed in:
https://fedorahosted.org/freeipa/ticket/1964

Martin


This is one case I should have listened to the little voice in my head.

Revised patch.

rob
>From af42fb65e48b2595e78fb7c91228c6c96c1e3ad6 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Thu, 10 Nov 2011 14:55:45 -0500
Subject: [PATCH] Remove calls to has_managed_entries()

At one point in time we couldn't depend on the 389-ds having
the managed entries plugin so this code was added to support
both versions. It is no longer needed.

https://fedorahosted.org/freeipa/ticket/1242
---
 ipaserver/install/dsinstance.py |   30 ------------------------------
 1 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 995877c..15de54e 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -110,26 +110,6 @@ def check_ports():
 def is_ds_running(server_id=''):
     return ipaservices.knownservices.dirsrv.is_running(instance_name=server_id)
 
-def has_managed_entries(host_name, dm_password):
-    """Check to see if the Managed Entries plugin is available"""
-    ldapuri = 'ldap://%s' % ipautil.format_netloc(host_name)
-    conn = None
-    try:
-        conn = ldap2(shared_instance=False, ldap_uri=ldapuri, base_dn='cn=config')
-        conn.connect(bind_dn='cn=Directory Manager', bind_pw=dm_password)
-        (dn, attrs) = conn.get_entry('cn=Managed Entries,cn=plugins',
-                      ['*'], time_limit=2, size_limit=3000)
-        return True
-    except errors.NotFound:
-        return False
-    except errors.ExecutionError, e:
-        logging.critical("Could not connect to the Directory Server on %s" % host_name)
-        raise e
-    finally:
-        if conn.isconnected():
-            conn.disconnect()
-
-
 INF_TEMPLATE = """
 [General]
 FullMachineName=   $FQHN
@@ -457,8 +437,6 @@ class DsInstance(service.Service):
         self._ldap_mod("unique-attributes.ldif", self.sub_dict)
 
     def __config_uidgid_gen(self):
-        if not has_managed_entries(self.fqdn, self.dm_password):
-            raise errors.NotFound(reason='Missing Managed Entries Plugin')
         self._ldap_mod("dna.ldif", self.sub_dict)
 
     def __add_master_entry(self):
@@ -488,23 +466,15 @@ class DsInstance(service.Service):
         self._ldap_mod("lockout-conf.ldif")
 
     def __repoint_managed_entries(self):
-        if not has_managed_entries(self.fqdn, self.dm_password):
-            raise errors.NotFound(reason='Missing Managed Entries Plugin')
         self._ldap_mod("repoint-managed-entries.ldif", self.sub_dict)
 
     def __managed_entries(self):
-        if not has_managed_entries(self.fqdn, self.dm_password):
-            raise errors.NotFound(reason='Missing Managed Entries Plugin')
         self._ldap_mod("managed-entries.ldif", self.sub_dict)
 
     def __user_private_groups(self):
-        if not has_managed_entries(self.fqdn, self.dm_password):
-            raise errors.NotFound(reason='Missing Managed Entries Plugin')
         self._ldap_mod("user_private_groups.ldif", self.sub_dict)
 
     def __host_nis_groups(self):
-        if not has_managed_entries(self.fqdn, self.dm_password):
-            raise errors.NotFound(reason='Missing Managed Entries Plugin')
         self._ldap_mod("host_nis_groups.ldif", self.sub_dict)
 
     def __add_enrollment_module(self):
-- 
1.7.6.4

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to