[Pkg-openldap-devel] r1189 - in openldap/trunk/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Oct 11 08:37:53 UTC 2008
Author: vorlon
Date: 2008-10-11 08:37:53 +0000 (Sat, 11 Oct 2008)
New Revision: 1189
Removed:
openldap/trunk/debian/patches/no_backend_inter-linking
Modified:
openldap/trunk/debian/changelog
openldap/trunk/debian/patches/series
Log:
Drop patch no_backend_inter-linking, applied upstream.
Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog 2008-10-11 08:36:54 UTC (rev 1188)
+++ openldap/trunk/debian/changelog 2008-10-11 08:37:53 UTC (rev 1189)
@@ -14,6 +14,7 @@
* Drop the conflict with libldap2, which is not the standard means of
handling symbol conflicts in Debian and which causes serious upgrade
problems from etch. Closes: #487211.
+ * Drop patch no_backend_inter-linking, applied upstream.
-- Russ Allbery <rra at debian.org> Fri, 15 Aug 2008 17:11:10 -0700
Deleted: openldap/trunk/debian/patches/no_backend_inter-linking
===================================================================
--- openldap/trunk/debian/patches/no_backend_inter-linking 2008-10-11 08:36:54 UTC (rev 1188)
+++ openldap/trunk/debian/patches/no_backend_inter-linking 2008-10-11 08:37:53 UTC (rev 1189)
@@ -1,170 +0,0 @@
-Patch from upstream CVS
-
-back-meta shouldn't need to link against back-ldap; fix up the
-ldap_extra_t struct so that all the functions back-meta needs access to
-are here, so it doesn't fail with Debian libltdl.
-
-Addresses ITS#5355.
-
---- openldap.orig/servers/slapd/back-meta/config.c
-+++ openldap/servers/slapd/back-meta/config.c
-@@ -1089,7 +1089,7 @@
- }
- cargv[ 2 ] = binddn;
-
-- rc = slap_idassert_parse_cf( fname, lineno, cargc, cargv, &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
-+ rc = mi->mi_ldap_extra->idassert_parse_cf( fname, lineno, cargc, cargv, &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
- if ( rc == 0 ) {
- struct berval bv;
-
-@@ -1159,7 +1159,7 @@
- return 1;
- }
-
-- return slap_idassert_parse_cf( fname, lineno, argc, argv, &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
-+ return mi->mi_ldap_extra->idassert_parse_cf( fname, lineno, argc, argv, &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
-
- /* idassert-authzFrom */
- } else if ( strcasecmp( argv[ 0 ], "idassert-authzFrom" ) == 0 ) {
-@@ -1188,7 +1188,7 @@
- return 1;
- }
-
-- return slap_idassert_authzfrom_parse_cf( fname, lineno, argv[ 1 ], &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
-+ return mi->mi_ldap_extra->idassert_authzfrom_parse_cf( fname, lineno, argv[ 1 ], &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_idassert );
-
- /* quarantine */
- } else if ( strcasecmp( argv[ 0 ], "quarantine" ) == 0 ) {
-@@ -1232,7 +1232,7 @@
- ldap_pvt_thread_mutex_init( &mi->mi_targets[ mi->mi_ntargets - 1 ]->mt_quarantine_mutex );
- }
-
-- if ( slap_retry_info_parse( argv[ 1 ], ri, buf, sizeof( buf ) ) ) {
-+ if ( mi->mi_ldap_extra->retry_info_parse( argv[ 1 ], ri, buf, sizeof( buf ) ) ) {
- Debug( LDAP_DEBUG_ANY,
- "%s line %d: %s.\n",
- fname, lineno, buf );
---- openldap.orig/servers/slapd/back-meta/init.c
-+++ openldap/servers/slapd/back-meta/init.c
-@@ -93,6 +93,15 @@
- {
- metainfo_t *mi;
- int i;
-+ BackendInfo *bi;
-+
-+ bi = backend_info( "ldap" );
-+ if ( !bi || !bi->bi_extra ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "meta_back_db_init: needs back-ldap\n",
-+ 0, 0, 0 );
-+ return 1;
-+ }
-
- mi = ch_calloc( 1, sizeof( metainfo_t ) );
- if ( mi == NULL ) {
-@@ -127,6 +136,8 @@
- }
- mi->mi_conn_priv_max = LDAP_BACK_CONN_PRIV_DEFAULT;
-
-+ mi->mi_ldap_extra = (ldap_extra_t *)bi->bi_extra;
-+
- be->be_private = mi;
-
- return 0;
-@@ -138,7 +149,6 @@
- ConfigReply *cr )
- {
- metainfo_t *mi = (metainfo_t *)be->be_private;
-- BackendInfo *bi;
-
- int i,
- not_always = 0,
-@@ -153,15 +163,6 @@
- return 1;
- }
-
-- bi = backend_info( "ldap" );
-- if ( !bi || !bi->bi_extra ) {
-- Debug( LDAP_DEBUG_ANY,
-- "meta_back_db_open: needs back-ldap\n",
-- 0, 0, 0 );
-- return 1;
-- }
-- mi->mi_ldap_extra = (ldap_extra_t *)bi->bi_extra;
--
- for ( i = 0; i < mi->mi_ntargets; i++ ) {
- slap_bindconf sb = { BER_BVNULL };
- metatarget_t *mt = mi->mi_targets[ i ];
-@@ -383,7 +384,7 @@
- if ( META_BACK_TGT_QUARANTINE( mt ) ) {
- if ( mt->mt_quarantine.ri_num != mi->mi_quarantine.ri_num )
- {
-- slap_retry_info_destroy( &mt->mt_quarantine );
-+ mi->mi_ldap_extra->retry_info_destroy( &mt->mt_quarantine );
- }
-
- ldap_pvt_thread_mutex_destroy( &mt->mt_quarantine_mutex );
-@@ -411,7 +412,7 @@
- }
-
- if ( META_BACK_QUARANTINE( mi ) ) {
-- slap_retry_info_destroy( &mi->mi_quarantine );
-+ mi->mi_ldap_extra->retry_info_destroy( &mi->mi_quarantine );
- }
- }
-
---- openldap.orig/servers/slapd/back-ldap/back-ldap.h
-+++ openldap/servers/slapd/back-ldap/back-ldap.h
-@@ -428,6 +428,11 @@
- int (*proxy_authz_ctrl)( Operation *op, SlapReply *rs, struct berval *bound_ndn,
- int version, slap_idassert_t *si, LDAPControl *ctrl );
- int (*controls_free)( Operation *op, SlapReply *rs, LDAPControl ***pctrls );
-+ int (*idassert_authzfrom_parse_cf)( const char *fname, int lineno, const char *arg, slap_idassert_t *si );
-+ int (*idassert_parse_cf)( const char *fname, int lineno, int argc, char *argv[], slap_idassert_t *si );
-+ void (*retry_info_destroy)( slap_retry_info_t *ri );
-+ int (*retry_info_parse)( char *in, slap_retry_info_t *ri, char *buf, ber_len_t buflen );
-+ int (*retry_info_unparse)( slap_retry_info_t *ri, struct berval *bvout );
- } ldap_extra_t;
-
- LDAP_END_DECL
---- openldap.orig/servers/slapd/back-ldap/init.c
-+++ openldap/servers/slapd/back-ldap/init.c
-@@ -34,7 +34,12 @@
-
- static const ldap_extra_t ldap_extra = {
- ldap_back_proxy_authz_ctrl,
-- ldap_back_controls_free
-+ ldap_back_controls_free,
-+ slap_idassert_authzfrom_parse_cf,
-+ slap_idassert_parse_cf,
-+ slap_retry_info_destroy,
-+ slap_retry_info_parse,
-+ slap_retry_info_unparse
- };
-
- int
---- openldap.orig/servers/slapd/back-ldap/proto-ldap.h
-+++ openldap/servers/slapd/back-ldap/proto-ldap.h
-@@ -63,22 +63,6 @@
-
- extern ldapconn_t * ldap_back_conn_delete( ldapinfo_t *li, ldapconn_t *lc );
-
--#if 0
--extern int
--ldap_back_proxy_authz_ctrl(
-- struct berval *bound_ndn,
-- int version,
-- slap_idassert_t *si,
-- Operation *op,
-- SlapReply *rs,
-- LDAPControl ***pctrls );
--
--extern int
--ldap_back_proxy_authz_ctrl_free(
-- Operation *op,
-- LDAPControl ***pctrls );
--#endif
--
- extern int
- ldap_back_proxy_authz_ctrl(
- Operation *op,
Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series 2008-10-11 08:36:54 UTC (rev 1188)
+++ openldap/trunk/debian/patches/series 2008-10-11 08:37:53 UTC (rev 1189)
@@ -9,7 +9,6 @@
libldap-symbol-versions
gnutls-ciphers
getaddrinfo-is-threadsafe
-no_backend_inter-linking
CVE-2008-2952_BER-decoding-assertion
gnutls-ssf
back-perl-init
More information about the Pkg-openldap-devel
mailing list