|
 |
96eb28 |
From 7f698a050cea2baad34c84f8ae9e611dbf03ac7f Mon Sep 17 00:00:00 2001
|
|
|
96eb28 |
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
|
96eb28 |
Date: Thu, 12 Jul 2018 23:55:03 +0200
|
|
|
96eb28 |
Subject: [PATCH] deskprofile: don't bail if we fail to save one profile
|
|
|
96eb28 |
MIME-Version: 1.0
|
|
|
96eb28 |
Content-Type: text/plain; charset=UTF-8
|
|
|
96eb28 |
Content-Transfer-Encoding: 8bit
|
|
|
96eb28 |
|
|
|
96eb28 |
Due to different reasons (a bug on fleet-commander, for instance?) we
|
|
|
96eb28 |
may face the situation where one profile ends up stored in freeipa on a
|
|
|
96eb28 |
half-broken state (with no data, for instance).
|
|
|
96eb28 |
|
|
|
96eb28 |
In case it happens, we should try our best to save the not broken
|
|
|
96eb28 |
profiles and just skip the broken ones instead of bailing the whole
|
|
|
96eb28 |
operation.
|
|
|
96eb28 |
|
|
|
96eb28 |
Resolves:
|
|
|
96eb28 |
https://pagure.io/SSSD/sssd/issue/3773
|
|
|
96eb28 |
|
|
|
96eb28 |
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
96eb28 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
96eb28 |
(cherry picked from commit efd6702e5f70bb3df0f840dd3ce9f8f9264661ba)
|
|
|
96eb28 |
|
|
|
96eb28 |
DOWNSTREAM:
|
|
|
96eb28 |
Resolves: rhbz#1601360 - SSSD bails out saving desktop profiles in case an invalid profile is found [rhel-7.5.z]
|
|
|
96eb28 |
---
|
|
|
96eb28 |
src/providers/ipa/ipa_session.c | 2 +-
|
|
|
96eb28 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
96eb28 |
|
|
|
96eb28 |
diff --git a/src/providers/ipa/ipa_session.c b/src/providers/ipa/ipa_session.c
|
|
|
96eb28 |
index 3c7dd33c30ac6331319fc62cac466c4fbf04c0a5..a93c21224ee4d539d412e61ea06cbde3b928416a 100644
|
|
|
96eb28 |
--- a/src/providers/ipa/ipa_session.c
|
|
|
96eb28 |
+++ b/src/providers/ipa/ipa_session.c
|
|
|
96eb28 |
@@ -766,7 +766,7 @@ ipa_pam_session_handler_save_deskprofile_rules(
|
|
|
96eb28 |
DEBUG(SSSDBG_OP_FAILURE,
|
|
|
96eb28 |
"Failed to save a Desktop Profile Rule to disk [%d]: %s\n",
|
|
|
96eb28 |
ret, sss_strerror(ret));
|
|
|
96eb28 |
- goto done;
|
|
|
96eb28 |
+ continue;
|
|
|
96eb28 |
}
|
|
|
96eb28 |
}
|
|
|
96eb28 |
|
|
|
96eb28 |
--
|
|
|
96eb28 |
2.14.4
|
|
|
96eb28 |
|