diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-29 18:10:38 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-29 18:10:38 -0600 |
| commit | 9f45cdbe2f3b358aaacddc61aaba58605c93bacc (patch) | |
| tree | 8459cc24effdf3d6097fd210660179c8cfbeeb71 /ipa_server | |
| parent | dfc690696a448ee973ea48ed5ddf736e0b4377e4 (diff) | |
| parent | 54f37503d2076b99b3b7479b19fec4fa17bc7c59 (diff) | |
| download | freeipa-9f45cdbe2f3b358aaacddc61aaba58605c93bacc.tar.gz freeipa-9f45cdbe2f3b358aaacddc61aaba58605c93bacc.tar.xz freeipa-9f45cdbe2f3b358aaacddc61aaba58605c93bacc.zip | |
Merge branch 'master' of git://git.engineering.redhat.com/users/rcritten/freeipa2
Diffstat (limited to 'ipa_server')
| -rw-r--r-- | ipa_server/plugins/b_ldap.py | 14 | ||||
| -rw-r--r-- | ipa_server/updates/groupofhosts.update | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index 2c65ba45..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 @@ -106,7 +116,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 +124,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') diff --git a/ipa_server/updates/groupofhosts.update b/ipa_server/updates/groupofhosts.update new file mode 100644 index 00000000..fb39c5e2 --- /dev/null +++ b/ipa_server/updates/groupofhosts.update @@ -0,0 +1,5 @@ +dn: cn=hostgroups,cn=accounts,$SUFFIX +add:objectClass: top +add:objectClass: nsContainer +add:cn: hostgroups + |