Commit d1970663 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

fix previous commit

parent a444626d
......@@ -11,7 +11,7 @@ install-local: FORCE
for header in $(srcdir)/lber.h lber_types.h \
$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
$(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
ldap_features.h; \
$(srcdir)/slapi-plugin.h ldap_features.h; \
do \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
done
......
......@@ -233,7 +233,6 @@ libslapi.a: .slapi
slapd: $(SLAPD_DEPENDS)
$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
libslapi.a slapi/libtmpslapd.a \
$(WRAP_LIBS)
sslapd: version.o
......
......@@ -106,11 +106,13 @@ do_extended(
struct berval *rspdata;
LDAPControl **rspctrls;
Slapi_PBlock *pb = op->o_pb;
SLAPI_FUNC funcAddr = NULL;
int extop_rc;
int msg_sent=FALSE;
char *result_msg="";
#if defined(LDAP_SLAPI)
Slapi_PBlock *pb = op->o_pb;
SLAPI_FUNC funcAddr = NULL;
int extop_rc;
int msg_sent=FALSE;
char *result_msg="";
#endif /* defined(LDAP_SLAPI) */
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY, "do_extended: conn %d\n", conn->c_connid, 0, 0 );
......@@ -146,10 +148,14 @@ do_extended(
goto done;
}
#if !defined(LDAP_SLAPI)
if( !(ext = find_extop(supp_ext_list, &reqoid)) ) {
#else /* defined(LDAP_SLAPI) */
/* Netscape extended operation */
getPluginFunc( &reqoid, &funcAddr );
if( !(ext = find_extop(supp_ext_list, &reqoid)) && !(funcAddr) ) {
#endif /* defined(LDAP_SLAPI) */
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"do_extended: conn %d unsupported operation \"%s\"\n",
......@@ -215,7 +221,10 @@ do_extended(
text = NULL;
refs = NULL;
#if defined(LDAP_SLAPI)
if (ext != NULL) { /* OpenLDAP extended operation */
#endif /* defined(LDAP_SLAPI) */
rc = (ext->ext_main)( conn, op,
reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL,
&rspoid, &rspdata, &rspctrls, &text, &refs );
......@@ -239,9 +248,8 @@ do_extended(
if ( rspdata != NULL ) {
ber_bvfree( rspdata );
}
#if !defined( LDAP_SLAPI )
}
#else /* defined( LDAP_SLAPI ) */
#if defined( LDAP_SLAPI )
goto done; /* end of OpenLDAP extended operation */
} else { /* start of Netscape extended operation */
......
......@@ -28,7 +28,7 @@ XXLIBS = $(SLAPD_LIBS) \
$(LDBM_LIBS) $(SECURITY_LIBS) \
$(LDIF_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) \
$(SLAPI_LIBS) ../libslapi.a
$(SLAPI_LIBS)
STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment