diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2011-07-01 12:15:12 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <abokovoy@redhat.com> | 2011-07-01 12:30:35 +0300 |
| commit | 8abb95575390a6784159afcb163bdef8589f470b (patch) | |
| tree | ef922b914704860b99ebb0723916d004971b88fe /ipa-client | |
| parent | c746abd63ac544273a2ddec44a3845e4eb880e62 (diff) | |
| download | freeipa-8abb95575390a6784159afcb163bdef8589f470b.tar.gz freeipa-8abb95575390a6784159afcb163bdef8589f470b.tar.xz freeipa-8abb95575390a6784159afcb163bdef8589f470b.zip | |
Make error reporting more 'local' for various configurations of nss_ldap packages
https://fedorahosted.org/freeipa/ticket/1369
When nss_ldap-based configuration does not work, report proper package name instead of always assuming nss_ldap.
At least, in RHEL6 and Fedora appropriate package is called nss-pam-ldapd while in older releases and other
distributions it might be called differently.
The change makes less confusing error reporting. It also introduces common utility function package_installed_name()
which provides an interface to query package manager for existence of mutually exclusive packages which is
helpful to distinguish between different configuration paths.
Diffstat (limited to 'ipa-client')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 884dd213b..d3218d375 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -974,7 +974,8 @@ def main(): n = n + 1 if not found: - print "nss_ldap is not able to use DNS discovery!" + package = package_installed_name(["nss-pam-ldapd","nss_ldap"]) + print "Unable to use DNS discovery! Recognized configuration: %s" % (package) print "Changing configuration to use hardcoded server name: " +cli_server try: |