[pkgsrc/trunk]: pkgsrc/databases/openldap bugfix in openldap-nops: if the cha...

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f8e975c82ed
branches:  trunk
changeset: 556098:4f8e975c82ed
user:      manu <manu%pkgsrc.org@localhost>
date:      Mon Mar 16 21:08:44 2009 +0000

description:
bugfix in openldap-nops: if the changeset gets void, prevent other overlays
to execute. This has been committed upstream and should go away with the
next release.

diffstat:

 databases/openldap/distinfo         |   3 ++-
 databases/openldap/patches/patch-dd |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r eaf5e0efbfd8 -r 4f8e975c82ed databases/openldap/distinfo
--- a/databases/openldap/distinfo       Mon Mar 16 21:06:46 2009 +0000
+++ b/databases/openldap/distinfo       Mon Mar 16 21:08:44 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2009/03/14 19:40:19 manu Exp $
+$NetBSD: distinfo,v 1.72 2009/03/16 21:08:44 manu Exp $
 
 SHA1 (openldap-2.4.15.tgz) = bbf78945284b61099e6229bce21a829f88e48034
 RMD160 (openldap-2.4.15.tgz) = 6a247b1ddacda8d4dbcd8a131805ef0d96673072
@@ -15,3 +15,4 @@
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
 SHA1 (patch-db) = 8cd3ae55446c25ece056c015b57b9df144c01a55
+SHA1 (patch-dd) = 906ece497065a9eef5991718ce1ba1299acc1b63
diff -r eaf5e0efbfd8 -r 4f8e975c82ed databases/openldap/patches/patch-dd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-dd       Mon Mar 16 21:08:44 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-dd,v 1.1 2009/03/16 21:08:44 manu Exp $
+--- contrib/slapd-modules/nops/nops.c.orig     2009-03-16 10:28:41.000000000 +0100
++++ contrib/slapd-modules/nops/nops.c  2009-03-16 10:28:11.000000000 +0100
+@@ -136,11 +136,15 @@
+               op->o_bd = be;
+       }
+ 
+       if ((m = op->orm_modlist) == NULL) {
++              slap_callback *cb = op->o_callback;
++
+               op->o_bd->bd_info = (BackendInfo *)(on->on_info);
++              op->o_callback = NULL;
+               send_ldap_error(op, rs, LDAP_SUCCESS, "");
+-              return(rs->sr_err);
++              op->o_callback = cb;
++
+               return (rs->sr_err);
+       }
+ 
+       return SLAP_CB_CONTINUE;