Fix void* pointer arithmetic from ber_bvchr()

[openldap] / servers / slapd / overlays / overlays.c

diff --git a/servers/slapd/overlays/overlays.c b/servers/slapd/overlays/overlays.c
index 8d2a348989a1d0fa6dec6f73768f75b76340fb3a..0f46ae2cf2841b44c02a02ea610cfba2aa01f02d 100644 (file)
--- a/servers/slapd/overlays/overlays.c
+++ b/servers/slapd/overlays/overlays.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2005 The OpenLDAP Foundation.
  * Copyright 2003 by Howard Chu.
  * All rights reserved.
  *
@@ -23,8 +23,8 @@
 
 #include "slap.h"
 
-#if SLAPD_OVER_CHAIN == SLAPD_MOD_STATIC
-extern int chain_init();
+#if SLAPD_OVER_ACCESSLOG == SLAPD_MOD_STATIC
+extern int accesslog_init();
 #endif
 #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC
 extern int denyop_init();
@@ -32,6 +32,12 @@ extern int denyop_init();
 #if SLAPD_OVER_DYNGROUP == SLAPD_MOD_STATIC
 extern int dyngroup_init();
 #endif
+#if SLAPD_OVER_DYNLIST == SLAPD_MOD_STATIC
+extern int dynlist_init();
+#endif
+#if SLAPD_OVER_GLUE == SLAPD_MOD_STATIC
+extern int glue_init();
+#endif
 #if SLAPD_OVER_LASTMOD == SLAPD_MOD_STATIC
 extern int lastmod_init();
 #endif
@@ -44,19 +50,31 @@ extern int pcache_init();
 #if SLAPD_OVER_REFINT == SLAPD_MOD_STATIC
 extern int refint_init();
 #endif
+#if SLAPD_OVER_RETCODE == SLAPD_MOD_STATIC
+extern int retcode_init();
+#endif
 #if SLAPD_OVER_RWM == SLAPD_MOD_STATIC
 extern int rwm_init();
 #endif
+#if SLAPD_OVER_SYNCPROV == SLAPD_MOD_STATIC
+extern int syncprov_init();
+#endif
+#if SLAPD_OVER_TRANSLUCENT == SLAPD_MOD_STATIC
+extern int translucent_init();
+#endif
 #if SLAPD_OVER_UNIQUE == SLAPD_MOD_STATIC
 extern int unique_init();
 #endif
+#if SLAPD_OVER_VALSORT == SLAPD_MOD_STATIC
+extern int valsort_init();
+#endif
 
 static struct {
        char *name;
        int (*func)();
 } funcs[] = {
-#if SLAPD_OVER_CHAIN == SLAPD_MOD_STATIC
-       { "LDAP Chain Response", chain_init },
+#if SLAPD_OVER_ACCESSLOG == SLAPD_MOD_STATIC
+       { "Access Log", accesslog_init },
 #endif
 #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC
        { "Deny Operation", denyop_init },
@@ -64,6 +82,12 @@ static struct {
 #if SLAPD_OVER_DYNGROUP == SLAPD_MOD_STATIC
        { "Dynamic Group", dyngroup_init },
 #endif
+#if SLAPD_OVER_DYNLIST == SLAPD_MOD_STATIC
+       { "Dynamic List", dynlist_init },
+#endif
+#if SLAPD_OVER_GLUE == SLAPD_MOD_STATIC
+       { "Backend Glue", glue_init },
+#endif
 #if SLAPD_OVER_LASTMOD == SLAPD_MOD_STATIC
        { "Last Modification", lastmod_init },
 #endif
@@ -76,11 +100,23 @@ static struct {
 #if SLAPD_OVER_REFINT == SLAPD_MOD_STATIC
        { "Referential Integrity", refint_init },
 #endif
+#if SLAPD_OVER_RETCODE == SLAPD_MOD_STATIC
+       { "Return Code", retcode_init },
+#endif
 #if SLAPD_OVER_RWM == SLAPD_MOD_STATIC
        { "Rewrite/Remap", rwm_init },
 #endif
+#if SLAPD_OVER_SYNCPROV == SLAPD_MOD_STATIC
+       { "Syncrepl Provider", syncprov_init },
+#endif
+#if SLAPD_OVER_TRANSLUCENT == SLAPD_MOD_STATIC
+       { "Translucent Proxy", translucent_init },
+#endif
 #if SLAPD_OVER_UNIQUE == SLAPD_MOD_STATIC
        { "Attribute Uniqueness", unique_init },
+#endif
+#if SLAPD_OVER_VALSORT == SLAPD_MOD_STATIC
+       { "Value Sorting", valsort_init },
 #endif
        { NULL, NULL }
 };
@@ -93,13 +129,8 @@ overlay_init(void)
        for ( i=0; funcs[i].name; i++ ) {
                rc = funcs[i].func();
                if ( rc ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, ERR,
-               "%s overlay setup failed, err %d\n", funcs[i].name, rc, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                "%s overlay setup failed, err %d\n", funcs[i].name, rc, 0 );
-#endif
                        break;
                }
        }