Hello,

This patch addresses ticket https://fedorahosted.org/freeipa/ticket/3771.

-- 
Regards,

Ana Krivokapic
Associate Software Engineer
FreeIPA team
Red Hat Inc.

From 65c900d790adfabdd045069b3be0bd1c87306af9 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akriv...@redhat.com>
Date: Thu, 18 Jul 2013 19:51:22 +0200
Subject: [PATCH] Use admin@REALM when testing if SSSD is ready

https://fedorahosted.org/freeipa/ticket/3771
---
 ipa-client/ipa-install/ipa-client-automount | 8 +++++---
 ipa-client/ipa-install/ipa-client-install   | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
index 3952642b45aa09d2185a062adeecea72bf5237ab..346b474fef12ad814eedae5cc98380709eac38ff 100755
--- a/ipa-client/ipa-install/ipa-client-automount
+++ b/ipa-client/ipa-install/ipa-client-automount
@@ -77,7 +77,7 @@ def wait_for_sssd():
     time.sleep(1)
     while n < 10 and not found:
         try:
-            ipautil.run(["getent", "passwd", "admin"])
+            ipautil.run(["getent", "passwd", "admin@%s" % api.env.realm])
             found = True
         except Exception, e:
             time.sleep(1)
@@ -85,8 +85,10 @@ def wait_for_sssd():
 
     # This should never happen but if it does, may as well warn the user
     if not found:
-        root_logger.debug("Unable to find 'admin' user with 'getent passwd admin'!")
-        print "Unable to find 'admin' user with 'getent passwd admin'!"
+        err_msg = ("Unable to find 'admin' user with "
+                   "'getent passwd admin@%s'!" % api.env.realm)
+        root_logger.debug(err_msg)
+        print err_msg
         print "This may mean that sssd didn't re-start properly after the configuration changes."
 
 def configure_xml(fstore):
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 867307aa570b4e8e90a1a8182f1481f0d11a9840..0fb621456f74f0198461e2f4e41d9fccc1b4999f 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -2474,7 +2474,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"])
+                    ipautil.run(["getent", "passwd", "admin@%s" % cli_realm])
                     found = True
                 except Exception, e:
                     time.sleep(1)
@@ -2482,7 +2482,8 @@ def install(options, env, fstore, statestore):
 
             if not found:
                 root_logger.error(
-                    "Unable to find 'admin' user with 'getent passwd admin'!")
+                    "Unable to find 'admin' user with "
+                    "'getent passwd admin@%s'!" % cli_realm)
                 if conf:
                     root_logger.info("Recognized configuration: %s", conf)
                 else:
-- 
1.8.1.4

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to