servers/slapd/overlays/overlays.c - diff

Return to overlays.c CVS log

Up to [OpenLDAP] / servers / slapd / overlays

Diff for /servers/slapd/overlays/overlays.c between versions 1.12.2.6 and 1.12.2.7

-version 1.12.2.6, 2005/08/25 05:01:19
+version 1.12.2.7, 2005/11/26 23:54:51
  Line 1
  /* overlays.c - Static overlay framework */
- /* $OpenLDAP: pkg/ldap/servers/slapd/overlays/overlays.c,v 1.22 2005/08/23 06:52:01 hyc Exp $ */
+ /* $OpenLDAP: pkg/ldap/servers/slapd/overlays/overlays.c,v 1.12.2.6 2005/08/25 05:01:19 kurt Exp $ */
  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
   *
   * Copyright 2003-2005 The OpenLDAP Foundation.
  Line 23
  #include "slap.h"
- #if SLAPD_OVER_ACCESSLOG == SLAPD_MOD_STATIC
+ extern OverlayInit      slap_oinfo[];
- extern int accesslog_init();
- #endif
- #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC
- extern int denyop_init();
- #endif
- #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
- #if SLAPD_OVER_PPOLICY == SLAPD_MOD_STATIC
- extern int ppolicy_init();
- #endif
- #if SLAPD_OVER_PROXYCACHE == SLAPD_MOD_STATIC
- extern int pcache_init();
- #endif
- #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_ACCESSLOG == SLAPD_MOD_STATIC
-         { "Access Log", accesslog_init },
- #endif
- #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC
-         { "Deny Operation", denyop_init },
- #endif
- #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
- #if SLAPD_OVER_PPOLICY == SLAPD_MOD_STATIC
-         { "Password Policy", ppolicy_init },
- #endif
- #if SLAPD_OVER_PROXYCACHE == SLAPD_MOD_STATIC
-         { "Proxy Cache", pcache_init },
- #endif
- #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 }
- };
  int
  overlay_init(void)
  {
          int i, rc = 0;
-         for ( i=0; funcs[i].name; i++ ) {
+         for ( i= 0 ; slap_oinfo[i].ov_type; i++ ) {
-                 rc = funcs[i].func();
+                 rc = slap_oinfo[i].ov_init();
                  if ( rc ) {
                          Debug( LDAP_DEBUG_ANY,
-                 "%s overlay setup failed, err %d\n", funcs[i].name, rc, 0 );
+                                 "%s overlay setup failed, err %d\n",
+                                 slap_oinfo[i].ov_type, rc, 0 );
                          break;
                  }
          }
          return rc;
  }

______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org

Removed from v.1.12.2.6
changed lines
	Added in v.1.12.2.7