From: mmj <none@none>
Date: Mon, 9 May 2005 07:39:08 +0000 (+1000)
Subject: fix stuff for 1.2.6.1
X-Git-Tag: RELEASE_1_2_12_RC1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb6fd44dfa87a97a2e7cb8e856b3e50f38d0033b;p=thirdparty%2Fmlmmj.git

fix stuff for 1.2.6.1
---

diff --git a/ChangeLog b/ChangeLog
index 5767fc3f..6ae9bc9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+1.2.6.1
+ o Make sure the fromaddr is correct on sub-subscribed mails
+ o Don't add an empty subject if there was one present
 1.2.6
  o If prefix but no Subject: header is present, add one (Jakob Hirsch)
  o Add notification mail when subbed people try to sub (Jakob Hirsch)
diff --git a/VERSION b/VERSION
index 3c43790f..c3cb87fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.6
+1.2.6.1
diff --git a/src/do_all_the_voodo_here.c b/src/do_all_the_voodo_here.c
index da425609..35cfc0e9 100644
--- a/src/do_all_the_voodo_here.c
+++ b/src/do_all_the_voodo_here.c
@@ -142,6 +142,7 @@ int do_all_the_voodo_here(int infd, int outfd, int hdrfd, int footfd,
 		/* Add Subject: prefix if wanted */
 		if(prefix) {
 			if(strncasecmp(hdrline, "Subject:", 8) == 0) {
+				subject_present = 1;
 				unqp = cleanquotedp(hdrline + 8);
 				if(strstr(hdrline + 8, prefix) == NULL &&
 				   strstr(unqp, prefix) == NULL) {
diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index 9eb03bb1..8afc9c20 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -240,23 +240,25 @@ static void print_help(const char *prg)
 	exit(EXIT_SUCCESS);
 }
 
-void generate_subscribed(const char *listdir, const char *listaddr,
-			 const char *subaddr, const char *mlmmjsend)
+void generate_subscribed(const char *listdir, const char *subaddr,
+		const char *mlmmjsend)
 {
-	char *queuefilename, *fromaddr, *listname, *listfqdn;
+	char *queuefilename, *fromaddr, *listname, *listfqdn, *listaddr;
 
+	listaddr = getlistaddr(listdir);
 	listname = genlistname(listaddr);
 	listfqdn = genlistfqdn(listaddr);
 
 	fromaddr = concatstr(3, listname, "+bounces-help@", listfqdn);
 
-	myfree(listname);
-	myfree(listfqdn);
-
 	queuefilename = prepstdreply(listdir, "sub-subscribed", "$helpaddr$",
 				     subaddr, NULL, 0, NULL);
 	MY_ASSERT(queuefilename);
 
+	myfree(listaddr);
+	myfree(listname);
+	myfree(listfqdn);
+	
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
 				"-T", subaddr,
@@ -459,7 +461,7 @@ int main(int argc, char **argv)
 		myfree(sublockname);
 
 		printf("%s is already subscribed to %s.\n", address, listaddr);
-		generate_subscribed(listdir, listaddr, address, mlmmjsend);
+		generate_subscribed(listdir, address, mlmmjsend);
 		
 		return EXIT_SUCCESS;
 	}