summaryrefslogtreecommitdiff
path: root/mail/dma/files/patch-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dma/files/patch-dma.c')
-rw-r--r--mail/dma/files/patch-dma.c26
1 files changed, 22 insertions, 4 deletions
diff --git a/mail/dma/files/patch-dma.c b/mail/dma/files/patch-dma.c
index 0e31e14ebc50..7094c8e459ca 100644
--- a/mail/dma/files/patch-dma.c
+++ b/mail/dma/files/patch-dma.c
@@ -1,11 +1,29 @@
---- ./dma.c.orig 2010-10-04 21:03:33.000000000 +0200
-+++ ./dma.c 2010-10-18 13:25:47.331077938 +0200
-@@ -293,7 +293,7 @@
+--- dma.c.orig 2012-01-28 22:36:55.000000000 +0000
++++ dma.c 2012-01-28 22:46:06.000000000 +0000
+@@ -332,7 +332,7 @@ retry:
exit(1);
}
if (gettimeofday(&now, NULL) == 0 &&
- (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
+ (now.tv_sec - st.st_mtime > MAX_TIMEOUT)) {
- asprintf(__DECONST(void *, &errmsg),
+ snprintf(errmsg, sizeof(errmsg),
"Could not deliver for the last %d seconds. Giving up.",
MAX_TIMEOUT);
+@@ -534,7 +535,7 @@ main(int argc, char **argv)
+ skipopts:
+ if (logident_base == NULL)
+ logident_base = "dma";
+- setlogident(NULL);
++ setlogident(logident_base);
+
+ act.sa_handler = sighup_handler;
+ act.sa_flags = 0;
+@@ -571,7 +572,7 @@ skipopts:
+ errlog(1, "can not read aliases file `%s'", config.aliases);
+
+ if ((sender = set_from(&queue, sender)) == NULL)
+- errlog(1, NULL);
++ errlog(1, "set_from failed");
+
+ if (newspoolf(&queue) != 0)
+ errlog(1, "can not create temp file");