From 21574b261cf0d346da48e34c0a5383736ca8798b Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 21 May 2021 14:56:32 +0200 Subject: [PATCH] Fix ipa-server-upgrade Signed-off-by: Christian Heimes Reviewed-By: Francois Cami Reviewed-By: Rob Crittenden Reviewed-By: Francois Cami Reviewed-By: Rob Crittenden --- install/share/bootstrap-template.ldif | 2 +- install/updates/73-subid.update | 2 +- ipaserver/install/ldapupdate.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install/share/bootstrap-template.ldif b/install/share/bootstrap-template.ldif index 16f2ef822eaf56dd68d4140b22a607539645b151..325eb8450c786899e7b5e4ae2ef8978f42a8425b 100644 --- a/install/share/bootstrap-template.ldif +++ b/install/share/bootstrap-template.ldif @@ -491,7 +491,7 @@ cn: ${REALM}_subid_range ipaBaseID: eval($SUBID_RANGE_START) ipaIDRangeSize: eval($SUBID_RANGE_SIZE) # HACK: RIDs to work around adtrust sidgen issue -ipaBaseRID: eval($SUBID_RANGE_START - $IDRANGE_SIZE) +ipaBaseRID: eval($SUBID_BASE_RID) # 738065-838566 = IPA-SUB ipaNTTrustedDomainSID: S-1-5-21-738065-838566-$DOMAIN_HASH # HACK: "ipa-local-subid" range type causes issues with older SSSD clients diff --git a/install/updates/73-subid.update b/install/updates/73-subid.update index e10703aa3f9528751233ddebe00b8c8c8fc5ed3f..890eb7f1f6f261af977f26b3457e765ee8e9791f 100644 --- a/install/updates/73-subid.update +++ b/install/updates/73-subid.update @@ -102,7 +102,7 @@ default: cn: ${REALM}_subid_range default: ipaBaseID: $SUBID_RANGE_START default: ipaIDRangeSize: $SUBID_RANGE_SIZE # HACK: RIDs to work around adtrust sidgen issue -default: ipaBaseRID: eval($SUBID_RANGE_START - $IDRANGE_SIZE) +default: ipaBaseRID: eval($SUBID_BASE_RID) default: ipaNTTrustedDomainSID: S-1-5-21-738065-838566-$DOMAIN_HASH # HACK: "ipa-local-subid" range type causes issues with older SSSD clients # see https://github.com/SSSD/sssd/issues/5571 diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index d0516dc3028366df5d03a960866abe72601aa4b6..06cb78e0b7dc2c82f0339c43228045d93b922288 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -59,8 +59,10 @@ def get_sub_dict(realm, domain, suffix, fqdn, idstart=None, idmax=None): """ if idstart is None: idrange_size = None + subid_base_rid = None else: idrange_size = idmax - idstart + 1 + subid_base_rid = constants.SUBID_RANGE_START - idrange_size return dict( REALM=realm, @@ -81,6 +83,7 @@ def get_sub_dict(realm, domain, suffix, fqdn, idstart=None, idmax=None): SUBID_RANGE_SIZE=constants.SUBID_RANGE_SIZE, SUBID_RANGE_MAX=constants.SUBID_RANGE_MAX, SUBID_DNA_THRESHOLD=constants.SUBID_DNA_THRESHOLD, + SUBID_BASE_RID=subid_base_rid, DOMAIN_HASH=murmurhash3(domain, len(domain), 0xdeadbeef), MAX_DOMAIN_LEVEL=constants.MAX_DOMAIN_LEVEL, MIN_DOMAIN_LEVEL=constants.MIN_DOMAIN_LEVEL, -- 2.26.3