IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

trusts: pass AD DC hostname if specified explicitly

Browse Source 
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1222047

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Alexander Bokovoy 2015-05-28 11:49:58 +00:00 committed by Tomas Babej
parent 03c2d76186
commit 47e1de7604
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
API.txt
View File

@ -5000,10 +5000,11 @@ output: Output('result', <type 'dict'>, None)
output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None) output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
output: ListOfPrimaryKeys('value', None, None) output: ListOfPrimaryKeys('value', None, None)
command: trust_fetch_domains command: trust_fetch_domains
args: 1,4,4 args: 1,5,4
arg: Str('cn', attribute=True, cli_name='realm', multivalue=False, primary_key=True, query=True, required=True) arg: Str('cn', attribute=True, cli_name='realm', multivalue=False, primary_key=True, query=True, required=True)
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui') option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui') option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
option: Str('realm_server?', cli_name='server')
option: Flag('rights', autofill=True, default=False) option: Flag('rights', autofill=True, default=False)
option: Str('version?', exclude='webui') option: Str('version?', exclude='webui')
output: Output('count', <type 'int'>, None) output: Output('count', <type 'int'>, None)

4
VERSION
View File

@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000
# # # #
######################################################## ########################################################
IPA_API_VERSION_MAJOR=2 IPA_API_VERSION_MAJOR=2
IPA_API_VERSION_MINOR=142 IPA_API_VERSION_MINOR=143
# Last change: mbabinsk: Add option to skip client API version check # Last change: ab - trusts: pass AD DC hostname if specified explicitly

9
ipalib/plugins/trust.py
View File

@ -1302,9 +1302,10 @@ def fetch_domains_from_trust(self, trustinstance, trust_entry, **options):
sp.insert(0, trustinstance.remote_domain.info['name']) sp.insert(0, trustinstance.remote_domain.info['name'])
creds = u"{name}%{password}".format(name="\\".join(sp), creds = u"{name}%{password}".format(name="\\".join(sp),
password=password) password=password)
server = options.get('realm_server', None)
domains = ipaserver.dcerpc.fetch_domains(self.api, domains = ipaserver.dcerpc.fetch_domains(self.api,
trustinstance.local_flatname, trustinstance.local_flatname,
trust_name, creds=creds) trust_name, creds=creds, server=server)
result = [] result = []
if not domains: if not domains:
return result return result
@ -1342,6 +1343,12 @@ class trust_fetch_domains(LDAPRetrieve):
__doc__ = _('Refresh list of the domains associated with the trust') __doc__ = _('Refresh list of the domains associated with the trust')
has_output = output.standard_list_of_entries has_output = output.standard_list_of_entries
takes_options = LDAPRetrieve.takes_options + (
Str('realm_server?',
cli_name='server',
label=_('Domain controller for the Active Directory domain (optional)'),
),
)
def execute(self, *keys, **options): def execute(self, *keys, **options):
if not _bindings_installed: if not _bindings_installed:

6
ipaserver/dcerpc.py
View File

@ -1048,7 +1048,7 @@ class TrustDomainInstance(object):
return False return False
def fetch_domains(api, mydomain, trustdomain, creds=None): def fetch_domains(api, mydomain, trustdomain, creds=None, server=None):
trust_flags = dict( trust_flags = dict(
NETR_TRUST_FLAG_IN_FOREST = 0x00000001, NETR_TRUST_FLAG_IN_FOREST = 0x00000001,
NETR_TRUST_FLAG_OUTBOUND = 0x00000002, NETR_TRUST_FLAG_OUTBOUND = 0x00000002,
@ -1089,6 +1089,10 @@ def fetch_domains(api, mydomain, trustdomain, creds=None):
cr.set_workstation(domain_validator.flatname) cr.set_workstation(domain_validator.flatname)
netrc = net.Net(creds=cr, lp=td.parm) netrc = net.Net(creds=cr, lp=td.parm)
try: try:
if server:
result = netrc.finddc(address=server,
flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS)
else:
result = netrc.finddc(domain=trustdomain, result = netrc.finddc(domain=trustdomain,
flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS) flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS)
except RuntimeError, e: except RuntimeError, e: