From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 16 May 2023 06:06:01 +0000 (+0300)
Subject: auth: passdb/userdb-lua - Refactor to use t_split_key_value_eq()
X-Git-Tag: 2.4.0~2755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617acb9efde76961b877e835252956d13f112ae6;p=thirdparty%2Fdovecot%2Fcore.git

auth: passdb/userdb-lua - Refactor to use t_split_key_value_eq()
---

diff --git a/src/auth/passdb-lua.c b/src/auth/passdb-lua.c
index 5fbc5927e6..4c676aca25 100644
--- a/src/auth/passdb-lua.c
+++ b/src/auth/passdb-lua.c
@@ -107,16 +107,19 @@ static struct passdb_module *
 passdb_lua_preinit(pool_t pool, const char *args)
 {
 	const char *cache_key = DB_LUA_CACHE_KEY;
-	const char *value, *scheme = "PLAIN";
+	const char *scheme = "PLAIN";
 	struct dlua_passdb_module *module;
 	bool blocking = TRUE;
 
 	module = p_new(pool, struct dlua_passdb_module, 1);
 	const char *const *fields = t_strsplit_spaces(args, " ");
 	while(*fields != NULL) {
-		if (str_begins(*fields, "file=", &value)) {
+		const char *key, *value;
+		if (!t_split_key_value_eq(*fields, &key, &value)) {
+			i_fatal("Unsupported parameter %s", *fields);
+		} else if (strcmp(key, "file") == 0) {
 			 module->file = p_strdup(pool, value);
-		} else if (str_begins(*fields, "blocking=", &value)) {
+		} else if (strcmp(key, "blocking") == 0) {
 			if (strcmp(value, "yes") == 0) {
 				blocking = TRUE;
 			} else if (strcmp(value, "no") == 0) {
@@ -126,12 +129,12 @@ passdb_lua_preinit(pool_t pool, const char *args)
 					"Field blocking must be yes or no",
 					value);
 			}
-                } else if (str_begins(*fields, "cache_key=", &value)) {
+                } else if (strcmp(key, "cache_key") == 0) {
                         if (value[0] != '\0')
                                 cache_key = value;
                         else /* explicitly disable auth caching for lua */
                                 cache_key = NULL;
-		} else if (str_begins(*fields, "scheme=", &value)) {
+		} else if (strcmp(key, "scheme") == 0) {
 			scheme = p_strdup(pool, value);
 		} else {
 			i_fatal("Unsupported parameter %s", *fields);
diff --git a/src/auth/userdb-lua.c b/src/auth/userdb-lua.c
index f08755b2cc..5546c94b66 100644
--- a/src/auth/userdb-lua.c
+++ b/src/auth/userdb-lua.c
@@ -33,15 +33,18 @@ static struct userdb_module *
 userdb_lua_preinit(pool_t pool, const char *args)
 {
 	struct dlua_userdb_module *module;
-	const char *value, *cache_key = DB_LUA_CACHE_KEY;
+	const char *cache_key = DB_LUA_CACHE_KEY;
 	bool blocking = TRUE;
 
 	module = p_new(pool, struct dlua_userdb_module, 1);
 	const char *const *fields = t_strsplit_spaces(args, " ");
 	while(*fields != NULL) {
-		if (str_begins(*fields, "file=", &value))
-			module->file = p_strdup(pool, value);
-		else if (str_begins(*fields, "blocking=", &value)) {
+		const char *key, *value;
+		if (!t_split_key_value_eq(*fields, &key, &value)) {
+			i_fatal("Unsupported parameter %s", *fields);
+		} else if (strcmp(key, "file") == 0) {
+			 module->file = p_strdup(pool, value);
+		} else if (strcmp(key, "blocking") == 0) {
 			if (strcmp(value, "yes") == 0) {
 				blocking = TRUE;
 			} else if (strcmp(value, "no") == 0) {
@@ -51,11 +54,11 @@ userdb_lua_preinit(pool_t pool, const char *args)
 					"Field blocking must be yes or no",
 					value);
 			}
-		} else if (str_begins(*fields, "cache_key=", &value)) {
-			if (value[0] != '\0')
-				cache_key = value;
-			else /* explicitly disable auth caching for lua */
-				cache_key = NULL;
+                } else if (strcmp(key, "cache_key") == 0) {
+                        if (value[0] != '\0')
+                                cache_key = value;
+                        else /* explicitly disable auth caching for lua */
+                                cache_key = NULL;
 		} else {
 			i_fatal("Unsupported parameter %s", *fields);
 		}