From: mmj <none@none>
Date: Wed, 26 Jan 2005 18:03:57 +0000 (+1100)
Subject: Move nosubonlydenymails check to the right place
X-Git-Tag: RELEASE_1_2_12_RC1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9f82f9ef126715497ddd05ed6fa7fafcf160749;p=thirdparty%2Fmlmmj.git

Move nosubonlydenymails check to the right place
---

diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index e0d756e5..27c62ed3 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -651,15 +651,20 @@ int main(int argc, char **argv)
 	subonlypost = statctrl(listdir, "subonlypost");
 	if(subonlypost) {
 		/* Don't send a mail about denial to the list, but silently
-		 * discard and exit. Do the same if it's turned off */
-		if ((strcasecmp(listaddr, fromemails.emaillist[0]) == 0)
-				|| nosubonlydenymails) {
+		 * discard and exit. */
+		if (strcasecmp(listaddr, fromemails.emaillist[0]) == 0) {
 			myfree(listaddr);
 			unlink(donemailname);
 			myfree(donemailname);
 			exit(EXIT_SUCCESS);
 		}
 		if(is_subbed(listdir, fromemails.emaillist[0]) != 0) {
+			if(nosubonlydenymails) {
+				myfree(listaddr);
+				unlink(donemailname);
+				myfree(donemailname);
+				exit(EXIT_SUCCESS);
+			}
 			listname = genlistname(listaddr);
 			listfqdn = genlistfqdn(listaddr);
 			maildata[1] = fromemails.emaillist[0];