From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 26 Nov 2018 16:59:35 +0000 (+0200)
Subject: auth: auth-worker-client - Move dbhash_verify to better place
X-Git-Tag: 2.3.9~1056
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b517e12423a3b6ca2aa43efccd6195e7d31751f1;p=thirdparty%2Fdovecot%2Fcore.git

auth: auth-worker-client - Move dbhash_verify to better place

Simplifies next commit
---

diff --git a/src/auth/auth-worker-client.c b/src/auth/auth-worker-client.c
index da42e03a81..3b21023bbc 100644
--- a/src/auth/auth-worker-client.c
+++ b/src/auth/auth-worker-client.c
@@ -660,6 +660,24 @@ auth_worker_handle_list(struct auth_worker_client *client,
 	return TRUE;
 }
 
+static bool auth_worker_verify_db_hash(const char *line)
+{
+	string_t *str;
+	unsigned char passdb_md5[MD5_RESULTLEN];
+	unsigned char userdb_md5[MD5_RESULTLEN];
+
+	passdbs_generate_md5(passdb_md5);
+	userdbs_generate_md5(userdb_md5);
+
+	str = t_str_new(128);
+	str_append(str, "DBHASH\t");
+	binary_to_hex_append(str, passdb_md5, sizeof(passdb_md5));
+	str_append_c(str, '\t');
+	binary_to_hex_append(str, userdb_md5, sizeof(userdb_md5));
+
+	return strcmp(line, str_c(str)) == 0;
+}
+
 static bool
 auth_worker_handle_line(struct auth_worker_client *client, const char *line)
 {
@@ -699,24 +717,6 @@ auth_worker_handle_line(struct auth_worker_client *client, const char *line)
         return ret;
 }
 
-static bool auth_worker_verify_db_hash(const char *line)
-{
-	string_t *str;
-	unsigned char passdb_md5[MD5_RESULTLEN];
-	unsigned char userdb_md5[MD5_RESULTLEN];
-
-	passdbs_generate_md5(passdb_md5);
-	userdbs_generate_md5(userdb_md5);
-
-	str = t_str_new(128);
-	str_append(str, "DBHASH\t");
-	binary_to_hex_append(str, passdb_md5, sizeof(passdb_md5));
-	str_append_c(str, '\t');
-	binary_to_hex_append(str, userdb_md5, sizeof(userdb_md5));
-
-	return strcmp(line, str_c(str)) == 0;
-}
-
 static void auth_worker_input(struct auth_worker_client *client)
 {
 	char *line;