diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/uldap.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/uldap.py index c7a333d..7e1eb5a 100644 --- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/uldap.py +++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/uldap.py @@ -79,10 +79,9 @@ def _err2str(err): msgs = [] for iarg in err.args: - if 'info' in iarg and 'desc' in iarg: - msgs.append('%(desc)s: %(info)s' % iarg) - elif 'desc' in iarg: - msgs.append(str(iarg['desc'])) + msg = ': '.join([str(m) for m in (iarg.get('desc'), iarg.get('info'), iarg.get('matched')) if m]) + if msg: + msgs.append(msg) return '. '.join(msgs) class domain: