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

Fix error messages and use proper ImportError for dcerpc import

Browse Source
This commit is contained in:
Alexander Bokovoy 2012-09-20 14:02:15 +03:00 committed by Martin Kosek
parent 87a37c8e2f
commit 9d84a3cf49
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipalib/plugins/group.py
View File

@ -26,7 +26,7 @@ if api.env.in_server and api.env.context in ['lite', 'server']:
try: try:
import ipaserver.dcerpc import ipaserver.dcerpc
_dcerpc_bindings_installed = True _dcerpc_bindings_installed = True
except Exception, e: except ImportError:
_dcerpc_bindings_installed = False _dcerpc_bindings_installed = False
__doc__ = _(""" __doc__ = _("""
@ -328,14 +328,13 @@ class group_add_member(LDAPAddMember):
result = (completed, dn) result = (completed, dn)
if 'ipaexternalmember' in options: if 'ipaexternalmember' in options:
if not _dcerpc_bindings_installed: if not _dcerpc_bindings_installed:
raise errors.NotFound(name=_('AD Trust'), raise errors.NotFound(reason=_('Cannot perform external member validation without '
reason=_('''Cannot perform external member validation without Samba 4 support installed. 'Samba 4 support installed. Make sure you have installed '
Make sure you have installed server-trust-ad sub-package of IPA on the server''')) 'server-trust-ad sub-package of IPA on the server'))
domain_validator = ipaserver.dcerpc.DomainValidator(self.api) domain_validator = ipaserver.dcerpc.DomainValidator(self.api)
if not domain_validator.is_configured(): if not domain_validator.is_configured():
raise errors.NotFound(name=_('AD Trust setup'), raise errors.NotFound(reason=_('Cannot perform join operation without own domain configured. '
reason=_('''Cannot perform join operation without own domain configured. 'Make sure you have run ipa-adtrust-install on the IPA server first'))
Make sure you have run ipa-adtrust-install on the IPA server first'''))
sids = [] sids = []
failed_sids = [] failed_sids = []
for sid in options['ipaexternalmember']: for sid in options['ipaexternalmember']: