From e1af76425323a9546eaf5dd31b66af598ba8f27a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 11 Feb 2015 19:37:16 +0000 Subject: [PATCH] Fix reduce expansion. Broken-by: 55414b25bee9 --- src/src/expand.c | 2 +- src/src/functions.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/expand.c b/src/src/expand.c index 145b827dc..8a7a27e8a 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -5501,7 +5501,7 @@ while (*s != 0) while (isspace(*s)) s++; if (*s++ != '{') goto EXPAND_FAILED_CURLY; t = expand_string_internal(s, TRUE, &s, skipping, TRUE, &resetok); - if (temp == NULL) goto EXPAND_FAILED; + if (!t) goto EXPAND_FAILED; lookup_value = t; if (*s++ != '}') goto EXPAND_FAILED_CURLY; } diff --git a/src/src/functions.h b/src/src/functions.h index bb3f3f46b..49bb5a952 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -86,7 +86,7 @@ extern tree_node *acl_var_create(uschar *); extern void acl_var_write(uschar *, uschar *, void *); extern uschar *auth_b64encode(uschar *, int); extern int auth_b64decode(uschar *, uschar **); -extern int auth_call_pam(uschar *, uschar **); +extern int auth_call_pam(const uschar *, uschar **); extern int auth_call_pwcheck(uschar *, uschar **); extern int auth_call_radius(const uschar *, uschar **); extern int auth_call_saslauthd(const uschar *, const uschar *, -- 2.25.1