]> git.sur5r.net Git - openldap/commitdiff
treat extra args as errors
authorPierangelo Masarati <ando@openldap.org>
Fri, 29 Jul 2005 09:01:44 +0000 (09:01 +0000)
committerPierangelo Masarati <ando@openldap.org>
Fri, 29 Jul 2005 09:01:44 +0000 (09:01 +0000)
servers/slapd/config.c

index a488bdd3d2d8e716877d7302a8b2ce04066314d8..40be0f7ba59d982177f86d8ff6ad259c8128d7b6 100644 (file)
@@ -136,9 +136,19 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                return(ARG_BAD_CONF);
        }
        if(Conf->max_args && (c->argc > Conf->max_args)) {
-               sprintf( c->msg, "<%s> extra cruft after <%s> ignored",
+               char    *ignored = " ignored";
+
+               sprintf( c->msg, "<%s> extra cruft after <%s>",
                        c->argv[0], Conf->what );
-               Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
+
+#ifdef LDAP_DEVEL
+               ignored = "";
+#endif /* LDAP_DEVEL */
+               Debug(LDAP_DEBUG_CONFIG, "%s: %s%s.\n",
+                               c->log, c->msg, ignored );
+#ifdef LDAP_DEVEL
+               return(ARG_BAD_CONF);
+#endif /* LDAP_DEVEL */
        }
        if((arg_type & ARG_DB) && !c->be) {
                sprintf( c->msg, "<%s> only allowed within database declaration",