mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow plugins not associated with a specific backend

Browse Source
This commit is contained in:
Luke Howard 2003-01-21 15:09:58 +00:00
parent 5883b270b8
commit 1e32bdbd69
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
servers/slapd/slapi/plugin.c
View File

@ -26,6 +26,8 @@ static int loadPlugin( Slapi_PBlock *, const char *, const char *, int,
/* pointer to link list of extended objects */
static ExtendedOp *pGExtendedOps = NULL;
/* global plugins not associated with a specific backend */
static Slapi_PBlock *pGPlugins = NULL;
/*********************************************************************
* Function Name: newPlugin
@ -119,10 +121,13 @@ insertPlugin(
Slapi_PBlock *pSavePB;
int rc = LDAP_SUCCESS;
pTmpPB = (Slapi_PBlock *)(be->be_pb);
pTmpPB = ( be == NULL ) ? pGPlugins : (Slapi_PBlock *)(be->be_pb);
if ( pTmpPB == NULL ) {
be->be_pb = (void *)pPB;
if ( be != NULL )
be->be_pb = (void *)pPB;
else
pGPlugins = pPB;
} else {
while ( pTmpPB != NULL && rc == LDAP_SUCCESS ) {
pSavePB = pTmpPB;
@ -173,17 +178,9 @@ getAllPluginFuncs(
int numPB = 0;
int rc = LDAP_SUCCESS;
if ( be == NULL ) {
/*
* No plugins supported if no backend (yet)
*/
rc = LDAP_OTHER;
goto done;
}
assert( ppFuncPtrs );
pCurrentPB = (Slapi_PBlock *)(be->be_pb);
pCurrentPB = ( be == NULL ) ? pGPlugins : (Slapi_PBlock *)(be->be_pb);
if ( pCurrentPB == NULL ) {
/*
@ -221,7 +218,7 @@ getAllPluginFuncs(
goto done;
}
pCurrentPB = (Slapi_PBlock *)(be->be_pb);
pCurrentPB = ( be == NULL ) ? pGPlugins : (Slapi_PBlock *)(be->be_pb);
while ( pCurrentPB != NULL && rc == LDAP_SUCCESS ) {
rc = slapi_pblock_get( pCurrentPB, functype, &FuncPtr );
if ( rc == LDAP_SUCCESS ) {
@ -568,7 +565,7 @@ doPluginFNs(
Slapi_PBlock *pPB )
{
int rc = LDAP_SUCCESS;
int rc = 0;
SLAPI_FUNC *pGetPlugin = NULL, *tmpPlugin = NULL;
rc = getAllPluginFuncs(be, funcType, &tmpPlugin );
@ -595,7 +592,33 @@ doPluginFNs(
}
}
ch_free( tmpPlugin );
slapi_ch_free( (void **)&tmpPlugin );
/*
* If we failed, and this wasn't a postoperation plugin, we
* should return the failure to the frontend.
*/
if ( !SLAPI_PLUGIN_IS_POST_FN( funcType ) && rc != 0 ) {
return rc;
}
/*
* Try any global plugins (not associated with a specific
* backend); same logic as above.
*/
if ( be != NULL ) {
rc = getAllPluginFuncs( be, funcType, &tmpPlugin );
if ( rc != LDAP_SUCCESS || tmpPlugin == NULL )
return 0;
for ( pGetPlugin = tmpPlugin; *pGetPlugin != NULL; pGetPlugin++ ) {
rc = (*pGetPlugin)(pPB);
if ( !SLAPI_PLUGIN_IS_POST_FN( funcType ) && rc != 0 ) {
break;
}
}
}
slapi_ch_free( (void **)&tmpPlugin );
return rc;
}

12
servers/slapd/slapi/slapi_utils.c
View File

@ -1153,14 +1153,16 @@ int slapi_x_backend_set_pb( Slapi_PBlock *pb, Backend *be )
{
#if defined(LDAP_SLAPI)
int rc;
rc = slapi_pblock_set( pb, SLAPI_BACKEND, (void *)be );
if ( rc != LDAP_SUCCESS )
return rc;
rc = slapi_pblock_set( pb, SLAPI_BE_TYPE, (void *)be->bd_info->bi_type );
if ( rc != LDAP_SUCCESS )
return rc;
if ( be != NULL ) {
rc = slapi_pblock_set( pb, SLAPI_BE_TYPE, (void *)be->bd_info->bi_type );
if ( rc != LDAP_SUCCESS )
return rc;
}
return LDAP_SUCCESS;
#else