From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Sun, 28 Mar 2021 08:59:46 +0000 (+0200)
Subject: rda
X-Git-Tag: exim-4.95-RC0~14^2~21
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=e8b8b133c685e7b09f672016d117c7d8b49e70b1;p=user%2Fhenk%2Fcode%2Fexim.git

rda

(cherry picked from commit a6da9c67acaee699616516be141d600cc178a633)
---

diff --git a/src/src/rda.c b/src/src/rda.c
index fb3714ea2..3b458430a 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -179,10 +179,8 @@ struct stat statbuf;
 /* Reading a file is a form of expansion; we wish to deny attackers the
 capability to specify the file name. */
 
-if (is_tainted(filename))
+if (*error = is_tainted2(filename, 0, "Tainted name '%s' for file read not permitted\n", filename))
   {
-  *error = string_sprintf("Tainted name '%s' for file read not permitted\n",
-			filename);
   *yield = FF_ERROR;
   return NULL;
   }