Plug memory leak

[openldap] / servers / slapd / back-ldbm / config.c

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 2cb64aa675aa263749c569475003c23ccc26427c..2a0a5759ee2ebf6ca9567dcd006b84f068613dbe 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,8 +1,17 @@
 /* config.c - ldbm backend configuration file routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -64,8 +73,11 @@ ldbm_back_db_config(
                        return( 1 );
                } else if ( argc > 3 ) {
                        fprintf( stderr,
-"%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
+"%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                            fname, lineno );
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+                       return( 1 );
+#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
                }
                rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1] );
 
@@ -106,31 +118,18 @@ ldbm_back_db_config(
 #ifndef NO_THREADS
                int i;
                if ( argc < 2 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                               "line %d: missing frequency value in \"dbsync <frequency> "
-                               "[<wait-times> [wait-interval]]\" line\n", fname, lineno ));
-#else  
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: missing frquency value in \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, 0 );
-#endif
                        return 1;
                }
 
                i = atoi( argv[1] );
 
                if( i < 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                               "line %d: frequency value (%d) invalid \"dbsync "
-                               "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                               fname, lineno, i ));
-#else  
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, i );
-#endif
                        return 1;
                }
 
@@ -139,16 +138,9 @@ ldbm_back_db_config(
                if ( argc > 2 ) {
                        i = atoi( argv[2] );
                        if ( i < 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i ));
-#else  
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitn = i;
@@ -157,16 +149,9 @@ ldbm_back_db_config(
                if ( argc > 3 ) {
                        i = atoi( argv[3] );
                        if ( i <= 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i ));
-#else  
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitinterval = i;
@@ -176,22 +161,15 @@ ldbm_back_db_config(
                li->li_dbwritesync = 0;
 
 #else
-#ifdef NEW_LOGGING
-               LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: \"dbsync\""
-                       " policies not supported in non-threaded environments\n" ));
-#else  
                Debug( LDAP_DEBUG_ANY,
     "\"dbsync\" policies not supported in non-threaded environments\n", 0, 0, 0);
-#endif
                return 1;
 #endif
 
 
        /* anything else */
        } else {
-               fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in ldbm database definition (ignored)\n",
-                   fname, lineno, argv[0] );
+               return SLAP_CONF_UNKNOWN;
        }
 
        return 0;