IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

server plugin: pass bytes to ldap.modify_s

Browse Source 
The server-del command passes str instance instead of bytes to
ldap.modify_s which results in the target server not being
removed properly.

https://pagure.io/freeipa/issue/4985

Reviewed-By: Felipe Volpone <fbarreto@redhat.com>
This commit is contained in:
Stanislav Laznicka
2017-08-02 09:47:47 +02:00
committed by Pavel Vomacka
parent 76904ba84d
commit d147948fcc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/plugins/server.py
View File

@@ -558,19 +558,19 @@ class server_del(LDAPDelete):
conn = self.Backend.ldap2 conn = self.Backend.ldap2
env = self.api.env env = self.api.env
master_principal = "{}@{}".format(master, env.realm) master_principal = "{}@{}".format(master, env.realm).encode('utf-8')
# remove replica memberPrincipal from s4u2proxy configuration # remove replica memberPrincipal from s4u2proxy configuration
s4u2proxy_subtree = DN(env.container_s4u2proxy, s4u2proxy_subtree = DN(env.container_s4u2proxy,
env.basedn) env.basedn)
dn1 = DN(('cn', 'ipa-http-delegation'), s4u2proxy_subtree) dn1 = DN(('cn', 'ipa-http-delegation'), s4u2proxy_subtree)
member_principal1 = "HTTP/{}".format(master_principal) member_principal1 = b"HTTP/%s" % master_principal
dn2 = DN(('cn', 'ipa-ldap-delegation-targets'), s4u2proxy_subtree) dn2 = DN(('cn', 'ipa-ldap-delegation-targets'), s4u2proxy_subtree)
member_principal2 = "ldap/{}".format(master_principal) member_principal2 = b"ldap/%s" % master_principal
dn3 = DN(('cn', 'ipa-cifs-delegation-targets'), s4u2proxy_subtree) dn3 = DN(('cn', 'ipa-cifs-delegation-targets'), s4u2proxy_subtree)
member_principal3 = "cifs/{}".format(master_principal) member_principal3 = b"cifs/%s" % master_principal
for (dn, member_principal) in ((dn1, member_principal1), for (dn, member_principal) in ((dn1, member_principal1),
(dn2, member_principal2), (dn2, member_principal2),