|
 |
7cfd7e7 |
From 373f2e03736dfd87d50f02208b99d462cf34d891 Mon Sep 17 00:00:00 2001
|
|
|
7cfd7e7 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
7cfd7e7 |
Date: Thu, 27 Sep 2018 13:04:47 +0200
|
|
|
7cfd7e7 |
Subject: [PATCH] IPA: do not call sssd-enable-logins
|
|
|
7cfd7e7 |
|
|
|
7cfd7e7 |
It is expected that ipa-client-install will do all PAM and NSS
|
|
|
7cfd7e7 |
configuration. To avoid changing IPA default realmd will not try to
|
|
|
7cfd7e7 |
update the related configuration.
|
|
|
7cfd7e7 |
---
|
|
|
7cfd7e7 |
service/realm-sssd-ipa.c | 24 +-----------------------
|
|
|
7cfd7e7 |
1 file changed, 1 insertion(+), 23 deletions(-)
|
|
|
7cfd7e7 |
|
|
|
7cfd7e7 |
diff --git a/service/realm-sssd-ipa.c b/service/realm-sssd-ipa.c
|
|
|
7cfd7e7 |
index 5029f6b..70f8b0e 100644
|
|
|
7cfd7e7 |
--- a/service/realm-sssd-ipa.c
|
|
|
7cfd7e7 |
+++ b/service/realm-sssd-ipa.c
|
|
|
7cfd7e7 |
@@ -109,41 +109,19 @@ enroll_closure_free (gpointer data)
|
|
|
7cfd7e7 |
g_free (enroll);
|
|
|
7cfd7e7 |
}
|
|
|
7cfd7e7 |
|
|
|
7cfd7e7 |
-static void
|
|
|
7cfd7e7 |
-on_enable_nss_done (GObject *source,
|
|
|
7cfd7e7 |
- GAsyncResult *result,
|
|
|
7cfd7e7 |
- gpointer user_data)
|
|
|
7cfd7e7 |
-{
|
|
|
7cfd7e7 |
- GTask *task = G_TASK (user_data);
|
|
|
7cfd7e7 |
- GError *error = NULL;
|
|
|
7cfd7e7 |
- gint status;
|
|
|
7cfd7e7 |
-
|
|
|
7cfd7e7 |
- status = realm_command_run_finish (result, NULL, &error);
|
|
|
7cfd7e7 |
- if (error == NULL && status != 0)
|
|
|
7cfd7e7 |
- g_set_error (&error, REALM_ERROR, REALM_ERROR_INTERNAL,
|
|
|
7cfd7e7 |
- _("Enabling SSSD in nsswitch.conf and PAM failed."));
|
|
|
7cfd7e7 |
- if (error != NULL)
|
|
|
7cfd7e7 |
- g_task_return_error (task, error);
|
|
|
7cfd7e7 |
- else
|
|
|
7cfd7e7 |
- g_task_return_boolean (task, TRUE);
|
|
|
7cfd7e7 |
- g_object_unref (task);
|
|
|
7cfd7e7 |
-}
|
|
|
7cfd7e7 |
-
|
|
|
7cfd7e7 |
static void
|
|
|
7cfd7e7 |
on_restart_done (GObject *source,
|
|
|
7cfd7e7 |
GAsyncResult *result,
|
|
|
7cfd7e7 |
gpointer user_data)
|
|
|
7cfd7e7 |
{
|
|
|
7cfd7e7 |
GTask *task = G_TASK (user_data);
|
|
|
7cfd7e7 |
- EnrollClosure *enroll = g_task_get_task_data (task);
|
|
|
7cfd7e7 |
RealmSssd *sssd = g_task_get_source_object (task);
|
|
|
7cfd7e7 |
GError *error = NULL;
|
|
|
7cfd7e7 |
|
|
|
7cfd7e7 |
realm_service_enable_and_restart_finish (result, &error);
|
|
|
7cfd7e7 |
if (error == NULL) {
|
|
|
7cfd7e7 |
realm_sssd_update_properties (sssd);
|
|
|
7cfd7e7 |
- realm_command_run_known_async ("sssd-enable-logins", NULL, enroll->invocation,
|
|
|
7cfd7e7 |
- on_enable_nss_done, g_object_ref (task));
|
|
|
7cfd7e7 |
+ g_task_return_boolean (task, TRUE);
|
|
|
7cfd7e7 |
} else {
|
|
|
7cfd7e7 |
g_task_return_error (task, error);
|
|
|
7cfd7e7 |
}
|
|
|
7cfd7e7 |
--
|
|
|
7cfd7e7 |
2.17.1
|
|
|
7cfd7e7 |
|