Attachment 8337 Details for Bug 42533 – patch

[patch] patch

42533.patch (text/plain), 1.57 KB, created by Florian Best on 2017-01-05 14:48:14 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-01-05 14:48:14 CET

Size: 1.57 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/uldap.py b/management/univention-directory-manager-modules/modules/univention/admin/uldap.py
>index 0eeb316..28526f7 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/uldap.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/uldap.py
>@@ -401,7 +401,7 @@ def search(self, filter='(objectClass=*)', base='', scope='sub', attr=[], unique
> 			raise univention.admin.uexceptions.insufficientInformation(_err2str(msg))
> 		except (ldap.TIMEOUT, ldap.TIMELIMIT_EXCEEDED) as msg:
> 			raise univention.admin.uexceptions.ldapTimeout(_err2str(msg))
>-		except ldap.SIZELIMIT_EXCEEDED as msg:
>+		except (ldap.SIZELIMIT_EXCEEDED, ldap.ADMINLIMIT_EXCEEDED) as msg:
> 			raise univention.admin.uexceptions.ldapSizelimitExceeded(_err2str(msg))
> 		except ldap.FILTER_ERROR as msg:
> 			raise univention.admin.uexceptions.ldapError('%s: %s' % (_err2str(msg), filter))
>@@ -417,7 +417,7 @@ def searchDn(self, filter='(objectClass=*)', base='', scope='sub', unique=False,
> 			raise univention.admin.uexceptions.insufficientInformation(_err2str(msg))
> 		except (ldap.TIMEOUT, ldap.TIMELIMIT_EXCEEDED) as msg:
> 			raise univention.admin.uexceptions.ldapTimeout(_err2str(msg))
>-		except ldap.SIZELIMIT_EXCEEDED as msg:
>+		except (ldap.SIZELIMIT_EXCEEDED, ldap.ADMINLIMIT_EXCEEDED) as msg:
> 			raise univention.admin.uexceptions.ldapSizelimitExceeded(_err2str(msg))
> 		except ldap.FILTER_ERROR as msg:
> 			raise univention.admin.uexceptions.ldapError('%s: %s' % (_err2str(msg), filter))

Actions: View | Diff

Attachments on bug 42533: 8337