(Partial) Sync with HEAD

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 56295fed6fdc5065683981a63f57682af6b3eaa1..9b7bcf6e3fa003347b000c666839afda67097438 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -37,7 +37,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 #include "lutil.h"
 
@@ -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 );
                        }