server-del: update defaultServerList in cn=default,ou=profile,$BASE #780
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
martbab
suggested changes
May 18, 2017
ipaserver/plugins/server.py
Outdated
| mod = [(ldap.MOD_REPLACE, 'defaultServerList', attr)] | ||
| conn.conn.modify_s(str(dn), mod) | ||
| ret['defaultServerList'] = attr | ||
| conn.update_entry(ret) | ||
| except (errors.NotFound, ldap.NO_SUCH_ATTRIBUTE, | ||
| ldap.TYPE_OR_VALUE_EXISTS): |
There was a problem hiding this comment.
since you now call update_entry instead of raw modify_s, you can replace ldap.NO_SUCH_ATTRIBUTE and ldap.TYPE_OR_VALUE_EXISTS exceptions with errors.MidairCollision and errors.EmptyModlist (see error_handler method of LDAPClient in ipapython/ipaldap.py for more info about raw ldap -> ipalib.errors mapping)
ipa server-del should remove the server from the entry
cn=default,ou=profile,$BASE
The entry contains an attribute
defaultServerList: srv1.domain.com srv2.domain.com srv3.domain.com
The code calls srvlist = ret.single_value.get('defaultServerList') which means
that srvlist contains a single value (string) containing all the servers
separated by a space, and not a list of attribute values. Because of that,
srvlist[0] corresponds to the first character of the value.
The fix splits srvlist and not srvlist[0].
https://pagure.io/freeipa/issue/6943
|
Hi @martbab, |
martbab
approved these changes
May 19, 2017
martbab
added
ack
|
master:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ipa server-del should remove the server from the entry
cn=default,ou=profile,$BASE
The entry contains an attribute
defaultServerList: srv1.domain.com srv2.domain.com srv3.domain.com
The code calls srvlist = ret.single_value.get('defaultServerList') which means
that srvlist contains a single value (string) containing all the servers
separated by a space, and not a list of attribute values. Because of that,
srvlist[0] corresponds to the first character of the value.
The fix splits srvlist and not srvlist[0].
https://pagure.io/freeipa/issue/6943