summaryrefslogtreecommitdiffstats
path: root/debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:44:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 09:44:08 +0000
commit933bbaf3ed7bd659a5c044745aea763815928598 (patch)
tree6fe3906ff9f7121999800da3683c206d128b7d39 /debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch
parentAdding upstream version 4.94.2. (diff)
downloadexim4-933bbaf3ed7bd659a5c044745aea763815928598.tar.xz
exim4-933bbaf3ed7bd659a5c044745aea763815928598.zip
Adding debian version 4.94.2-7+deb11u2.debian/4.94.2-7+deb11u2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch')
-rw-r--r--debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch b/debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch
new file mode 100644
index 0000000..a660aeb
--- /dev/null
+++ b/debian/patches/75_20-Set-mainlog_name-and-rejectlog_name-unconditionally.patch
@@ -0,0 +1,42 @@
+From 41c494e2465efadc2e82002a07430e8aec85bc9b Mon Sep 17 00:00:00 2001
+From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
+Date: Mon, 12 Apr 2021 08:41:44 +0200
+Subject: [PATCH 20/23] Set mainlog_name and rejectlog_name unconditionally.
+
+(cherry picked from commit 3f06b9b4c7244b169d50bce216c1f54b4dfe7efb)
+---
+ src/log.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/log.c b/src/log.c
+index 99eba5f90..011c4debc 100644
+--- a/src/log.c
++++ b/src/log.c
+@@ -402,18 +402,20 @@ it gets statted to see if it has been cycled. With a datestamp, the datestamp
+ will be compared. The static slot for saving it is the same size as buffer,
+ and the text has been checked above to fit, so this use of strcpy() is OK. */
+
+-if (type == lt_main && string_datestamp_offset >= 0)
++if (type == lt_main)
+ {
+ Ustrcpy(mainlog_name, buffer);
+- mainlog_datestamp = mainlog_name + string_datestamp_offset;
++ if (string_datestamp_offset > 0)
++ mainlog_datestamp = mainlog_name + string_datestamp_offset;
+ }
+
+ /* Ditto for the reject log */
+
+-else if (type == lt_reject && string_datestamp_offset >= 0)
++else if (type == lt_reject)
+ {
+ Ustrcpy(rejectlog_name, buffer);
+- rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
++ if (string_datestamp_offset > 0)
++ rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
+ }
+
+ /* and deal with the debug log (which keeps the datestamp, but does not
+--
+2.30.2
+