mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

defer relayed database lookup (ITS#5643)

Browse Source
This commit is contained in:
Pierangelo Masarati 2008-08-04 21:17:25 +00:00
parent afbef0b035
commit 785fafa36e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servers/slapd/back-relay/init.c
View File

@ -108,10 +108,8 @@ relay_back_cf( ConfigArgs *c )
"of relay dn \"%s\" " "of relay dn \"%s\" "
"in \"olcRelay <dn>\"\n", "in \"olcRelay <dn>\"\n",
c->value_dn.bv_val ); c->value_dn.bv_val );
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, Log2( LDAP_DEBUG_CONFIG, LDAP_LEVEL_ERR,
"%s: %s.\n", c->log, c->cr_msg ); "%s: %s.\n", c->log, c->cr_msg );
rc = 1;
goto relay_done;
} else if ( bd->be_private == c->be->be_private ) { } else if ( bd->be_private == c->be->be_private ) {
snprintf( c->cr_msg, sizeof( c->cr_msg), snprintf( c->cr_msg, sizeof( c->cr_msg),
@ -213,7 +211,17 @@ relay_back_db_open( Backend *be, ConfigReply *cr )
ri->ri_bd = select_backend( &ri->ri_realsuffix, 1 ); ri->ri_bd = select_backend( &ri->ri_realsuffix, 1 );
/* must be there: it was during config! */ /* must be there: it was during config! */
assert( ri->ri_bd != NULL ); if ( ri->ri_bd == NULL ) {
snprintf( cr->msg, sizeof( cr->msg),
"cannot find database "
"of relay dn \"%s\" "
"in \"olcRelay <dn>\"\n",
ri->ri_realsuffix.bv_val );
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"relay_back_db_open: %s.\n", cr->msg );
return 1;
}
/* inherit controls */ /* inherit controls */
AC_MEMCPY( be->be_ctrls, ri->ri_bd->be_ctrls, sizeof( be->be_ctrls ) ); AC_MEMCPY( be->be_ctrls, ri->ri_bd->be_ctrls, sizeof( be->be_ctrls ) );