diff options
Diffstat (limited to 'ipa_server')
| -rw-r--r-- | ipa_server/plugins/b_ldap.py | 7 | ||||
| -rw-r--r-- | ipa_server/updates/automount.update | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index a93f97f0c..0f9239355 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -117,7 +117,7 @@ class ldap(CrudBackend): return object_type - def find_entry_dn(self, key_attribute, primary_key, object_type=None): + def find_entry_dn(self, key_attribute, primary_key, object_type=None, base=None): """ Find an existing entry's dn from an attribute """ @@ -133,7 +133,10 @@ class ldap(CrudBackend): self.dn.escape_dn_chars(primary_key) ) - search_base = "%s, %s" % (self.api.env.container_accounts, self.api.env.basedn) + if not base: + base = self.api.env.container_accounts + + search_base = "%s, %s" % (base, self.api.env.basedn) entry = servercore.get_sub_entry(search_base, search_filter, ['dn', 'objectclass']) diff --git a/ipa_server/updates/automount.update b/ipa_server/updates/automount.update index 25d45a092..13d9a6df0 100644 --- a/ipa_server/updates/automount.update +++ b/ipa_server/updates/automount.update @@ -33,3 +33,22 @@ add:objectClasses: DESC 'Automount information' SUP top STRUCTURAL MUST ( automountKey $ automountInformation ) MAY description X-ORIGIN 'RFC 2307bis' ) + +# Add the default automount entries + +dn: cn=automount,$SUFFIX +add:objectClass: nsContainer +add:cn: automount + +dn: automountmapname=auto.master,cn=automount,$SUFFIX +add:objectClass: automountMap +add:automountMapName: auto.master + +dn: automountkey=/-,automountmapname=auto.master,cn=automount,$SUFFIX +add:objectClass: automount +add:automountKey: '/-' +add:automountInformation: auto.direct + +dn: automountmapname=auto.direct,cn=automount,$SUFFIX +add:objectClass: automountMap +add:automountMapName: auto.direct |