X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=eecd760b57bc18184952dfefb8b2f68dae89f544;hp=d97af9084ba3442a7667ac9bee7c19b067c34c5f;hb=cde17f8d38bf9306df4706ac2acb528a2a686a29;hpb=83e04675b53374a1436029a367283d6d4ee05a07

diff --git a/uip/slocal.c b/uip/slocal.c
index d97af90..eecd760 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -86,10 +86,6 @@ static struct swit switches[] = {
 };
 
 
-/* global maildelivery file */
-char *maildelivery = NMHETCDIR"/maildelivery";
-
-
 static int globbed = 0;  /* have we built "vars" table yet? */
 static int parsed = 0;  /* have we built header field table yet */
 static int utmped = 0;  /* have we scanned umtp(x) file yet */
@@ -437,12 +433,15 @@ main(int argc, char **argv)
 static int
 localmail(int fd, char *mdlvr)
 {
+	char buf[BUFSIZ];
+
 	/* delivery according to personal Maildelivery file */
 	if (usr_delivery(fd, mdlvr ? mdlvr : ".maildelivery", 0) != -1) {
 		return 0;
 	}
 	/* delivery according to global Maildelivery file */
-	if (usr_delivery(fd, maildelivery, 1) != -1) {
+	snprintf(buf, sizeof buf, "%s/%s", mhetcdir, "maildelivery");
+	if (usr_delivery(fd, buf, 1) != -1) {
 		return 0;
 	}
 	if (verbose) {