Add note about contrib/slapd-modules

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5e57b2703c761b02cd543e5edc8da3b6549316e9..2c44708bfa93f235f2862e2b8c6e1c2202bc49ca 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -192,7 +192,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                iarg = 0; larg = 0; barg = 0;
                switch(arg_type & ARGS_NUMERIC) {
                        case ARG_INT:
-                               if ( lutil_atoi( &iarg, c->argv[1] ) != 0 ) {
+                               if ( lutil_atoix( &iarg, c->argv[1], 0 ) != 0 ) {
                                        snprintf( c->msg, sizeof( c->msg ),
                                                "<%s> unable to parse \"%s\" as int",
                                                c->argv[0], c->argv[1] );
@@ -202,7 +202,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                }
                                break;
                        case ARG_LONG:
-                               if ( lutil_atol( &larg, c->argv[1] ) != 0 ) {
+                               if ( lutil_atolx( &larg, c->argv[1], 0 ) != 0 ) {
                                        snprintf( c->msg, sizeof( c->msg ),
                                                "<%s> unable to parse \"%s\" as long",
                                                c->argv[0], c->argv[1] );
@@ -213,7 +213,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                break;
                        case ARG_BER_LEN_T: {
                                unsigned long   l;
-                               if ( lutil_atoul( &l, c->argv[1] ) != 0 ) {
+                               if ( lutil_atoulx( &l, c->argv[1], 0 ) != 0 ) {
                                        snprintf( c->msg, sizeof( c->msg ),
                                                "<%s> unable to parse \"%s\" as ber_len_t",
                                                c->argv[0], c->argv[1] );
@@ -237,20 +237,20 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                {
                                        iarg = 0;
                                } else {
-                                       snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value, ignored",
+                                       snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value",
                                                c->argv[0] );
-                                       Debug(LDAP_DEBUG_CONFIG, "%s: %s\n",
+                                       Debug(LDAP_DEBUG_ANY, "%s: %s\n",
                                                c->log, c->msg, 0 );
-                                       return(0);
+                                       return(ARG_BAD_CONF);
                                }
                                break;
                }
                j = (arg_type & ARG_NONZERO) ? 1 : 0;
                if(iarg < j && larg < j && barg < j ) {
                        larg = larg ? larg : (barg ? barg : iarg);
-                       snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value, ignored",
+                       snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value",
                                c->argv[0] );
-                       Debug(LDAP_DEBUG_CONFIG, "%s: %s\n",
+                       Debug(LDAP_DEBUG_ANY, "%s: %s\n",
                                c->log, c->msg, 0 );
                        return(ARG_BAD_CONF);
                }
@@ -628,6 +628,7 @@ config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
        }
        rc = config_check_vals( ct, c, 1 );
        ch_free( c->tline );
+       c->tline = NULL;
 
        if ( rc )
                rc = LDAP_CONSTRAINT_VIOLATION;
@@ -734,15 +735,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                }
 
                if ( c->argc < 1 ) {
-                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: bad config line" 
-                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+                       Debug( LDAP_DEBUG_ANY, "%s: bad config line.\n",
                                c->log, 0, 0);
-#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
                        rc = 1;
                        goto done;
-#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
-                       continue;
-#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                }
 
                c->op = SLAP_CONFIG_ADD;
@@ -779,20 +775,16 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                        if ( rc ) {
                                switch(rc) {
                                case SLAP_CONF_UNKNOWN:
-                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
-                                               "unknown directive <%s> inside backend info definition"
-                                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+                                       Debug( LDAP_DEBUG_ANY, "%s: unknown directive "
+                                               "<%s> inside backend info definition.\n",
                                                c->log, *c->argv, 0);
-#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
-                                       continue;
-#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
                                        goto done;
                                }
                        }
 
-               } else if ( c->be ) {
+               } else if ( c->be && c->be != frontendDB ) {
                        rc = SLAP_CONF_UNKNOWN;
                        if ( c->be->be_cf_ocs ) {
                                ct = config_find_keyword( c->be->be_cf_ocs->co_table, c );
@@ -804,34 +796,39 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                                rc = (*c->be->be_config)(c->be, c->fname, c->lineno,
                                        c->argc, c->argv);
                        }
-                       if ( rc ) {
-                               switch(rc) {
-                               case SLAP_CONF_UNKNOWN:
-                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
-                                               "unknown directive <%s> inside backend database "
-                                               "definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
-                                               c->log, *c->argv, 0);
-#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
-                                       continue;
-#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
-                               default:
-                                       rc = 1;
-                                       goto done;
-                               }
+                       if ( rc == SLAP_CONF_UNKNOWN && SLAP_ISGLOBALOVERLAY( frontendDB ) )
+                       {
+                               /* global overlays may need 
+                                * definitions inside other databases...
+                                */
+                               rc = (*frontendDB->be_config)( frontendDB,
+                                       c->fname, (int)c->lineno, c->argc, c->argv );
+                       }
+
+                       switch ( rc ) {
+                       case 0:
+                               break;
+
+                       case SLAP_CONF_UNKNOWN:
+                               Debug( LDAP_DEBUG_ANY, "%s: unknown directive "
+                                       "<%s> inside backend database definition.\n",
+                                       c->log, *c->argv, 0);
+                               
+                       default:
+                               rc = 1;
+                               goto done;
                        }
 
                } else if ( frontendDB->be_config ) {
-                       rc = (*frontendDB->be_config)(frontendDB, c->fname, (int)c->lineno, c->argc, c->argv);
+                       rc = (*frontendDB->be_config)( frontendDB,
+                               c->fname, (int)c->lineno, c->argc, c->argv);
                        if ( rc ) {
                                switch(rc) {
                                case SLAP_CONF_UNKNOWN:
-                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
-                                               "unknown directive <%s> inside global database definition"
-                                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+                                       Debug( LDAP_DEBUG_ANY, "%s: unknown directive "
+                                               "<%s> inside global database definition.\n",
                                                c->log, *c->argv, 0);
-#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
-                                       continue;
-#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
+
                                default:
                                        rc = 1;
                                        goto done;
@@ -839,16 +836,11 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                        }
                        
                } else {
-                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
-                               "unknown directive <%s> outside backend info and database definitions"
-                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+                       Debug( LDAP_DEBUG_ANY, "%s: unknown directive "
+                               "<%s> outside backend info and database definitions.\n",
                                c->log, *c->argv, 0);
-#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
                        rc = 1;
                        goto done;
-#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
-                       continue;
-#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                }
        }
 
@@ -867,9 +859,9 @@ done:
 int
 verb_to_mask(const char *word, slap_verbmasks *v) {
        int i;
-       for(i = 0; !BER_BVISNULL(&v[i].word); i++)
-               if(!strcasecmp(word, v[i].word.bv_val))
-                       break;
+       for(i = 0; !BER_BVISNULL(&v[i].word); i++) {
+               if(!strcasecmp(word, v[i].word.bv_val)) break;
+       }
        return(i);
 }
 
@@ -913,8 +905,7 @@ slap_verbmasks_init( slap_verbmasks **vp, slap_verbmasks *v )
 
        assert( *vp == NULL );
 
-       for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ )
-               ;
+       for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ ) /* EMPTY */;
 
        *vp = ch_calloc( i + 1, sizeof( slap_verbmasks ) );