From 26b86dbea2d07b7cb5d71502dbc7333b1c00a93d Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin.dahyabhai@pobox.com>
Date: Wed, 25 Jun 2008 18:54:55 -0400
Subject: - clean up to not set defaults which we may not be overriding

---
 src/defaults.c | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'src/defaults.c')

diff --git a/src/defaults.c b/src/defaults.c
index 08dc59f..455a07f 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -171,24 +171,6 @@ defaults_get_map_config(const char *mapname,
 			const char **disallowed_chars)
 {
 	unsigned int i;
-	if (secure) {
-		*secure = DEFAULT_MAP_SECURE;
-	}
-	if (filter) {
-		*filter = DEFAULT_ENTRY_FILTER;
-	}
-	if (key_format) {
-		*key_format = DEFAULT_KEY_FORMAT;
-	}
-	if (keys_format) {
-		*keys_format = DEFAULT_KEYS_FORMAT;
-	}
-	if (value_format) {
-		*value_format = DEFAULT_VALUE_FORMAT;
-	}
-	if (disallowed_chars) {
-		*disallowed_chars = DEFAULT_DISALLOWED_CHARS;
-	}
 	for (i = 0; i < sizeof(config) / sizeof(config[0]); i++) {
 		bool_t match;
 		match = FALSE;
@@ -205,6 +187,9 @@ defaults_get_map_config(const char *mapname,
 			}
 			break;
 		}
+		if (!match) {
+			continue;
+		}
 		if (secure) {
 			*secure = config[i].secure;
 		}
@@ -223,5 +208,26 @@ defaults_get_map_config(const char *mapname,
 		if (disallowed_chars) {
 			*disallowed_chars = config[i].disallowed_chars;
 		}
+		break;
+	}
+	if (i >= (sizeof(config) / sizeof(config[0]))) {
+		if (secure) {
+			*secure = DEFAULT_MAP_SECURE;
+		}
+		if (filter) {
+			*filter = DEFAULT_ENTRY_FILTER;
+		}
+		if (key_format) {
+			*key_format = DEFAULT_KEY_FORMAT;
+		}
+		if (keys_format) {
+			*keys_format = DEFAULT_KEYS_FORMAT;
+		}
+		if (value_format) {
+			*value_format = DEFAULT_VALUE_FORMAT;
+		}
+		if (disallowed_chars) {
+			*disallowed_chars = DEFAULT_DISALLOWED_CHARS;
+		}
 	}
 }
-- 
cgit