diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-01-22 09:28:25 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:43 +0100 |
| commit | 8d92ca851c6a0d3380ddbe13c3b442adab274f93 (patch) | |
| tree | 333e840dcd564035013b5cfa31115ffe1baf9e1b /ipaserver/install/krbinstance.py | |
| parent | d9b3c91d47b246f2bafbe290c4988d0faf3a8cea (diff) | |
| download | freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.tar.gz freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.tar.xz freeipa-8d92ca851c6a0d3380ddbe13c3b442adab274f93.zip | |
Add make_entry factory method to LDAPConnection.
Replace all occurences of Entry instantiation with calls to make_entry.
Diffstat (limited to 'ipaserver/install/krbinstance.py')
| -rw-r--r-- | ipaserver/install/krbinstance.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index d783da0ab..43fe2b1fd 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -34,7 +34,6 @@ from ipalib import errors from ipapython.ipa_log_manager import * from ipapython.dn import DN -from ipaserver import ipaldap from ipaserver.install import replication from ipaserver.install import dsinstance @@ -110,7 +109,7 @@ class KrbInstance(service.Service): # Create a host entry for this master host_dn = DN(('fqdn', self.fqdn), ('cn', 'computers'), ('cn', 'accounts'), self.suffix) - host_entry = ipaldap.Entry(host_dn) + host_entry = self.admin_conn.make_entry(host_dn) host_entry.setValues('objectclass', ['top', 'ipaobject', 'nshost', 'ipahost', 'ipaservice', 'pkiuser', 'krbprincipalaux', 'krbprincipal', 'krbticketpolicyaux', 'ipasshhost']) host_entry.setValues('krbextradata', service_entry.getValues('krbextradata')) host_entry.setValue('krblastpwdchange', service_entry.getValue('krblastpwdchange')) @@ -265,7 +264,7 @@ class KrbInstance(service.Service): root_logger.critical("Error while enumerating SASL mappings %s" % str(e)) raise e - entry = ipaldap.Entry(DN(('cn', 'Full Principal'), ('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config'))) + entry = self.admin_conn.make_entry(DN(('cn', 'Full Principal'), ('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config'))) entry.setValues("objectclass", "top", "nsSaslMapping") entry.setValues("cn", "Full Principal") entry.setValues("nsSaslMapRegexString", '\(.*\)@\(.*\)') @@ -278,7 +277,7 @@ class KrbInstance(service.Service): root_logger.critical("failed to add Full Principal Sasl mapping") raise e - entry = ipaldap.Entry(DN(('cn', 'Name Only'), ('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config'))) + entry = self.admin_conn.make_entry(DN(('cn', 'Name Only'), ('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config'))) entry.setValues("objectclass", "top", "nsSaslMapping") entry.setValues("cn", "Name Only") entry.setValues("nsSaslMapRegexString", '^[^:@]+$') |