diff options
author | Martin Kosek <mkosek@redhat.com> | 2012-09-27 12:40:55 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-10-02 13:39:23 +0200 |
commit | c398d0b731344ca0106b169a3ea58e3b4c9fc711 (patch) | |
tree | 1d066cb4a824892113f31c51d9c4b8b518938f0e /ipapython | |
parent | e28d45dea57305ee5001becd5cee79027c08eb0a (diff) | |
download | freeipa.git-c398d0b731344ca0106b169a3ea58e3b4c9fc711.tar.gz freeipa.git-c398d0b731344ca0106b169a3ea58e3b4c9fc711.tar.xz freeipa.git-c398d0b731344ca0106b169a3ea58e3b4c9fc711.zip |
Improve DN usage in ipa-client-install
A hotfix pushed in a scope of ticket 3088 forced conversion of DN
object (baseDN) in IPA client discovery so that ipa-client-install
does not crash when creating an IPA default.conf. Since this is not
a preferred way to handle DN objects, improve its usage:
- make sure, that baseDN retrieved by client discovery is always
a DN object
- update ipachangeconf.py code to handle strings better and instead
of concatenating objects, make sure they are converted to string
first
As a side-effect of ipachangeconf changes, default.conf config file
generated by ipa-client-install has no longer empty new line at the
end of a file.
Whole ipachangeconf.py has been modified to be compliant with PEP8.
https://fedorahosted.org/freeipa/ticket/3088
Diffstat (limited to 'ipapython')
-rw-r--r-- | ipapython/ipautil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index d6e97b89..11433b4b 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -831,7 +831,7 @@ def get_ipa_basedn(conn): % (info, IPA_BASEDN_INFO)) continue root_logger.debug("Naming context '%s' is a valid IPA context" % context) - return context + return DN(context) return None |