diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-22 20:30:40 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-22 20:30:40 -0600 |
| commit | 98da855176cdd32021a850bb55d91cd53d77e1f5 (patch) | |
| tree | b339cef67bb1dbbc7df5d453d73e3b537753981f /ipa_server | |
| parent | 4da1f096751f000efcd7eb5ca3b7d719f3ce5581 (diff) | |
| parent | 1daf319a19f902d7c7bef37af065cac81be9189e (diff) | |
| download | freeipa-98da855176cdd32021a850bb55d91cd53d77e1f5.tar.gz freeipa-98da855176cdd32021a850bb55d91cd53d77e1f5.tar.xz freeipa-98da855176cdd32021a850bb55d91cd53d77e1f5.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 | 10 | ||||
| -rw-r--r-- | ipa_server/updates/host.update | 22 |
2 files changed, 32 insertions, 0 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index a07e8e71..2e9c9e9f 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -70,6 +70,16 @@ class ldap(CrudBackend): self.api.env.basedn, ) + def make_host_dn(self, hostname): + """ + Construct host dn from hostname + """ + return 'cn=%s,%s,%s' % ( + self.dn.escape_dn_chars(hostname), + self.api.env.container_host, + self.api.env.basedn, + ) + def get_object_type(self, attribute): """ Based on attribute, make an educated guess as to the type of diff --git a/ipa_server/updates/host.update b/ipa_server/updates/host.update new file mode 100644 index 00000000..dfc9723c --- /dev/null +++ b/ipa_server/updates/host.update @@ -0,0 +1,22 @@ +# +# Schema for IPA Hosts +# +dn: cn=schema +add: attributeTypes: + ( 2.16.840.1.113730.3.8.3.10 NAME 'ipaClientVersion' + DESC 'Text string describing client version of the IPA software installed' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + X-ORIGIN 'IPA v2' ) + +add: attributeTypes: + ( 2.16.840.1.113730.3.8.3.11 NAME 'enrolledBy' + DESC 'DN of administrator who performed manual enrollment of the host' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 + X-ORIGIN 'IPA v2' ) +add: objectClasses: + ( 2.16.840.1.113730.3.8.4.2 NAME 'ipaHost' + AUXILIARY + MAY ( userPassword $ ipaClientVersion $ enrolledBy) + X-ORIGIN 'IPA v2' ) + + |