Imported Debian patch 4.0.5-6~numeezy

This commit is contained in:
Alexandre Ellert
2016-02-17 15:07:45 +01:00
committed by Mario Fetka
parent c44de33144
commit 10dfc9587b
1203 changed files with 53869 additions and 241462 deletions

View File

@@ -59,13 +59,13 @@ class range_tasks(UI_driver):
self.max_id = max_id
self.max_rid = max_rid
def get_domain(self):
def get_sid(self):
result = self.execute_api_from_ui('trust_find', [], {})
trusts = result['result']['result']
domain = None
sid = None
if trusts:
domain = trusts[0]['cn']
return domain
sid = trusts[0]['ipanttrusteddomainsid']
return sid
def get_data(self, pkey, size=50, add_data=None):
@@ -81,7 +81,7 @@ class range_tasks(UI_driver):
}
return data
def get_add_data(self, pkey, range_type='ipa-local', size=50, shift=100, domain=None):
def get_add_data(self, pkey, range_type='ipa-local', size=50, shift=100, sid=None):
base_id = self.max_id + shift
self.max_id = base_id + size
@@ -98,19 +98,19 @@ class range_tasks(UI_driver):
('callback', self.check_range_type_mod, range_type)
]
if not domain:
if not sid:
base_rid = self.max_rid + shift
self.max_rid = base_rid + size
add.append(('textbox', 'ipasecondarybaserid', str(base_rid)))
if domain:
add.append(('textbox', 'ipanttrusteddomainname', domain))
if sid:
add.append(('textbox', 'ipanttrusteddomainsid', sid))
return add
def check_range_type_mod(self, range_type):
if range_type == 'ipa-local':
self.assert_disabled("[name=ipanttrusteddomainname]")
self.assert_disabled("[name=ipanttrusteddomainsid]")
self.assert_disabled("[name=ipasecondarybaserid]", negative=True)
elif range_type == 'ipa-ad-trust':
self.assert_disabled("[name=ipanttrusteddomainname]", negative=True)
self.assert_disabled("[name=ipanttrusteddomainsid]", negative=True)
self.assert_disabled("[name=ipasecondarybaserid]")