git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "GnuTLS: lose DH-param setup, for recent library versions where no longer...
[exim.git]
/
src
/
src
/
sieve.c
diff --git
a/src/src/sieve.c
b/src/src/sieve.c
index 18aa3e609ead7f995d2bcde2bbd63473d0379e79..bd0c9b28eeb7e05a59d09e2aa677514c2d7c3479 100644
(file)
--- a/
src/src/sieve.c
+++ b/
src/src/sieve.c
@@
-3,7
+3,7
@@
*************************************************/
/* Copyright (c) Michael Haardt 2003 - 2015
*************************************************/
/* Copyright (c) Michael Haardt 2003 - 2015
- * Copyright (c) The Exim Maintainers 2016 - 202
0
+ * Copyright (c) The Exim Maintainers 2016 - 202
1
* See the file NOTICE for conditions of use and distribution.
*/
* See the file NOTICE for conditions of use and distribution.
*/
@@
-3087,11
+3087,8
@@
while (*filter->pc)
if ((pid = child_open_exim2(&fd, envelope_from, envelope_from,
US"sieve-notify")) >= 1)
{
if ((pid = child_open_exim2(&fd, envelope_from, envelope_from,
US"sieve-notify")) >= 1)
{
- FILE *f;
- uschar *buffer;
- int buffer_capacity;
+ FILE * f = fdopen(fd, "wb");
- f = fdopen(fd, "wb");
fprintf(f,"From: %s\n", from.length == -1
? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain")
: from.character);
fprintf(f,"From: %s\n", from.length == -1
? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain")
: from.character);
@@
-3104,12
+3101,9
@@
while (*filter->pc)
message.character=US"Notification";
message.length=Ustrlen(message.character);
}
message.character=US"Notification";
message.length=Ustrlen(message.character);
}
- /* Allocation is larger than necessary, but enough even for split MIME words */
- buffer_capacity = 32 + 4*message.length;
- buffer=store_get(buffer_capacity, TRUE);
if (message.length != -1)
fprintf(f, "Subject: %s\n", parse_quote_2047(message.character,
if (message.length != -1)
fprintf(f, "Subject: %s\n", parse_quote_2047(message.character,
- message.length, US"utf-8",
buffer, buffer_capacity,
TRUE));
+ message.length, US"utf-8", TRUE));
fprintf(f,"\n");
if (body.length>0) fprintf(f,"%s\n",body.character);
fflush(f);
fprintf(f,"\n");
if (body.length>0) fprintf(f,"%s\n",body.character);
fflush(f);
@@
-3263,8
+3257,6
@@
while (*filter->pc)
if (exec)
{
address_item *addr;
if (exec)
{
address_item *addr;
- uschar *buffer;
- int buffer_capacity;
md5 base;
uschar digest[16];
uschar hexdigest[33];
md5 base;
uschar digest[16];
uschar hexdigest[33];
@@
-3342,11
+3334,8
@@
while (*filter->pc)
addr->reply->from = expand_string(US"$local_part@$domain");
else
addr->reply->from = from.character;
addr->reply->from = expand_string(US"$local_part@$domain");
else
addr->reply->from = from.character;
- /* Allocation is larger than necessary, but enough even for split MIME words */
- buffer_capacity=32+4*subject.length;
- buffer = store_get(buffer_capacity, is_tainted(subject.character));
/* deconst cast safe as we pass in a non-const item */
/* deconst cast safe as we pass in a non-const item */
- addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8",
buffer, buffer_capacity,
TRUE);
+ addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", TRUE);
addr->reply->oncelog = string_from_gstring(once);
addr->reply->once_repeat=days*86400;
addr->reply->oncelog = string_from_gstring(once);
addr->reply->once_repeat=days*86400;
@@
-3573,9
+3562,6
@@
struct Sieve sieve;
int r;
uschar *msg;
int r;
uschar *msg;
-options = options; /* Keep picky compilers happy */
-error = error;
-
DEBUG(D_route) debug_printf("Sieve: start of processing\n");
sieve.filter = filter;
DEBUG(D_route) debug_printf("Sieve: start of processing\n");
sieve.filter = filter;