From 8621f955b2288eb0e286a05f5a4585a211e1a159 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Thu, 23 Jan 2003 11:29:52 +0000 Subject: [PATCH] Reference slapi_search_internal() due to linker error -- need to fix this properly XXX --- servers/slapd/search.c | 14 ++++++++++++-- servers/slapd/slapi/slapi_ops.c | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 481af2ce28..801600be90 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -489,10 +489,10 @@ static int doPreSearchPluginFNs( Backend *be, Slapi_PBlock *pb ) */ #ifdef NEW_LOGGING LDAP_LOG( OPERATION, INFO, "doPreSearchPluginFNs: search preoperation plugin " - "failed\n", 0, 0, 0 ); + "returned %d\n", rc, 0, 0 ); #else Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin " - "failed.\n", 0, 0, 0); + "returned %d.\n", rc, 0, 0); #endif if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) rc = LDAP_OTHER; @@ -540,5 +540,15 @@ static int doPostSearchPluginFNs( Backend *be, Slapi_PBlock *pb ) return LDAP_SUCCESS; } + +void dummy(void) +{ + /* + * XXX slapi_search_internal() was no getting pulled + * in; all manner of linker flags failed to link it. + * FIXME + */ + slapi_search_internal( NULL, 0, NULL, NULL, NULL, 0 ); +} #endif /* LDAP_SLAPI */ diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c index b0d2bbf5c6..aff7521afa 100644 --- a/servers/slapd/slapi/slapi_ops.c +++ b/servers/slapd/slapi/slapi_ops.c @@ -1271,7 +1271,8 @@ slapi_search_internal( #if defined(LDAP_SLAPI) return slapi_search_internal_bind( NULL, base, scope, filStr, controls, attrs, attrsonly ); -#endif +#else return NULL; +#endif /* LDAP_SLAPI */ } -- 2.39.5