diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 11:50:58 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | 61c0938c769f5ece202f04095138a5348f95aa18 (patch) | |
| tree | 6168745816d79a4e3b8cb652ff64cfc5dc0297f1 /install | |
| parent | 5b2e0e2ba5808d6300de1cac743c96db0607121c (diff) | |
| download | freeipa-61c0938c769f5ece202f04095138a5348f95aa18.tar.gz freeipa-61c0938c769f5ece202f04095138a5348f95aa18.tar.xz freeipa-61c0938c769f5ece202f04095138a5348f95aa18.zip | |
Remove support for DN normalization from LDAPClient.
Diffstat (limited to 'install')
| -rw-r--r-- | install/restart_scripts/renew_ca_cert | 4 | ||||
| -rw-r--r-- | install/restart_scripts/renew_ra_cert | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-compat-manage | 6 | ||||
| -rwxr-xr-x | install/tools/ipa-nis-manage | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert index b1efd8f9..5768db3f 100644 --- a/install/restart_scripts/renew_ca_cert +++ b/install/restart_scripts/renew_ca_cert @@ -70,11 +70,11 @@ try: try: (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate']) entry_attrs['usercertificate'] = cert - conn.update_entry(dn, entry_attrs, normalize=False) + conn.update_entry(dn, entry_attrs) except errors.NotFound: entry_attrs = dict(objectclass=['top', 'pkiuser', 'nscontainer'], usercertificate=cert) - conn.add_entry(dn, entry_attrs, normalize=False) + conn.add_entry(dn, entry_attrs) except errors.EmptyModlist: pass conn.disconnect() diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert index e5418fda..e541e4ba 100644 --- a/install/restart_scripts/renew_ra_cert +++ b/install/restart_scripts/renew_ra_cert @@ -60,11 +60,11 @@ while attempts < 10: try: (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate']) entry_attrs['usercertificate'] = dercert - conn.update_entry(dn, entry_attrs, normalize=False) + conn.update_entry(dn, entry_attrs) except errors.NotFound: entry_attrs = dict(objectclass=['top', 'pkiuser', 'nscontainer'], usercertificate=dercert) - conn.add_entry(dn, entry_attrs, normalize=False) + conn.add_entry(dn, entry_attrs) except errors.EmptyModlist: pass updated = True diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index e88d9228..87fa47fe 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -73,7 +73,7 @@ def get_entry(dn, conn): """ entry = None try: - (dn, entry) = conn.get_entry(dn, normalize=False) + (dn, entry) = conn.get_entry(dn) except errors.NotFound: pass return entry @@ -144,7 +144,7 @@ def main(): retval = 1 else: mod = {'nsslapd-pluginenabled': 'on'} - conn.update_entry(compat_dn, mod, normalize=False) + conn.update_entry(compat_dn, mod) except errors.ExecutionError, lde: print "An error occurred while talking to the server." print lde @@ -175,7 +175,7 @@ def main(): print "Disabling plugin" mod = {'nsslapd-pluginenabled': 'off'} - conn.update_entry(compat_dn, mod, normalize=False) + conn.update_entry(compat_dn, mod) except errors.DatabaseError, dbe: print "An error occurred while talking to the server." print dbe diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index 5ef3ce0e..a35e19f9 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -75,7 +75,7 @@ def get_entry(dn, conn): """ entry = None try: - (dn, entry) = conn.get_entry(dn, normalize=False) + (dn, entry) = conn.get_entry(dn) except errors.NotFound: pass return entry @@ -166,7 +166,7 @@ def main(): print "Enabling plugin" # Already configured, just enable the plugin mod = {'nsslapd-pluginenabled': 'on'} - conn.update_entry(nis_config_dn, mod, normalize=False) + conn.update_entry(nis_config_dn, mod) else: print "Plugin already Enabled" retval = 2 @@ -174,7 +174,7 @@ def main(): elif args[0] == "disable": try: mod = {'nsslapd-pluginenabled': 'off'} - conn.update_entry(nis_config_dn, mod, normalize=False) + conn.update_entry(nis_config_dn, mod) except errors.NotFound: print "Plugin is already disabled" retval = 2 |