Commit b0416d11 authored by Luke Howard's avatar Luke Howard
Browse files

Cleanup SLAPI namespace

parent e9314574
......@@ -35,10 +35,10 @@
#ifdef LDAP_SLAPI
#include "slapi.h"
static void initAddPlugin( Operation *op,
static void init_add_pblock( Operation *op,
struct berval *dn, Entry *e, int manageDSAit );
static int doPreAddPluginFNs( Operation *op );
static void doPostAddPluginFNs( Operation *op );
static int call_add_preop_plugins( Operation *op );
static void call_add_postop_plugins( Operation *op );
#endif /* LDAP_SLAPI */
int
......@@ -239,7 +239,7 @@ do_add( Operation *op, SlapReply *rs )
}
#ifdef LDAP_SLAPI
if ( op->o_pb ) initAddPlugin( op, &dn, e, manageDSAit );
if ( op->o_pb ) init_add_pblock( op, &dn, e, manageDSAit );
#endif /* LDAP_SLAPI */
/*
......@@ -300,7 +300,7 @@ do_add( Operation *op, SlapReply *rs )
* will actually contain something.
*/
if ( op->o_pb ) {
rs->sr_err = doPreAddPluginFNs( op );
rs->sr_err = call_add_preop_plugins( op );
if ( rs->sr_err != LDAP_SUCCESS ) {
/* plugin will have sent result */
goto done;
......@@ -330,7 +330,7 @@ do_add( Operation *op, SlapReply *rs )
* on replicas (for now, it involves the minimum code intrusion).
*/
if ( op->o_pb ) {
rs->sr_err = doPreAddPluginFNs( op );
rs->sr_err = call_add_preop_plugins( op );
if ( rs->sr_err != LDAP_SUCCESS ) {
/* plugin will have sent result */
goto done;
......@@ -369,7 +369,7 @@ do_add( Operation *op, SlapReply *rs )
} else {
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
rs->sr_err = doPreAddPluginFNs( op );
rs->sr_err = call_add_preop_plugins( op );
if ( rs->sr_err != LDAP_SUCCESS ) {
/* plugin will have sent result */
goto done;
......@@ -387,7 +387,7 @@ do_add( Operation *op, SlapReply *rs )
}
#ifdef LDAP_SLAPI
if ( op->o_pb ) doPostAddPluginFNs( op );
if ( op->o_pb ) call_add_postop_plugins( op );
#endif /* LDAP_SLAPI */
done:
......@@ -654,7 +654,7 @@ slap_entry2mods(
}
#ifdef LDAP_SLAPI
static void initAddPlugin( Operation *op,
static void init_add_pblock( Operation *op,
struct berval *dn, Entry *e, int manageDSAit )
{
slapi_int_pblock_set_operation( op->o_pb, op );
......@@ -663,11 +663,11 @@ static void initAddPlugin( Operation *op,
slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
}
static int doPreAddPluginFNs( Operation *op )
static int call_add_preop_plugins( Operation *op )
{
int rc;
rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb );
rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb );
if ( rc < 0 ) {
/*
* A preoperation plugin failure will abort the
......@@ -695,11 +695,11 @@ static int doPreAddPluginFNs( Operation *op )
return rc;
}
static void doPostAddPluginFNs( Operation *op )
static void call_add_postop_plugins( Operation *op )
{
int rc;
rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
if ( rc < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO,
......
......@@ -753,7 +753,7 @@ backend_unbind( Operation *op, SlapReply *rs )
int rc;
if ( i == 0 ) slapi_int_pblock_set_operation( op->o_pb, op );
slapi_pblock_set( op->o_pb, SLAPI_BACKEND, (void *)&backends[i] );
rc = doPluginFNs( &backends[i], SLAPI_PLUGIN_PRE_UNBIND_FN,
rc = slapi_int_call_plugins( &backends[i], SLAPI_PLUGIN_PRE_UNBIND_FN,
(Slapi_PBlock *)op->o_pb );
if ( rc < 0 ) {
/*
......@@ -778,7 +778,7 @@ backend_unbind( Operation *op, SlapReply *rs )
}
#if defined( LDAP_SLAPI )
if ( op->o_pb && doPluginFNs( &backends[i], SLAPI_PLUGIN_POST_UNBIND_FN,
if ( op->o_pb != NULL && slapi_int_call_plugins( &backends[i], SLAPI_PLUGIN_POST_UNBIND_FN,
(Slapi_PBlock *)op->o_pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_unbind: Unbind postoperation plugins "
......
......@@ -373,7 +373,7 @@ do_bind(
slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)method );
slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
(void) doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb );
(void) slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb );
}
#endif /* LDAP_SLAPI */
......@@ -538,7 +538,7 @@ do_bind(
slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
slapi_pblock_set( pb, SLAPI_CONN_DN, (void *)(0) );
rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO,
......@@ -670,7 +670,7 @@ do_bind(
}
#if defined( LDAP_SLAPI )
if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO,
"do_bind: Bind postoperation plugins failed\n",
......
......@@ -266,7 +266,7 @@ do_compare(
slapi_pblock_set( pb, SLAPI_COMPARE_TYPE, (void *)desc.bv_val );
slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&value );
rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_COMPARE_FN, pb );
rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_COMPARE_FN, pb );
if ( rs->sr_err < 0 ) {
/*
* A preoperation plugin failure will abort the
......@@ -297,7 +297,7 @@ do_compare(
}
#if defined( LDAP_SLAPI )
if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_COMPARE_FN, pb ) < 0 ) {
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_COMPARE_FN, pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_compare: compare postoperation plugins "
"failed\n", 0, 0, 0 );
......
......@@ -2423,7 +2423,7 @@ read_config( const char *fname, int depth )
}
#endif /* notdef */
if ( netscape_plugin( be, fname, lineno, cargc, cargv )
if ( slapi_int_read_config( be, fname, lineno, cargc, cargv )
!= LDAP_SUCCESS ) {
return( 1 );
}
......
......@@ -168,7 +168,7 @@ do_delete(
slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val );
slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_DELETE_FN, pb );
if ( rs->sr_err < 0 ) {
/*
* A preoperation plugin failure will abort the
......@@ -258,7 +258,7 @@ do_delete(
}
#if defined( LDAP_SLAPI )
if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0) {
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_DELETE_FN, pb ) < 0) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_delete: delete postoperation plugins "
"failed\n", 0, 0, 0 );
......
......@@ -184,7 +184,7 @@ do_extended(
}
#ifdef LDAP_SLAPI
getPluginFunc( &op->ore_reqoid, &funcAddr ); /* NS-SLAPI extended operation */
slapi_int_get_extop_plugin( &op->ore_reqoid, &funcAddr ); /* NS-SLAPI extended operation */
if( !funcAddr && !(ext = find_extop(supp_ext_list, &op->ore_reqoid )))
#else
if( !(ext = find_extop(supp_ext_list, &op->ore_reqoid )))
......
......@@ -205,7 +205,7 @@ int slap_startup( Backend *be )
if( rc == 0 ) {
Slapi_PBlock *pb = slapi_pblock_new();
if ( doPluginFNs( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
rc = -1;
}
slapi_pblock_destroy( pb );
......@@ -238,8 +238,8 @@ int slap_shutdown( Backend *be )
rc = backend_shutdown( be );
#ifdef LDAP_SLAPI
pb = slapi_pblock_new( );
(void) doPluginFNs( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
pb = slapi_pblock_new();
(void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
slapi_pblock_destroy( pb );
#endif /* LDAP_SLAPI */
......
......@@ -474,7 +474,7 @@ int main( int argc, char **argv )
#endif
#ifdef LDAP_SLAPI
if ( slapi_init() != 0 ) {
if ( slapi_int_initialize() != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT, "main: slapi initialization error\n", 0, 0, 0 );
#else
......
......@@ -398,7 +398,7 @@ do_modify(
modv = slapi_int_modifications2ldapmods( &modlist );
slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv );
rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
if ( rs->sr_err < 0 ) {
/*
* A preoperation plugin failure will abort the
......@@ -549,7 +549,7 @@ do_modify(
#if defined( LDAP_SLAPI )
} /* modlist != NULL */
if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) < 0 ) {
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_MODIFY_FN, pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_modify: modify postoperation plugins "
"failed\n", 0, 0, 0 );
......
......@@ -324,7 +324,7 @@ do_modrdn(
slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn );
slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
if ( rs->sr_err < 0 ) {
/*
* A preoperation plugin failure will abort the
......@@ -409,7 +409,7 @@ do_modrdn(
}
#if defined( LDAP_SLAPI )
if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) < 0 ) {
if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn postoperation plugins "
"failed\n", 0, 0, 0 );
......
......@@ -593,13 +593,13 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
* should just set SLAPI_RESULT_CODE rather than sending a
* result if they wish to change the result.
*/
if ( op->o_pb ) {
if ( op->o_pb != NULL ) {
slapi_int_pblock_set_operation( op->o_pb, op );
slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, (void *)rs->sr_err );
slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, (void *)rs->sr_text );
slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, (void *)rs->sr_matched );
(void) doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_RESULT_FN, op->o_pb );
(void) slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_RESULT_FN, op->o_pb );
}
#endif /* LDAP_SLAPI */
......
......@@ -153,7 +153,7 @@ root_dse_info(
#ifdef LDAP_SLAPI
/* netscape supportedExtension */
for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
vals[0] = *bv;
if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
return LDAP_OTHER;
......
......@@ -36,11 +36,12 @@
#ifdef LDAP_SLAPI
#include "slapi.h"
static char **anlist2charray( Operation *op, AttributeName *an );
static void initSearchPlugin( Operation *op, char **attrs, int managedsait );
static int doPreSearchPluginFNs( Operation *op );
static int doSearchRewriteFNs( Operation *op );
static void doPostSearchPluginFNs( Operation *op );
static void init_search_pblock( Operation *op, char **attrs, int managedsait );
static int call_search_preop_plugins( Operation *op );
static int call_search_rewrite_plugins( Operation *op );
static void call_search_postop_plugins( Operation *op );
#endif /* LDAPI_SLAPI */
int
......@@ -276,10 +277,10 @@ do_search(
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
attrs = anlist2charray( op, op->ors_attrs );
initSearchPlugin( op, attrs, manageDSAit );
rs->sr_err = doPreSearchPluginFNs( op );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err ) break;
doSearchRewriteFNs( op );
call_search_rewrite_plugins( op );
}
#endif /* LDAP_SLAPI */
rs->sr_err = root_dse_info( op->o_conn, &entry, &rs->sr_text );
......@@ -294,10 +295,10 @@ do_search(
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
attrs = anlist2charray( op, op->ors_attrs );
initSearchPlugin( op, attrs, manageDSAit );
rs->sr_err = doPreSearchPluginFNs( op );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err ) break;
doSearchRewriteFNs( op );
call_search_rewrite_plugins( op );
}
#endif /* LDAP_SLAPI */
rs->sr_err = schema_info( &entry, &rs->sr_text );
......@@ -306,7 +307,7 @@ do_search(
if( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
#ifdef LDAP_SLAPI
if ( op->o_pb ) doPostSearchPluginFNs( op );
if ( op->o_pb ) call_search_postop_plugins( op );
#endif /* LDAP_SLAPI */
goto return_results;
......@@ -324,7 +325,7 @@ do_search(
rs->sr_err = LDAP_SUCCESS;
send_ldap_result( op, rs );
#ifdef LDAP_SLAPI
if ( op->o_pb ) doPostSearchPluginFNs( op );
if ( op->o_pb ) call_search_postop_plugins( op );
#endif /* LDAP_SLAPI */
goto return_results;
}
......@@ -386,13 +387,13 @@ do_search(
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
attrs = anlist2charray( op, op->ors_attrs );
initSearchPlugin( op, attrs, manageDSAit );
rs->sr_err = doPreSearchPluginFNs( op );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err != LDAP_SUCCESS ) {
goto return_results;
}
doSearchRewriteFNs( op );
call_search_rewrite_plugins( op );
}
#endif /* LDAP_SLAPI */
......@@ -405,7 +406,7 @@ do_search(
}
#ifdef LDAP_SLAPI
if ( op->o_pb ) doPostSearchPluginFNs( op );
if ( op->o_pb ) call_search_postop_plugins( op );
#endif /* LDAP_SLAPI */
return_results:;
......@@ -451,7 +452,7 @@ static char **anlist2charray( Operation *op, AttributeName *an )
return attrs;
}
static void initSearchPlugin( Operation *op,
static void init_search_pblock( Operation *op,
char **attrs, int managedsait )
{
slapi_int_pblock_set_operation( op->o_pb, op );
......@@ -467,21 +468,21 @@ static void initSearchPlugin( Operation *op,
slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)managedsait );
}
static int doPreSearchPluginFNs( Operation *op )
static int call_search_preop_plugins( Operation *op )
{
int rc;
rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_SEARCH_FN, op->o_pb );
rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_SEARCH_FN, op->o_pb );
if ( rc < 0 ) {
/*
* A preoperation plugin failure will abort the
* entire operation.
*/
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "doPreSearchPluginFNs: search preoperation plugin "
LDAP_LOG( OPERATION, INFO, "call_search_preop_plugins: search preoperation plugin "
"returned %d\n", rc, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin "
Debug(LDAP_DEBUG_TRACE, "call_search_preop_plugins: search preoperation plugin "
"returned %d.\n", rc, 0, 0);
#endif
if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
......@@ -495,9 +496,9 @@ static int doPreSearchPluginFNs( Operation *op )
return rc;
}
static int doSearchRewriteFNs( Operation *op )
static int call_search_rewrite_plugins( Operation *op )
{
if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, op->o_pb ) == 0 ) {
if ( slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, op->o_pb ) == 0 ) {
int rc;
/*
......@@ -530,7 +531,7 @@ static int doSearchRewriteFNs( Operation *op )
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ARGS,
"doSearchRewriteFNs: after compute_rewrite_search filter: %s\n",
"call_search_rewrite_plugins: after compute_rewrite_search filter: %s\n",
op->ors_filterstr.bv_len ? op->ors_filterstr.bv_val : "empty", 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, " after compute_rewrite_search filter: %s\n",
......@@ -541,20 +542,20 @@ static int doSearchRewriteFNs( Operation *op )
return LDAP_SUCCESS;
}
static void doPostSearchPluginFNs( Operation *op )
static void call_search_postop_plugins( Operation *op )
{
if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_SEARCH_FN, op->o_pb ) < 0 ) {
if ( slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_SEARCH_FN, op->o_pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "doPostSearchPluginFNs: search postoperation plugins "
LDAP_LOG( OPERATION, INFO, "call_search_postop_plugins: search postoperation plugins "
"failed\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE, "doPostSearchPluginFNs: search postoperation plugins "
Debug(LDAP_DEBUG_TRACE, "call_search_postop_plugins: search postoperation plugins "
"failed.\n", 0, 0, 0);
#endif
}
}
void dummy(void)
void slapi_int_dummy(void)
{
/*
* XXX slapi_search_internal() was no getting pulled
......
......@@ -30,7 +30,7 @@
*/
#include <ltdl.h>
static int loadPlugin( Slapi_PBlock *, const char *, const char *, int,
static int slapi_int_load_plugin( Slapi_PBlock *, const char *, const char *, int,
SLAPI_FUNC *, lt_dlhandle * );
/* pointer to link list of extended objects */
......@@ -39,7 +39,7 @@ static ExtendedOp *pGExtendedOps = NULL;
static Slapi_PBlock *pGPlugins = NULL;
/*********************************************************************
* Function Name: newPlugin
* Function Name: plugin_pblock_new
*
* Description: This routine creates a new Slapi_PBlock structure,
* loads in the plugin module and executes the init
......@@ -61,8 +61,8 @@ static Slapi_PBlock *pGPlugins = NULL;
* Messages: None
*********************************************************************/
Slapi_PBlock *
newPlugin(
static Slapi_PBlock *
plugin_pblock_new(
int type,
const char *path,
const char *initfunc,
......@@ -95,14 +95,14 @@ newPlugin(
goto done;
}
rc = loadPlugin( pPlugin, path, initfunc, TRUE, NULL, &hdLoadHandle );
rc = slapi_int_load_plugin( pPlugin, path, initfunc, TRUE, NULL, &hdLoadHandle );
if ( rc != 0 ) {
goto done;
}
if ( slapi_pblock_get( pPlugin, SLAPI_PLUGIN_DESCRIPTION, (void **)&pPluginDesc ) == 0 &&
pPluginDesc != NULL ) {
slapi_log_error(SLAPI_LOG_TRACE, "newPlugin",
slapi_log_error(SLAPI_LOG_TRACE, "plugin_pblock_new",
"Registered plugin %s %s [%s] (%s)\n",
pPluginDesc->spd_id,
pPluginDesc->spd_version,
......@@ -120,7 +120,7 @@ done:
}
/*********************************************************************
* Function Name: insertPlugin
* Function Name: slapi_int_register_plugin
*
* Description: insert the slapi_pblock structure to the end of the plugin
* list
......@@ -136,7 +136,7 @@ done:
* Messages: None
*********************************************************************/
int
insertPlugin(
slapi_int_register_plugin(
Backend *be,
Slapi_PBlock *pPB )
{
......@@ -174,7 +174,7 @@ insertPlugin(
}
/*********************************************************************
* Function Name: getAllPluginFuncs
* Function Name: slapi_int_get_plugins
*
* Description: get the desired type of function pointers defined
* in all the plugins
......@@ -190,7 +190,7 @@ insertPlugin(
* Messages: None
*********************************************************************/
int
getAllPluginFuncs(
slapi_int_get_plugins(
Backend *be,
int functype,
SLAPI_FUNC **ppFuncPtrs )
......@@ -331,7 +331,7 @@ createExtendedOp()
/*********************************************************************
* Function Name: removeExtendedOp
* Function Name: slapi_int_unregister_extop
*
* Description: This routine removes the ExtendedOp structures
* asscoiated with a particular extended operation
......@@ -349,7 +349,7 @@ createExtendedOp()
* Messages: None
*********************************************************************/
void
removeExtendedOp(
slapi_int_unregister_extop(
Backend *pBE,
ExtendedOp **opList,
Slapi_PBlock *pPB )
......@@ -398,7 +398,7 @@ removeExtendedOp(
/*********************************************************************
* Function Name: newExtendedOp
* Function Name: slapi_int_register_extop
*
* Description: This routine creates a new ExtendedOp structure, loads
* in the extended op module and put the extended op function address
......@@ -417,7 +417,7 @@ removeExtendedOp(
* Messages: None
*********************************************************************/
int
newExtendedOp(
slapi_int_register_extop(
Backend *pBE,
ExtendedOp **opList,
Slapi_PBlock *pPB )
......@@ -485,7 +485,7 @@ error_return:
}
/*********************************************************************
* Function Name: getPluginFunc
* Function Name: slapi_int_get_extop_plugin
*
* Description: This routine gets the function address for a given function
* name.
......@@ -501,7 +501,7 @@ error_return:
* Messages: None
*********************************************************************/
int
getPluginFunc(
slapi_int_get_extop_plugin(
struct berval *reqoid,
SLAPI_FUNC *pFuncAddr )
{
......@@ -532,12 +532,12 @@ getPluginFunc(
}
/***************************************************************************
* This function is similar to getPluginFunc above. except it returns one OID
* This function is similar to slapi_int_get_extop_plugin above. except it returns one OID
* per call. It is called from root_dse_info (root_dse.c).
* The function is a modified version of get_supported_extop (file extended.c).
***************************************************************************/
struct berval *
ns_get_supported_extop( int index )
slapi_int_get_supported_extop( int index )
{
ExtendedOp *ext;
......@@ -554,7 +554,7 @@ ns_get_supported_extop( int index )
}
/*********************************************************************
* Function Name: loadPlugin
* Function Name: slapi_int_load_plugin
*
* Description: This routine loads the specified DLL, gets and executes the init function
* if requested.
......@@ -578,7 +578,7 @@ ns_get_supported_extop( int index )
*********************************************************************/
static int
loadPlugin(
slapi_int_load_plugin(
Slapi_PBlock *pPlugin,
const char *path,