9744eaabe1
- Resolves: RHEL-84481 Protect all IPA service principals - Resolves: RHEL-84277 [RFE] IDM support UIDs up to 4,294,967,293 - Resolves: RHEL-84276 Ipa client --raw --structured throws internal error - Resolves: RHEL-82707 Search size limit tooltip has Search time limit tooltip text - Resolves: RHEL-82089 IPU 9 -> 10: ipa-server breaks the in-place upgrade due to failed scriptlet - Resolves: RHEL-68800 ipa-migrate with LDIF file from backup of remote server, fails with error 'change collided with another change' - Resolves: RHEL-30658 ipa-cacert-manage install fails with CAs having the same subject DN (subject key mismatch info) Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From b8b91dfe71d7d049f5e55a8195cb37f87837bbce Mon Sep 17 00:00:00 2001
|
|
From: Alexander Bokovoy <abokovoy@redhat.com>
|
|
Date: Wed, 12 Mar 2025 21:52:56 +0200
|
|
Subject: [PATCH] update_dna_shared_config: do not fail when config is not
|
|
found
|
|
|
|
The helper function was supposed to return a DN or None.
|
|
|
|
Related: https://pagure.io/freeipa/issue/9757
|
|
|
|
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
---
|
|
ipaserver/install/plugins/update_dna_shared_config.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ipaserver/install/plugins/update_dna_shared_config.py b/ipaserver/install/plugins/update_dna_shared_config.py
|
|
index 955bee5dd830f0dcad3f0810e7e2f1a1c725a0aa..42ee86d8b547fa9d6fb4cced5e36d243ba8cd4ff 100644
|
|
--- a/ipaserver/install/plugins/update_dna_shared_config.py
|
|
+++ b/ipaserver/install/plugins/update_dna_shared_config.py
|
|
@@ -49,7 +49,7 @@ class update_dna_shared_config(Updater):
|
|
except errors.NotFound:
|
|
logger.error("Could not find DNA config entry: %s",
|
|
dna_config_base)
|
|
- return False, ()
|
|
+ return None
|
|
else:
|
|
logger.debug('Found DNA config %s', dna_config_base)
|
|
|
|
--
|
|
2.48.1
|
|
|