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

Do not create trust if murmur hash is not available and base-id not given

Browse Source 
Fixes https://fedorahosted.org/freeipa/ticket/3018
This commit is contained in:
Sumit Bose 2012-09-05 15:46:05 +02:00 committed by Martin Kosek
parent fe083fd5bf
commit e23acda5b8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipalib/plugins/trust.py
View File

@ -163,6 +163,11 @@ class trust_add(LDAPCreate):
msg_summary = _('Added Active Directory trust for realm "%(value)s"') msg_summary = _('Added Active Directory trust for realm "%(value)s"')
def execute(self, *keys, **options): def execute(self, *keys, **options):
if not _murmur_installed and 'base_id' not in options:
raise errors.ValidationError(name=_('missing base_id'),
error=_('pysss_murmur is not available on the server ' \
'and no base-id is given.'))
if 'trust_type' in options: if 'trust_type' in options:
if options['trust_type'] == u'ad': if options['trust_type'] == u'ad':
result = self.execute_ad(*keys, **options) result = self.execute_ad(*keys, **options)
@ -200,12 +205,6 @@ class trust_add(LDAPCreate):
if 'base_id' in options: if 'base_id' in options:
base_id = options['base_id'] base_id = options['base_id']
else: else:
if not _murmur_installed:
raise errors.ValidationError(name=_('missing base_id'),
error=_('pysss_murmur is not available on the server ' \
'and no base_id is given, ' \
'ID range must be create manually'))
base_id = 200000 + (pysss_murmur.murmurhash3(dom_sid, len(dom_sid), 0xdeadbeef) % 10000) * 200000 base_id = 200000 + (pysss_murmur.murmurhash3(dom_sid, len(dom_sid), 0xdeadbeef) % 10000) * 200000
try: try: