From e50076f846e41c4c88f9de6ac01b963bccdfef49 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 27 Aug 2009 16:38:51 +0200
Subject: [PATCH] dma: initialize queue structures

---
 libexec/dma/dma.c   | 11 ++++++-----
 libexec/dma/mail.c  |  1 +
 libexec/dma/spool.c |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libexec/dma/dma.c b/libexec/dma/dma.c
index bf22e8ef44..d1f2493abe 100644
--- a/libexec/dma/dma.c
+++ b/libexec/dma/dma.c
@@ -345,11 +345,12 @@ main(int argc, char **argv)
 {
 	char *sender = NULL;
 	struct queue queue;
-	struct queue lqueue;
 	int i, ch;
 	int nodot = 0, doqueue = 0, showq = 0;
 
 	atexit(deltmp);
+
+	bzero(&queue, sizeof(queue));
 	LIST_INIT(&queue.queue);
 
 	if (strcmp(argv[0], "mailq") == 0) {
@@ -465,16 +466,16 @@ skipopts:
 		errlog(1, "can not read SMTP authentication file");
 
 	if (showq) {
-		if (load_queue(&lqueue) < 0)
+		if (load_queue(&queue) < 0)
 			errlog(1, "can not load queue");
-		show_queue(&lqueue);
+		show_queue(&queue);
 		return (0);
 	}
 
 	if (doqueue) {
-		if (load_queue(&lqueue) < 0)
+		if (load_queue(&queue) < 0)
 			errlog(1, "can not load queue");
-		run_queue(&lqueue);
+		run_queue(&queue);
 		return (0);
 	}
 
diff --git a/libexec/dma/mail.c b/libexec/dma/mail.c
index d11f46590c..7f826b20f0 100644
--- a/libexec/dma/mail.c
+++ b/libexec/dma/mail.c
@@ -52,6 +52,7 @@ bounce(struct qitem *it, const char *reason)
 		exit(1);
 	}
 
+	bzero(&bounceq, sizeof(bounceq));
 	LIST_INIT(&bounceq.queue);
 	if (add_recp(&bounceq, it->sender, "", 1) != 0)
 		goto fail;
diff --git a/libexec/dma/spool.c b/libexec/dma/spool.c
index 33e972d508..7988a1f1af 100644
--- a/libexec/dma/spool.c
+++ b/libexec/dma/spool.c
@@ -200,6 +200,7 @@ load_queue(struct queue *queue)
 	char *mailfn;
 	off_t hdrlen;
 
+	bzero(queue, sizeof(queue));
 	LIST_INIT(&queue->queue);
 
 	spooldir = opendir(config->spooldir);
-- 
2.11.4.GIT