From ce199a8dc40fe7837795e384b11b0038eafebddf Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 24 Oct 2008 14:42:11 -0400 Subject: Change variable name that shadowed built-in (filter) --- ipa_server/plugins/b_ldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipa_server/plugins/b_ldap.py') diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index 2c65ba45..fd78b362 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -106,7 +106,7 @@ class ldap(CrudBackend): if not object_type: return None - filter = "(&(%s=%s)(objectclass=%s))" % ( + search_filter = "(&(%s=%s)(objectclass=%s))" % ( key_attribute, self.dn.escape_dn_chars(primary_key), object_type @@ -114,7 +114,7 @@ class ldap(CrudBackend): search_base = "%s, %s" % (self.api.env.container_accounts, self.api.env.basedn) - entry = servercore.get_sub_entry(search_base, filter, ['dn', 'objectclass']) + entry = servercore.get_sub_entry(search_base, search_filter, ['dn', 'objectclass']) return entry.get('dn') -- cgit From 54f37503d2076b99b3b7479b19fec4fa17bc7c59 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 27 Oct 2008 12:24:17 -0400 Subject: Implement host groups --- ipa_server/plugins/b_ldap.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ipa_server/plugins/b_ldap.py') diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index fd78b362..b58a644a 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -60,6 +60,16 @@ class ldap(CrudBackend): self.api.env.basedn, ) + def make_hostgroup_dn(self, cn): + """ + Construct group of hosts dn from cn. + """ + return 'cn=%s,%s,%s' % ( + self.dn.escape_dn_chars(cn), + self.api.env.container_hostgroup, + self.api.env.basedn, + ) + def make_service_dn(self, principal): """ Construct service principal dn from principal name -- cgit