From: mmj <none@none>
Date: Sun, 3 Sep 2006 20:55:41 +0000 (+1000)
Subject: Bugfix for submod -- now it works
X-Git-Tag: RELEASE_1_2_12_RC1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efa1bb707f66850d43527d0037e5668634dfcd4b;p=thirdparty%2Fmlmmj.git

Bugfix for submod -- now it works
---

diff --git a/src/listcontrol.c b/src/listcontrol.c
index 4197f50d..cae701b6 100644
--- a/src/listcontrol.c
+++ b/src/listcontrol.c
@@ -196,6 +196,10 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
 		return -1;
 	}
 
+	/* We only need the control mail when bouncing, to save bounced msg */
+	if(ctrl != CTRL_BOUNCES)
+		unlink(mailname);
+
 	switch (ctrl) {
 
 	/* listname+subscribe-digest@domain.tld */
@@ -591,7 +595,8 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
 				fromemails->emaillist[0], moderatefilename);
 			execlp(mlmmjsub, mlmmjsub,
 					"-L", listdir,
-					"-m", param, (char *)NULL);
+					"-m", param,
+					"-c", (char *)NULL);
 		}
 
 		sendfilename = concatstr(2, moderatefilename, ".sending");
diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index f50dde22..de3a6c81 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -578,7 +578,6 @@ int main(int argc, char **argv)
 		listcontrol(&fromemails, listdir, whichto->emaillist[0],
 			    mlmmjsub, mlmmjunsub, mlmmjsend, mlmmjbounce,
 			    donemailname);
-		unlink(donemailname);
 
 		return EXIT_SUCCESS;
 	}
diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index 43975152..b1bf63c9 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -538,12 +538,12 @@ int main(int argc, char **argv)
 	}
 
 	if(listdir == NULL) {
-		fprintf(stderr, "You have to specify -L and -a\n");
+		fprintf(stderr, "You have to specify -L\n");
 		fprintf(stderr, "%s -h for help\n", argv[0]);
 		exit(EXIT_FAILURE);
 	}
 	
-	if(address == NULL || modstr == NULL) {
+	if(address == NULL && modstr == NULL) {
 		fprintf(stderr, "You have to specify -a or -m\n");
 		fprintf(stderr, "%s -h for help\n", argv[0]);
 		exit(EXIT_FAILURE);