Re: slapd memory fault

To: Sarton O'Brien <bsd-xen%roguewrt.org@localhost>
Subject: Re: slapd memory fault
From: Geert Hendrickx <ghen%telenet.be@localhost>
Date: Wed, 18 Feb 2009 10:35:47 +0100

On Wed, Feb 18, 2009 at 12:55:40PM +1100, Sarton O'Brien wrote:
> Out of curiosity, will db47 ever be used or is it likely that db46 will  
> remain for the 'foreseeable' future?

Recent (as of 2.4.12) OpenLDAP releases should work with db47.  Some people
already use it with db47, and there have been no problem reports[1].

Could you please try the attached patch (update to 2.4.14 and enable db47)
and let me know whether it works for you?

        Geert

[1] http://mail-index.netbsd.org/pkgsrc-users/2009/02/03/msg009224.html

-- 
Geert Hendrickx  -=-  ghen%telenet.be@localhost  -=-  PGP: 0xC4BB9E9F
This e-mail was composed using 100% recycled spam messages!

Index: databases/openldap/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/Makefile.common,v
retrieving revision 1.19
diff -u -r1.19 Makefile.common
--- databases/openldap/Makefile.common  24 Jan 2009 22:11:19 -0000      1.19
+++ databases/openldap/Makefile.common  18 Feb 2009 09:34:40 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.19 2009/01/24 22:11:19 manu Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=              openldap-2.4.13
+DISTNAME=              openldap-2.4.14
 CATEGORIES=            databases
 MASTER_SITES=          ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=         
http://www.openldap.org/software/download/OpenLDAP/openldap-release/
Index: databases/openldap/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/distinfo,v
retrieving revision 1.69
diff -u -r1.69 distinfo
--- databases/openldap/distinfo 31 Jan 2009 18:25:57 -0000      1.69
+++ databases/openldap/distinfo 18 Feb 2009 09:34:40 -0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.69 2009/01/31 18:25:57 manu Exp $
+$NetBSD$
 
-SHA1 (openldap-2.4.13.tgz) = bb6fe22808d36425b3bad6ce367e882530ccbf51
-RMD160 (openldap-2.4.13.tgz) = c459bb7912e70187bab298911252b6d14590bfd2
-Size (openldap-2.4.13.tgz) = 5040598 bytes
+SHA1 (openldap-2.4.14.tgz) = d762022958ae5697334e0f6ad52fc2bf02aaf1d4
+RMD160 (openldap-2.4.14.tgz) = 67019fa57d52e5a6d31b2ca4f99be9c06bcc761d
+Size (openldap-2.4.14.tgz) = 5087412 bytes
 SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
@@ -10,8 +10,7 @@
 SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
 SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47
 SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d
-SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
+SHA1 (patch-am) = bebddaee28a5d56feb1861b60e209411e8935581
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
-SHA1 (patch-db) = 2200cd44e8954ddd8c6bfdd5a0bc3c01831ba90e
Index: databases/openldap/patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/patches/patch-am,v
retrieving revision 1.5
diff -u -r1.5 patch-am
--- databases/openldap/patches/patch-am 15 May 2006 19:01:23 -0000      1.5
+++ databases/openldap/patches/patch-am 18 Feb 2009 09:34:40 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
+$NetBSD$
 
---- libraries/libldap/cyrus.c.orig     2006-05-13 11:47:50.000000000 +0200
+--- libraries/libldap/cyrus.c.orig     2009-02-08 07:06:04.000000000 +0100
 +++ libraries/libldap/cyrus.c
-@@ -884,7 +884,7 @@ ldap_int_sasl_external(
+@@ -713,7 +713,7 @@ ldap_int_sasl_external(
        LDAP *ld,
        LDAPConn *conn,
        const char * authid,
@@ -11,7 +11,7 @@
  {
        int sc;
        sasl_conn_t *ctx;
-@@ -1026,6 +1026,7 @@ int ldap_pvt_sasl_secprops(
+@@ -857,6 +857,7 @@ int ldap_pvt_sasl_secprops(
        char **props;
        unsigned sflags = 0;
        int got_sflags = 0;
@@ -19,7 +19,7 @@
        sasl_ssf_t max_ssf = 0;
        int got_max_ssf = 0;
        sasl_ssf_t min_ssf = 0;
-@@ -1056,9 +1057,9 @@ int ldap_pvt_sasl_secprops(
+@@ -887,9 +888,9 @@ int ldap_pvt_sasl_secprops(
                                if ( next == &props[i][sprops[j].key.bv_len] || 
next[0] != '\0' ) continue;
                                switch( sprops[j].ival ) {
                                case GOT_MINSSF:
@@ -31,7 +31,7 @@
                                case GOT_MAXBUF:
                                        maxbufsize = v; got_maxbufsize++; break;
                                }
-@@ -1155,7 +1156,7 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+@@ -993,7 +994,7 @@ ldap_int_sasl_get_option( LDAP *ld, int 
                                return -1;
                        }
  
@@ -40,7 +40,7 @@
                } break;
  
                case LDAP_OPT_X_SASL_SSF_EXTERNAL:
-@@ -1163,13 +1164,13 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+@@ -1001,13 +1002,13 @@ ldap_int_sasl_get_option( LDAP *ld, int 
                        return -1;
  
                case LDAP_OPT_X_SASL_SSF_MIN:
@@ -55,9 +55,9 @@
 -                      *(ber_len_t *)arg = 
ld->ld_options.ldo_sasl_secprops.maxbufsize;
 +                      *(ber_uint_t *)arg = 
ld->ld_options.ldo_sasl_secprops.maxbufsize;
                        break;
- 
-               case LDAP_OPT_X_SASL_SECPROPS:
-@@ -1215,7 +1216,7 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+               case LDAP_OPT_X_SASL_NOCANON:
+                       *(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, 
LDAP_BOOL_SASL_NOCANON );
+@@ -1062,7 +1063,7 @@ ldap_int_sasl_set_option( LDAP *ld, int 
  #else
                memset(&extprops, 0L, sizeof(extprops));
  
@@ -66,7 +66,7 @@
  
                sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
                        (void *) &extprops );
-@@ -1227,13 +1228,13 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+@@ -1074,13 +1075,13 @@ ldap_int_sasl_set_option( LDAP *ld, int 
                } break;
  
        case LDAP_OPT_X_SASL_SSF_MIN:
@@ -81,9 +81,9 @@
 -              ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
 +              ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_uint_t 
*)arg;
                break;
- 
-       case LDAP_OPT_X_SASL_SECPROPS: {
-@@ -1332,7 +1333,7 @@ ldap_int_sasl_external(
+       case LDAP_OPT_X_SASL_NOCANON:
+               if ( arg == LDAP_OPT_OFF ) {
+@@ -1186,7 +1187,7 @@ ldap_int_sasl_external(
        LDAP *ld,
        LDAPConn *conn,
        const char * authid,
Index: databases/openldap/patches/patch-db
===================================================================
RCS file: databases/openldap/patches/patch-db
diff -N databases/openldap/patches/patch-db
--- databases/openldap/patches/patch-db 31 Jan 2009 18:25:57 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-db,v 1.1 2009/01/31 18:25:57 manu Exp $
---- contrib/slapd-modules/nops/Makefile.orig   2009-01-31 17:21:12.000000000 
+0000
-+++ contrib/slapd-modules/nops/Makefile        2009-01-31 18:10:29.000000000 
+0000
-@@ -1,9 +1,15 @@
--CPPFLAGS+=-I../../../include -I../../../servers/slapd
-+CPPFLAGS+=-I../../../include -I../../../servers/slapd 
-+CPPFLAGS+=-DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
-+LIBS=-lldap_r -llber -lcrypto
- 
--all: nops.so
-+all: nops.la
- 
--nops.so: nops.c
--      $(CC) -shared $(CPPFLAGS) -Wall -o $@ $?
-+nops.lo:    nops.c
-+      $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $?
-+
-+nops.la:    nops.lo
-+      $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-+                 -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS)
- 
- clean:
--      rm nops.so
-+      rm nops.lo nops.la
Index: databases/openldap-doc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-doc/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- databases/openldap-doc/Makefile     24 Jan 2009 21:10:48 -0000      1.15
+++ databases/openldap-doc/Makefile     18 Feb 2009 09:34:40 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.15 2009/01/24 21:10:48 manu Exp $
 
-DISTNAME=              openldap-2.4.13
+DISTNAME=              openldap-2.4.14
 PKGNAME=               ${DISTNAME:S/-/-doc-/}
 CATEGORIES=            databases
 MASTER_SITES=          ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
Index: databases/openldap-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-server/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- databases/openldap-server/Makefile  31 Jan 2009 15:59:05 -0000      1.19
+++ databases/openldap-server/Makefile  18 Feb 2009 09:34:40 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.19 2009/01/31 15:59:05 manu Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=            1
 COMMENT=               Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=            openldap<2.3.23nb1
Index: databases/openldap-server/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-server/options.mk,v
retrieving revision 1.10
diff -u -r1.10 options.mk
--- databases/openldap-server/options.mk        31 Jan 2009 15:59:05 -0000      
1.10
+++ databases/openldap-server/options.mk        18 Feb 2009 09:34:40 -0000
@@ -16,9 +16,7 @@
 ###
 
 .if !empty(PKG_OPTIONS:Mbdb)
-# "slapd" locks up when used with Berkeley DB 4.7.x. We therefore use the
-# "db46" package with version 4.6.x of Berkeley DB.
-.  include "../../databases/db46/buildlink3.mk"
+.  include "../../databases/db4/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
 TEST_TARGET=           test
 .else

Follow-Ups:
- Re: slapd memory fault
  - From: Sarton O'Brien

References:
- slapd memory fault
  - From: Sarton O'Brien
- Re: slapd memory fault
  - From: matthew sporleder
- Re: slapd memory fault
  - From: Sarton O'Brien
- Re: slapd memory fault
  - From: matthew sporleder
- Re: slapd memory fault
  - From: Sarton O'Brien

Prev by Date: Re: Why is Desktop NetBSD a threat to NetBSD?
Next by Date: Re: problems using mouse
Previous by Thread: Re: slapd memory fault
Next by Thread: Re: slapd memory fault
Indexes:

Home | Main Index | Thread Index | Old Index