]> git.sur5r.net Git - openldap/commitdiff
ITS#8016 return errmsg for unknown envflags
authorHoward Chu <hyc@openldap.org>
Mon, 5 Jan 2015 09:37:27 +0000 (09:37 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 5 Jan 2015 20:00:09 +0000 (14:00 -0600)
servers/slapd/back-mdb/config.c

index 5b402c55a10e98225268c97c4b70c91197f975d9..4c11f678ad771a3d420b2fb821706c706f68bd14 100644 (file)
@@ -406,6 +406,9 @@ mdb_cf_gen( ConfigArgs *c )
                                        mdb->mi_dbenv_flags ^= mdb_envflags[i].mask;
                                } else {
                                        /* unknown keyword */
+                                       snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s: unknown keyword \"%s\"",
+                                               c->argv[0], c->argv[i] );
+                                       Debug( LDAP_DEBUG_CONFIG, "%s %s\n", c->log, c->cr_msg, 0 );
                                        rc = 1;
                                }
                        }
@@ -608,7 +611,10 @@ mdb_cf_gen( ConfigArgs *c )
                                mdb->mi_dbenv_flags |= mdb_envflags[j].mask;
                        } else {
                                /* unknown keyword */
-                               rc = 1;
+                               snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s: unknown keyword \"%s\"",
+                                       c->argv[0], c->argv[i] );
+                               Debug( LDAP_DEBUG_ANY, "%s %s\n", c->log, c->cr_msg, 0 );
+                               return 1;
                        }
                }
                }