Mercurial > hg > mlmmj

changeset 499:d4634f323460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix stuff for 1.2.6.1
author mmj
date Mon, 09 May 2005 17:39:08 +1000
parents 71dc1f0a077d
children 8eeb497b2715
files ChangeLog VERSION src/do_all_the_voodo_here.c src/mlmmj-sub.c
diffstat 4 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 09 02:21:45 2005 +1000
+++ b/ChangeLog	Mon May 09 17:39:08 2005 +1000
@@ -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)
--- a/VERSION	Mon May 09 02:21:45 2005 +1000
+++ b/VERSION	Mon May 09 17:39:08 2005 +1000
@@ -1,1 +1,1 @@
-1.2.6
+1.2.6.1
--- a/src/do_all_the_voodo_here.c	Mon May 09 02:21:45 2005 +1000
+++ b/src/do_all_the_voodo_here.c	Mon May 09 17:39:08 2005 +1000
@@ -142,6 +142,7 @@
 		/* 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) {
--- a/src/mlmmj-sub.c	Mon May 09 02:21:45 2005 +1000
+++ b/src/mlmmj-sub.c	Mon May 09 17:39:08 2005 +1000
@@ -240,23 +240,25 @@
 	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 @@
 		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;
 	}