Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2018-06-25 11:36:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2" Mon Jun 25 11:36:09 2018 rev:135 rq:618830 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes 2018-05-25 21:37:23.555798964 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2.changes 2018-06-25 11:36:12.043211941 +0200 @@ -1,0 +2,7 @@ +Wed Jun 20 10:04:06 UTC 2018 - [email protected] + +- Added a patch to let slapd return the uniqueness check filter + used before constraint violation to the client + 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch + +------------------------------------------------------------------- New: ---- 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.b8z1OM/_old 2018-06-25 11:36:13.019175919 +0200 +++ /var/tmp/diff_new_pack.b8z1OM/_new 2018-06-25 11:36:13.027175623 +0200 @@ -56,6 +56,7 @@ Source15: SuSEfirewall2.openldap Source16: sysconfig.openldap Source17: openldap_update_modules_path.sh +Patch1: 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch Patch3: 0003-LDAPI-socket-location.dif Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif @@ -253,6 +254,7 @@ # Unpack and patch OpenLDAP 2.4 %setup -q -a 9 -n openldap-%{version_main} +%patch1 -p1 %patch3 -p1 %patch5 -p1 %patch6 -p1 ++++++ 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch ++++++ >From 41458072b9aae81ebd7a45837c6ce376709fe907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= <[email protected]> Date: Wed, 20 Jun 2018 14:05:52 +0200 Subject: [PATCH] ITS#8866 slapo-unique to return filter used in diagnostic message --- servers/slapd/overlays/unique.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c index 9e8d3e3a5..41c698f47 100644 --- a/servers/slapd/overlays/unique.c +++ b/servers/slapd/overlays/unique.c @@ -965,6 +965,8 @@ unique_search( slap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX */ unique_counter uq = { NULL, 0 }; int rc; + char *errmsg; + int errmsgsize; Debug(LDAP_DEBUG_TRACE, "==> unique_search %s\n", key->bv_val, 0, 0); @@ -1009,9 +1011,12 @@ unique_search( Debug(LDAP_DEBUG_TRACE, "=> unique_search found %d records\n", uq.count, 0, 0); if(uq.count) { + errmsgsize = sizeof("non-unique attributes found with ") + key->bv_len; + errmsg = ch_malloc(errmsgsize); + snprintf( errmsg, errmsgsize, "non-unique attributes found with %s", key->bv_val ); op->o_bd->bd_info = (BackendInfo *) on->on_info; - send_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION, - "some attributes not unique"); + send_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION, errmsg); + ch_free(errmsg); return(rs->sr_err); } -- 2.17.1
