summaryrefslogtreecommitdiff
path: root/databases/openldap
diff options
context:
space:
mode:
authormanu <manu>2009-03-16 21:08:44 +0000
committermanu <manu>2009-03-16 21:08:44 +0000
commit179621402ee21bbaafe3d9cb00b3f4f1a55b6f6d (patch)
treefbb3549ad6b042416c5f8f7ed87ff3fe0f97035f /databases/openldap
parent11b7cfb25ff4054d5e58eafc81dd0cab5bd97db2 (diff)
downloadpkgsrc-179621402ee21bbaafe3d9cb00b3f4f1a55b6f6d.tar.gz
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 (limited to 'databases/openldap')
-rw-r--r--databases/openldap/distinfo3
-rw-r--r--databases/openldap/patches/patch-dd20
2 files changed, 22 insertions, 1 deletions
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 82522902283..5f4395599d4 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -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-an) = f98c6457474247c092dd0a062e86560cc894ec4e
SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
SHA1 (patch-db) = 8cd3ae55446c25ece056c015b57b9df144c01a55
+SHA1 (patch-dd) = 906ece497065a9eef5991718ce1ba1299acc1b63
diff --git a/databases/openldap/patches/patch-dd b/databases/openldap/patches/patch-dd
new file mode 100644
index 00000000000..b414e4d057f
--- /dev/null
+++ b/databases/openldap/patches/patch-dd
@@ -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;