On 30.05.2017 22:33, Bobber wrote: > Getting this error: > >> In file included from ../../src/lib/lib.h:6:0, >> from auth-common.h:4, >> from userdb-vpopmail.c:5: >> ../../config.h:791:0: note: this is the location of the previous >> definition >> #define VERSION "2.2.30" >> ^ >> userdb-vpopmail.c: In function ‘userdb_vpopmail_get_quota’: >> userdb-vpopmail.c:72:6: error: too many arguments to function >> ‘var_expand’ >> if (var_expand(quota, template, tab, error_r) < 0) >> ^ >> In file included from auth-request.h:5:0, >> from userdb.h:89, >> from userdb-vpopmail.c:6: >> ../../src/lib/var-expand.h:18:6: note: declared here >> void var_expand(string_t *dest, const char *str, >> ^ >> userdb-vpopmail.c:72:2: error: void value not ignored as it ought to be >> if (var_expand(quota, template, tab, error_r) < 0) >
Hi! Seems there has been mistake in porting the patch from master to release... can you try the attached patch? Aki
From ff3c395b4d1ab89a30527b8160b01affaf9f740e Mon Sep 17 00:00:00 2001 From: Aki Tuomi <[email protected]> Date: Wed, 31 May 2017 10:09:41 +0300 Subject: [PATCH] auth: Fix vpopmail for 2.2 --- src/auth/userdb-vpopmail.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c index e3cebf5..cf5bf29 100644 --- a/src/auth/userdb-vpopmail.c +++ b/src/auth/userdb-vpopmail.c @@ -69,9 +69,7 @@ userdb_vpopmail_get_quota(const char *template, const char *vpop_str, tab[0].value = format_maildirquota(vpop_str); quota = t_str_new(128); - if (var_expand(quota, template, tab, error_r) < 0) - return -1; - + var_expand(quota, template, tab); *quota_r = str_c(quota); return 0; } -- 2.1.4
