[Pkg-openldap-devel] r711 - in openldap/trunk-2.3/debian: . patches
Torsten Landschoff
torsten at costa.debian.org
Wed Aug 2 20:49:09 UTC 2006
Author: torsten
Date: 2006-08-02 20:49:09 +0000 (Wed, 02 Aug 2006)
New Revision: 711
Removed:
openldap/trunk-2.3/debian/patches/accesslog-purge-bug
openldap/trunk-2.3/debian/patches/auditlog-db-init
openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry
openldap/trunk-2.3/debian/patches/bv-replace-fix
openldap/trunk-2.3/debian/patches/exop-pass-change-does-not-reset-pwdMustChange
openldap/trunk-2.3/debian/patches/fix-boolean-logic
openldap/trunk-2.3/debian/patches/import-ldif-width-ppolicy-clear-text-fix
openldap/trunk-2.3/debian/patches/ldapsearch-to-bold
openldap/trunk-2.3/debian/patches/passwd-length-fix
openldap/trunk-2.3/debian/patches/slurpd-with-ldaps-does-not-work
openldap/trunk-2.3/debian/patches/syncrepl-dont-replicate-fix
openldap/trunk-2.3/debian/patches/syncrepl-fails-when-rootdn-not-defined
openldap/trunk-2.3/debian/patches/tls-concurrency-issues
Modified:
openldap/trunk-2.3/debian/changelog
openldap/trunk-2.3/debian/patches/series
openldap/trunk-2.3/debian/patches/use-lpthreads
openldap/trunk-2.3/debian/patches/wrong-database-location
Log:
Remove patches obsoleted by new upstream
Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/changelog 2006-08-02 20:49:09 UTC (rev 711)
@@ -2,20 +2,13 @@
* New upstream release:
- Accepts 'require none' in slapd.conf (closes: #370023).
- * Patches by Quanah Gibson-Mount <quanah at stanford.edu>
- - fix sometimes syncrepl DELs don't propagate (ITS#4589)
- - fix accesslog purge bug with cn=config (ITS#4595)
- - fix for having Ppolicy_hash_cleartext and ldapadd which imports hashes
- to unverifiable passwords. (ITS#4575)
- - fix for a bv replace
- - fix for password length
+ - Added patch to fix a bold issue in the manpage ldapsearch. Thanks to
+ Matt Kraai. (Closes: #355670)
* Added commented out rootdn parameter in slapd.conf. (Closes: #303245)
* Make the scripts output a bit more consistent.
* Fix a regression in the slapd packages. Data directory is /var/lib/ldap
and not /var/openldap-data, also adjust the manpages to reflect these
change. Thanks to Peter Marschall. (Closes: #368891)
- * Added patch to fix a bold issue in the manpage ldapsearch. Thanks to
- Matt Kraai. (Closes: #355670)
* Removed script move_files, dh_install is used instead. (Closes: #368896)
* Dutch translation already updated. Closes: #375101)
* Documented that slapd is compiled with TCP wrappers (Closes: #351428)
Deleted: openldap/trunk-2.3/debian/patches/accesslog-purge-bug
===================================================================
--- openldap/trunk-2.3/debian/patches/accesslog-purge-bug 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/accesslog-purge-bug 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,61 +0,0 @@
-Index: doc/man/man5/slapo-accesslog.5
-===================================================================
---- doc/man/man5/slapo-accesslog.5.orig
-+++ doc/man/man5/slapo-accesslog.5
-@@ -26,9 +26,10 @@
- .B logdb <suffix>
- Specify the suffix of a database to be used for storing the log records.
- The specified database must have already been configured in a prior section
--of the config file. The suffix entry of the log database will be created
--automatically by this overlay. The log entries will be generated as the
--immediate children of the suffix entry.
-+of the config file, and it must have a rootDN configured. The access controls
-+on the log database should prevent general write access. The suffix entry
-+of the log database will be created automatically by this overlay. The log
-+entries will be generated as the immediate children of the suffix entry.
- .TP
- .B logops <operations>
- Specify which types of operations to log. The valid operation types are
-Index: servers/slapd/overlays/accesslog.c
-===================================================================
---- servers/slapd/overlays/accesslog.c.orig
-+++ servers/slapd/overlays/accesslog.c
-@@ -601,6 +601,10 @@
- rc = mask_to_verbs( logops, li->li_ops, &c->rvalue_vals );
- break;
- case LOG_PURGE:
-+ if ( !li->li_age ) {
-+ rc = 1;
-+ break;
-+ }
- agebv.bv_val = agebuf;
- log_age_unparse( li->li_age, &agebv );
- agebv.bv_val[agebv.bv_len] = ' ';
-@@ -672,6 +676,13 @@
- Debug( LDAP_DEBUG_ANY, "%s: %s \"%s\"\n",
- c->log, c->msg, c->value_dn.bv_val );
- rc = 1;
-+ } else if ( BER_BVISEMPTY( &li->li_db->be_rootdn )) {
-+ snprintf( c->msg, sizeof( c->msg ),
-+ "<%s> no rootDN was configured for suffix",
-+ c->argv[0] );
-+ Debug( LDAP_DEBUG_ANY, "%s: %s \"%s\"\n",
-+ c->log, c->msg, c->value_dn.bv_val );
-+ rc = 1;
- }
- ch_free( c->value_dn.bv_val );
- ch_free( c->value_ndn.bv_val );
-@@ -683,11 +694,11 @@
- break;
- case LOG_PURGE:
- li->li_age = log_age_parse( c->argv[1] );
-- if ( li->li_age == -1 ) {
-+ if ( li->li_age < 1 ) {
- rc = 1;
- } else {
- li->li_cycle = log_age_parse( c->argv[2] );
-- if ( li->li_cycle == -1 ) {
-+ if ( li->li_cycle < 1 ) {
- rc = 1;
- } else if ( slapMode & SLAP_SERVER_MODE ) {
- struct re_s *re = li->li_task;
Deleted: openldap/trunk-2.3/debian/patches/auditlog-db-init
===================================================================
--- openldap/trunk-2.3/debian/patches/auditlog-db-init 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/auditlog-db-init 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,13 +0,0 @@
-Index: servers/slapd/overlays/auditlog.c
-===================================================================
---- servers/slapd/overlays/auditlog.c.orig
-+++ servers/slapd/overlays/auditlog.c
-@@ -160,7 +160,7 @@
- )
- {
- slap_overinst *on = (slap_overinst *)be->bd_info;
-- auditlog_data *ad = ch_malloc(sizeof(auditlog_data));
-+ auditlog_data *ad = ch_calloc(1, sizeof(auditlog_data));
-
- on->on_bi.bi_private = ad;
- ldap_pvt_thread_mutex_init( &ad->ad_mutex );
Deleted: openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry
===================================================================
--- openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,30 +0,0 @@
-Index: servers/slapd/back-bdb/cache.c
-===================================================================
---- servers/slapd/back-bdb/cache.c.orig
-+++ servers/slapd/back-bdb/cache.c
-@@ -146,7 +146,7 @@
- #else
- int rc;
-
-- if ( !lock ) return 0;
-+ if ( !lock || lock->mode == DB_LOCK_NG ) return 0;
-
- rc = LOCK_PUT ( env, lock );
- return rc;
-Index: servers/slapd/back-bdb/dn2entry.c
-===================================================================
---- servers/slapd/back-bdb/dn2entry.c.orig
-+++ servers/slapd/back-bdb/dn2entry.c
-@@ -56,8 +56,11 @@
- rc2 = bdb_cache_find_id( op, tid, ei->bei_id,
- &ei, 1, locker, lock );
- if ( rc2 ) rc = rc2;
-- } else if ( ei )
-+ } else if ( ei ) {
- bdb_cache_entryinfo_unlock( ei );
-+ memset( lock, 0, sizeof( *lock ));
-+ lock->mode = DB_LOCK_NG;
-+ }
- } else if ( ei ) {
- bdb_cache_entryinfo_unlock( ei );
- }
Deleted: openldap/trunk-2.3/debian/patches/bv-replace-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/bv-replace-fix 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/bv-replace-fix 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,15 +0,0 @@
-Index: libraries/liblber/memory.c
-===================================================================
---- libraries/liblber/memory.c.orig
-+++ libraries/liblber/memory.c
-@@ -700,8 +700,9 @@
- ber_bvreplace_x( struct berval *dst, LDAP_CONST struct berval *src, void *ctx )
- {
- assert( dst != NULL );
-+ assert( !BER_BVISNULL( src ) );
-
-- if ( dst->bv_len < src->bv_len ) {
-+ if ( BER_BVISNULL( dst ) || dst->bv_len < src->bv_len ) {
- dst->bv_val = ber_memrealloc_x( dst->bv_val, src->bv_len + 1, ctx );
- }
-
Deleted: openldap/trunk-2.3/debian/patches/exop-pass-change-does-not-reset-pwdMustChange
===================================================================
--- openldap/trunk-2.3/debian/patches/exop-pass-change-does-not-reset-pwdMustChange 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/exop-pass-change-does-not-reset-pwdMustChange 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,49 +0,0 @@
-Index: servers/slapd/overlays/ppolicy.c
-===================================================================
---- servers/slapd/overlays/ppolicy.c.orig
-+++ servers/slapd/overlays/ppolicy.c
-@@ -1187,6 +1187,19 @@
- }
-
- static int
-+ppolicy_mod_cb( Operation *op, SlapReply *rs )
-+{
-+ slap_callback *sc = op->o_callback;
-+ op->o_callback = sc->sc_next;
-+ if ( rs->sr_err == LDAP_SUCCESS ) {
-+ ch_free( pwcons[op->o_conn->c_conn_idx].dn.bv_val );
-+ BER_BVZERO( &pwcons[op->o_conn->c_conn_idx].dn );
-+ }
-+ op->o_tmpfree( sc, op->o_tmpmemctx );
-+ return SLAP_CB_CONTINUE;
-+}
-+
-+static int
- ppolicy_modify( Operation *op, SlapReply *rs )
- {
- slap_overinst *on = (slap_overinst *)op->o_bd->bd_info;
-@@ -1583,7 +1596,23 @@
- struct berval timestamp;
- char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
- time_t now = slap_get_time();
--
-+
-+ /* If the conn is restricted, set a callback to clear it
-+ * if the pwmod succeeds
-+ */
-+ if (!BER_BVISEMPTY( &pwcons[op->o_conn->c_conn_idx].dn )) {
-+ slap_callback *sc = op->o_tmpcalloc( 1, sizeof( slap_callback ),
-+ op->o_tmpmemctx );
-+ sc->sc_next = op->o_callback;
-+ /* Must use sc_response to insure we reset on success, before
-+ * the client sees the response. Must use sc_cleanup to insure
-+ * that it gets cleaned up if sc_response is not called.
-+ */
-+ sc->sc_response = ppolicy_mod_cb;
-+ sc->sc_cleanup = ppolicy_mod_cb;
-+ op->o_callback = sc;
-+ }
-+
- /*
- * keep the necessary pwd.. operational attributes
- * up to date.
Deleted: openldap/trunk-2.3/debian/patches/fix-boolean-logic
===================================================================
--- openldap/trunk-2.3/debian/patches/fix-boolean-logic 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/fix-boolean-logic 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,13 +0,0 @@
-Index: servers/slapd/overlays/retcode.c
-===================================================================
---- servers/slapd/overlays/retcode.c.orig
-+++ servers/slapd/overlays/retcode.c
-@@ -531,7 +531,7 @@
-
- /* sleep time */
- a = attr_find( e->e_attrs, ad_errSleepTime );
-- if ( a != NULL & a->a_nvals[ 0 ].bv_val[ 0 ] != '-' ) {
-+ if ( a != NULL && a->a_nvals[ 0 ].bv_val[ 0 ] != '-' ) {
- int sleepTime;
-
- sleepTime = strtoul( a->a_nvals[ 0 ].bv_val, &next, 0 );
Deleted: openldap/trunk-2.3/debian/patches/import-ldif-width-ppolicy-clear-text-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/import-ldif-width-ppolicy-clear-text-fix 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/import-ldif-width-ppolicy-clear-text-fix 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,19 +0,0 @@
-Index: servers/slapd/overlays/ppolicy.c
-===================================================================
---- servers/slapd/overlays/ppolicy.c.orig
-+++ servers/slapd/overlays/ppolicy.c
-@@ -435,9 +435,11 @@
- if (cred->bv_val[e]) {
- int rc;
- rc = lutil_passwd_scheme( cred->bv_val );
-- if (rc && sch) {
-- sch->bv_val = cred->bv_val;
-- sch->bv_len = e;
-+ if (rc) {
-+ if (sch) {
-+ sch->bv_val = cred->bv_val;
-+ sch->bv_len = e;
-+ }
- return LDAP_SUCCESS;
- }
- }
Deleted: openldap/trunk-2.3/debian/patches/ldapsearch-to-bold
===================================================================
--- openldap/trunk-2.3/debian/patches/ldapsearch-to-bold 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/ldapsearch-to-bold 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,14 +0,0 @@
-Index: doc/man/man1/ldapsearch.1
-===================================================================
---- doc/man/man1/ldapsearch.1.orig
-+++ doc/man/man1/ldapsearch.1
-@@ -84,7 +84,8 @@
- If not provided, the default filter, (objectClass=*), is used.
- .LP
- If
--.B ldapsearch finds one or more entries, the attributes specified by
-+.B ldapsearch
-+finds one or more entries, the attributes specified by
- \fIattrs\fP are returned. If * is listed, all user attributes are
- returned. If + is listed, all operational attributes are returned.
- If no \fIattrs\fP are listed, all user attributes are returned. If only
Deleted: openldap/trunk-2.3/debian/patches/passwd-length-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/passwd-length-fix 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/passwd-length-fix 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,13 +0,0 @@
-Index: libraries/liblutil/passwd.c
-===================================================================
---- libraries/liblutil/passwd.c.orig
-+++ libraries/liblutil/passwd.c
-@@ -309,7 +309,7 @@
- * didn't recognize? Assume a scheme name is at least 1 character.
- */
- if (( passwd->bv_val[0] == '{' ) &&
-- ( strchr( passwd->bv_val, '}' ) > passwd->bv_val+1 ))
-+ ( ber_bvchr( passwd, '}' ) > passwd->bv_val+1 ))
- {
- return 1;
- }
Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/series 2006-08-02 20:49:09 UTC (rev 711)
@@ -8,19 +8,6 @@
fixmanpages -p0
slapi-errorlog-file -p0
ldapi-socket-place -p0
-back-bdb-fix-lock-virtual-root-entry -p0
-fix-boolean-logic -p0
read-config-before-dropping-privileges -p0
disable-epoll-system-call -p0
-exop-pass-change-does-not-reset-pwdMustChange -p0
-slurpd-with-ldaps-does-not-work -p0
-syncrepl-fails-when-rootdn-not-defined -p0
-tls-concurrency-issues -p0
-auditlog-db-init -p0
-bv-replace-fix -p0
-passwd-length-fix -p0
-import-ldif-width-ppolicy-clear-text-fix -p0
-syncrepl-dont-replicate-fix -p0
-accesslog-purge-bug -p0
wrong-database-location -p0
-ldapsearch-to-bold -p0
Deleted: openldap/trunk-2.3/debian/patches/slurpd-with-ldaps-does-not-work
===================================================================
--- openldap/trunk-2.3/debian/patches/slurpd-with-ldaps-does-not-work 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/slurpd-with-ldaps-does-not-work 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,46 +0,0 @@
-Index: servers/slapd/bconfig.c
-===================================================================
---- servers/slapd/bconfig.c.orig
-+++ servers/slapd/bconfig.c
-@@ -2458,6 +2458,8 @@
- nr = add_replica_info(c->be, replicauri, replicahost);
- break;
- } else if(!strncasecmp(c->argv[i], "uri=", STRLENOF("uri="))) {
-+ ber_len_t len;
-+
- if ( replicauri ) {
- snprintf( c->msg, sizeof( c->msg ), "<%s> replica host/URI already specified", c->argv[0] );
- Debug(LDAP_DEBUG_ANY, "%s: %s \"%s\"\n", c->log, c->msg, replicauri );
-@@ -2476,11 +2478,28 @@
- Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
- return(1);
- }
-+
-+ len = strlen(ludp->lud_scheme) + strlen(ludp->lud_host) +
-+ STRLENOF("://") + 1;
-+ if (ludp->lud_port != LDAP_PORT) {
-+ if (ludp->lud_port < 1 || ludp->lud_port > 65535) {
-+ ldap_free_urldesc(ludp);
-+ snprintf( c->msg, sizeof( c->msg ), "<%s> invalid port",
-+ c->argv[0] );
-+ Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
-+ return(1);
-+ }
-+ len += STRLENOF(":65535");
-+ }
-+ replicauri = ch_malloc( len );
-+ replicahost = lutil_strcopy( replicauri, ludp->lud_scheme );
-+ replicahost = lutil_strcopy( replicauri, "://" );
-+ if (ludp->lud_port == LDAP_PORT) {
-+ strcpy( replicahost, ludp->lud_host );
-+ } else {
-+ sprintf( replicahost, "%s:%d",ludp->lud_host,ludp->lud_port );
-+ }
- ldap_free_urldesc(ludp);
-- replicauri = c->argv[i] + STRLENOF("uri=");
-- replicauri = ch_strdup( replicauri );
-- replicahost = strchr( replicauri, '/' );
-- replicahost += 2;
- nr = add_replica_info(c->be, replicauri, replicahost);
- break;
- }
Deleted: openldap/trunk-2.3/debian/patches/syncrepl-dont-replicate-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/syncrepl-dont-replicate-fix 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/syncrepl-dont-replicate-fix 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,42 +0,0 @@
-Index: servers/slapd/ldapsync.c
-===================================================================
---- servers/slapd/ldapsync.c.orig
-+++ servers/slapd/ldapsync.c
-@@ -38,24 +38,29 @@
- int rid )
- {
- char cookiestr[ LDAP_LUTIL_CSNSTR_BUFSIZE + 20 ];
-+ int len;
-
- if ( BER_BVISNULL( csn )) {
- if ( rid == -1 ) {
- cookiestr[0] = '\0';
-+ len = 0;
- } else {
-- snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-+ len = snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
- "rid=%03d", rid );
- }
- } else {
-- if ( rid == -1 ) {
-- snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-- "csn=%s", csn->bv_val );
-- } else {
-- snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-- "csn=%s,rid=%03d", csn->bv_val, rid );
-+ char *end = cookiestr + sizeof(cookiestr);
-+ char *ptr = lutil_strcopy( cookiestr, "csn=" );
-+ len = csn->bv_len;
-+ if ( ptr + len >= end )
-+ len = end - ptr;
-+ ptr = lutil_strncopy( ptr, csn->bv_val, len );
-+ if ( rid != -1 && ptr < end - STRLENOF(",rid=xxx") ) {
-+ ptr += sprintf( ptr, ",rid=%03d", rid );
- }
-+ len = ptr - cookiestr;
- }
-- ber_str2bv_x( cookiestr, strlen(cookiestr), 1, cookie,
-+ ber_str2bv_x( cookiestr, len, 1, cookie,
- op ? op->o_tmpmemctx : NULL );
- }
-
Deleted: openldap/trunk-2.3/debian/patches/syncrepl-fails-when-rootdn-not-defined
===================================================================
--- openldap/trunk-2.3/debian/patches/syncrepl-fails-when-rootdn-not-defined 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/syncrepl-fails-when-rootdn-not-defined 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,21 +0,0 @@
-Index: servers/slapd/syncrepl.c
-===================================================================
---- servers/slapd/syncrepl.c.orig
-+++ servers/slapd/syncrepl.c
-@@ -3161,8 +3161,14 @@
- int rc = 0;
-
- if ( !( c->be->be_search && c->be->be_add && c->be->be_modify && c->be->be_delete ) ) {
-- Debug( LDAP_DEBUG_ANY, "%s: database %s does not support operations "
-- "required for syncrepl\n", c->log, c->be->be_type, 0 );
-+ snprintf( c->msg, sizeof(c->msg), "database %s does not support "
-+ "operations required for syncrepl", c->be->be_type );
-+ Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
-+ return 1;
-+ }
-+ if ( BER_BVISEMPTY( &c->be->be_rootdn )) {
-+ strcpy( c->msg, "rootDN must be defined before syncrepl may be used" );
-+ Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 );
- return 1;
- }
- si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) );
Deleted: openldap/trunk-2.3/debian/patches/tls-concurrency-issues
===================================================================
--- openldap/trunk-2.3/debian/patches/tls-concurrency-issues 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/tls-concurrency-issues 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,34 +0,0 @@
-Index: libraries/libldap/tls.c
-===================================================================
---- libraries/libldap/tls.c.orig
-+++ libraries/libldap/tls.c
-@@ -105,6 +105,7 @@
- */
-
- static ldap_pvt_thread_mutex_t tls_def_ctx_mutex;
-+static ldap_pvt_thread_mutex_t tls_connect_mutex;
-
- static void tls_init_threads( void )
- {
-@@ -117,6 +118,7 @@
- /* FIXME: the thread id should be added somehow... */
-
- ldap_pvt_thread_mutex_init( &tls_def_ctx_mutex );
-+ ldap_pvt_thread_mutex_init( &tls_connect_mutex );
- }
- #endif /* LDAP_R_COMPILE */
-
-@@ -855,7 +857,13 @@
- LBER_SBIOD_LEVEL_TRANSPORT, (void *)ssl );
- }
-
-+#ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_lock( &tls_connect_mutex );
-+#endif
- err = SSL_accept( ssl );
-+#ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_unlock( &tls_connect_mutex );
-+#endif
-
- #ifdef HAVE_WINSOCK
- errno = WSAGetLastError();
Modified: openldap/trunk-2.3/debian/patches/use-lpthreads
===================================================================
--- openldap/trunk-2.3/debian/patches/use-lpthreads 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/use-lpthreads 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,7 +1,8 @@
-diff -urNad openldap2.3-2.3.11~/configure.in openldap2.3-2.3.11/configure.in
---- openldap2.3-2.3.11~/configure.in 2005-12-01 13:48:51.000000000 +0100
-+++ openldap2.3-2.3.11/configure.in 2005-12-01 15:46:27.828727750 +0100
-@@ -1485,6 +1485,7 @@
+Index: openldap2.3-2.3.25/configure.in
+===================================================================
+--- openldap2.3-2.3.25.orig/configure.in 2006-08-02 22:45:12.332314072 +0200
++++ openldap2.3-2.3.25/configure.in 2006-08-02 22:46:36.054586352 +0200
+@@ -1486,6 +1486,7 @@
dnl OL_PTHREAD_TRY([-mt], [ol_cv_pthread_mt])
OL_PTHREAD_TRY([-kthread], [ol_cv_pthread_kthread])
Modified: openldap/trunk-2.3/debian/patches/wrong-database-location
===================================================================
--- openldap/trunk-2.3/debian/patches/wrong-database-location 2006-08-02 20:27:41 UTC (rev 710)
+++ openldap/trunk-2.3/debian/patches/wrong-database-location 2006-08-02 20:49:09 UTC (rev 711)
@@ -1,7 +1,7 @@
Index: doc/man/man5/slapd-bdb.5
===================================================================
---- doc/man/man5/slapd-bdb.5.orig
-+++ doc/man/man5/slapd-bdb.5
+--- doc/man/man5/slapd-bdb.5.orig 2006-08-02 22:45:11.289472608 +0200
++++ doc/man/man5/slapd-bdb.5 2006-08-02 22:46:50.958320640 +0200
@@ -96,7 +96,7 @@
associated indexes live.
A separate directory must be specified for each database.
@@ -13,8 +13,8 @@
Allow reads of modified but not yet committed data.
Index: doc/man/man5/slapd-ldbm.5
===================================================================
---- doc/man/man5/slapd-ldbm.5.orig
-+++ doc/man/man5/slapd-ldbm.5
+--- doc/man/man5/slapd-ldbm.5.orig 2006-08-02 22:45:11.306470024 +0200
++++ doc/man/man5/slapd-ldbm.5 2006-08-02 22:46:50.959320488 +0200
@@ -84,7 +84,7 @@
associated indexes live.
A separate directory must be specified for each database.
@@ -26,9 +26,9 @@
index {<attrlist>|default} [pres,eq,approx,sub,<special>]
Index: doc/man/man5/slapd.conf.5
===================================================================
---- doc/man/man5/slapd.conf.5.orig
-+++ doc/man/man5/slapd.conf.5
-@@ -1863,7 +1863,7 @@
+--- doc/man/man5/slapd.conf.5.orig 2006-08-02 22:45:11.337465312 +0200
++++ doc/man/man5/slapd.conf.5 2006-08-02 22:46:50.961320184 +0200
+@@ -1870,7 +1870,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
@@ -39,8 +39,8 @@
index cn,sn,mail pres,eq,approx,sub
Index: include/ldap_defaults.h
===================================================================
---- include/ldap_defaults.h.orig
-+++ include/ldap_defaults.h
+--- include/ldap_defaults.h.orig 2006-08-02 22:46:48.153747000 +0200
++++ include/ldap_defaults.h 2006-08-02 22:46:50.961320184 +0200
@@ -47,7 +47,7 @@
/* location of the default slapd config file */
#define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
@@ -52,8 +52,8 @@
/* default max deref depth for aliases */
Index: servers/slapd/Makefile.in
===================================================================
---- servers/slapd/Makefile.in.orig
-+++ servers/slapd/Makefile.in
+--- servers/slapd/Makefile.in.orig 2006-08-02 22:45:11.378459080 +0200
++++ servers/slapd/Makefile.in 2006-08-02 22:46:50.970318816 +0200
@@ -430,9 +430,9 @@
install-db-config: FORCE
More information about the Pkg-openldap-devel
mailing list