diff options
author | Tomas Babej <tbabej@redhat.com> | 2013-09-18 13:18:37 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2013-09-20 09:56:39 +0200 |
commit | b0b7335cbaf104ba582c12b49e908c280d332cf6 (patch) | |
tree | 27fee85764467c3ad5bfdf451b27b155831ead4c | |
parent | ac5447f57953dd022f63f9f801c5628df3e4b832 (diff) | |
download | freeipa.git-b0b7335cbaf104ba582c12b49e908c280d332cf6.tar.gz freeipa.git-b0b7335cbaf104ba582c12b49e908c280d332cf6.tar.xz freeipa.git-b0b7335cbaf104ba582c12b49e908c280d332cf6.zip |
Use getent admin@domain for nss check in ipa-client-install
Use 'getent admin@domain' rather than 'getent admin@REALM' to check if nss
is working properly since admin@REALM check fails in case the domain and the realm
name does not match.
https://fedorahosted.org/freeipa/ticket/3906
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 280edd79..325b532a 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -2476,7 +2476,7 @@ def install(options, env, fstore, statestore): # Particulary, SSSD might take longer than 6-8 seconds. while n < 10 and not found: try: - ipautil.run(["getent", "passwd", "admin@%s" % cli_realm]) + ipautil.run(["getent", "passwd", "admin@%s" % cli_domain]) found = True except Exception, e: time.sleep(1) @@ -2485,7 +2485,7 @@ def install(options, env, fstore, statestore): if not found: root_logger.error( "Unable to find 'admin' user with " - "'getent passwd admin@%s'!" % cli_realm) + "'getent passwd admin@%s'!" % cli_domain) if conf: root_logger.info("Recognized configuration: %s", conf) else: |