Fix NotFound exception in ipa-nis-manage.

The signature of ldap2.get_entry() changed so normalize wasn't being
handled properly so the basedn was always being appended causing our
entry in cn=config to be not found.

ticket 414
This commit is contained in:
Rob Crittenden committed 2010-11-09 13:33:04 -05:00
1 parent a3c4c7e891
commit fcf3cbbe8b
2 files changed
+5 -3

No files matched your search

+4 -2
View File
@@ -37,7 +37,7 @@ error was:
""" % sys.exc_value
sys.exit(1)
nis_config_dn = "cn=NIS Server, cn=plugins, cn=config"
nis_config_dn = "cn=NIS Server,cn=plugins,cn=config"
compat_dn = "cn=Schema Compatibility,cn=plugins,cn=config"
def parse_options():
@@ -115,6 +115,8 @@ def main():
conn.connect(
bind_dn='cn=directory manager', bind_pw=dirman_password
)
except errors.ACIError:
sys.exit("Incorrect password")
except errors.LDAPError, lde:
print "An error occurred while connecting to the server."
print lde
@@ -205,7 +207,7 @@ def main():
print "The %s service may need to be started." % servicemsg
finally:
if conn:
if conn and conn.isconnected():
conn.disconnect()
return retval
+1 -1
View File
@@ -702,7 +702,7 @@ class ldap2(CrudBackend, Encoder):
def _generate_modlist(self, dn, entry_attrs, normalize):
# get original entry
(dn, entry_attrs_old) = self.get_entry(dn, entry_attrs.keys(), normalize)
(dn, entry_attrs_old) = self.get_entry(dn, entry_attrs.keys(), normalize=normalize)
# get_entry returns a decoded entry, encode it back
# we could call search_s directly, but this saves a lot of code at
# the expense of a little bit of performace