IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

trust: make sure ID range is created for the child domain even if it exists

Browse Source 
ID ranges for child domains of a forest trust were created incorrectly
in FreeIPA 4.4.0 due to refactoring of -- if the domain was already
existing, we never attempted to create the ID range for it.

At the same time, when domain was missing, we attempted to add ID range
and passed both forest root and the child domain names to add_range().
However, add_range() only looks at the first positional argument which
was the forest root name. That ID range always exists (it is created
before child domains are processed).

Modify the code to make sure child domain name is passed as the first
positional argument. In addition, the oddjob helper should explicitly
set context='server' so that idrange code will be able to see and use
ipaserver/dcerpc.py helpers.

Resolves: https://fedorahosted.org/freeipa/ticket/5738
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Alexander Bokovoy 2016-08-06 11:12:13 +03:00 committed by Martin Babinsky
parent 9b3819ea94
commit 62be554540
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/oddjob/com.redhat.idm.trust-fetch-domains
View File

@ -76,7 +76,7 @@ env._bootstrap(debug=options.debug, log=None)
env._finalize_core(**dict(DEFAULT_CONFIG))
# Initialize the API with the proper debug level
api.bootstrap(in_server=True, debug=env.debug, log=None)
api.bootstrap(in_server=True, debug=env.debug, log=None, context='server')
api.finalize()
# Only import trust plugin after api is initialized or internal imports

10
ipaserver/plugins/trust.py
View File

@ -1690,15 +1690,19 @@ def add_new_domains_from_trust(myapi, trustinstance, trust_entry, domains, **opt
if 'raw' in options:
dom['raw'] = options['raw']
res = myapi.Command.trustdomain_add(trust_name, name, **dom)
result.append(res['result'])
try:
res = myapi.Command.trustdomain_add(trust_name, name, **dom)
result.append(res['result'])
except errors.DuplicateEntry:
# Ignore updating duplicate entries
pass
if idrange_type != u'ipa-ad-trust-posix':
range_name = name.upper() + '_id_range'
dom['range_type'] = u'ipa-ad-trust'
add_range(myapi, trustinstance,
range_name, dom['ipanttrusteddomainsid'],
trust_name, name, **dom)
name, **dom)
except errors.DuplicateEntry:
# Ignore updating duplicate entries
pass