From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 2 Nov 2016 13:43:37 +0000 (+0200)
Subject: auth: Fixes to previous var_expand() change.
X-Git-Tag: 2.3.0.rc1~2698
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dec95fbca4f662fa0f2b480f175679116e33fafa;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fixes to previous var_expand() change.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index f0de6233f5..f50988b845 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1914,7 +1914,7 @@ void auth_request_init_userdb_reply(struct auth_request *request)
 
 	request->userdb_reply = auth_fields_init(request->pool);
 	if (userdb_template_export(request->userdb->default_fields_tmpl,
-				   request, &error) <= 0) {
+				   request, &error) < 0) {
 		auth_request_log_error(request, AUTH_SUBSYS_DB,
 			"Failed to expand default_fields: %s", error);
 	}
diff --git a/src/auth/test-auth-request-var-expand.c b/src/auth/test-auth-request-var-expand.c
index bf4e3a767d..fa18ee3de0 100644
--- a/src/auth/test-auth-request-var-expand.c
+++ b/src/auth/test-auth-request-var-expand.c
@@ -220,7 +220,7 @@ static void test_auth_request_var_expand_funcs(void)
 			"%{passdb:pkey2}\n%{passdb:pkey2:default2}\n"
 			"%{passdb:pkey3}\n%{passdb:pkey3:default3}\n"
 			"%{passdb:ukey1}\n%{passdb:ukey1:default4}\n",
-			&test_request, test_escape, &value, &error) == 0);
+			&test_request, test_escape, &value, &error) == 1);
 	test_assert(strcmp(value, "+pval1\n+pval1\n\n\n\ndefault3\n\ndefault4\n") == 0);
 
 	test_assert(t_auth_request_var_expand(
@@ -228,7 +228,7 @@ static void test_auth_request_var_expand_funcs(void)
 			"%{userdb:ukey2}\n%{userdb:ukey2:default2}\n"
 			"%{userdb:ukey3}\n%{userdb:ukey3:default3}\n"
 			"%{userdb:pkey1}\n%{userdb:pkey1:default4}\n",
-			&test_request, test_escape, &value, &error) == 0);
+			&test_request, test_escape, &value, &error) == 1);
 	test_assert(strcmp(value, "+uval1\n+uval1\n\n\n\ndefault3\n\ndefault4\n") == 0);
 
 	pool_unref(&pool);