From 1e0ec8abfdcd23a2a390c143e8d5c20c4ef640a6 Mon Sep 17 00:00:00 2001 Message-Id: <1e0ec8abfdcd23a2a390c143e8d5c20c4ef640a6.1426747042.git.hahn@univention.de> From: Philipp Hahn Date: Thu, 19 Mar 2015 07:35:22 +0100 Subject: [PATCH] Bug #35334 Listener: Fix entryDN assertion Organization: Univention GmbH, Bremen, Germany Add entryDN attribute to cache if it is missing instead of aborting the process. --- .../management/univention-directory-listener/debian/changelog | 6 ++++++ .../management/univention-directory-listener/src/cache_entry.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/debian/changelog b/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/debian/changelog index 62d2f7d..167b255 100644 --- a/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/debian/changelog +++ b/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/debian/changelog @@ -1,3 +1,9 @@ +univention-directory-listener (9.0.2-2) unstable; urgency=low + + * Bug #35334: Fix entryDN assertion + + -- Philipp Hahn Thu, 19 Mar 2015 07:35:02 +0100 + univention-directory-listener (9.0.2-1) unstable; urgency=medium * Do atomic locking on the cache (Bug #34013) diff --git a/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/src/cache_entry.c b/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/src/cache_entry.c index b3b64d7..db3ea2d 100644 --- a/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/src/cache_entry.c +++ b/branches/ucs-4.0/ucs-4.0-1/management/univention-directory-listener/src/cache_entry.c @@ -528,9 +528,9 @@ void cache_entry_set1(CacheEntry *entry, const char *key, const char *value) { attr->values[0] = strdup(value); assert(attr->values[0]); attr->length[0] = strlen(value) + 1; - break; + return; } - assert(i < entry->attribute_count); + cache_entry_add1(entry, key, value); } static CacheEntryAttribute *_cache_entry_find_attribute(CacheEntry *entry, LDAPAVA *ava) { -- 1.9.1