Prep for 0.6.0 and small debug info removal etc.

diff --git a/ChangeLog b/ChangeLog
index 30e989889f117974cb5cd7b651ebb8f3b22b4953..5eeedb72d69941730ae1ca1735028f572a717cd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+0.6.0
+ o Add several unlinks. No need to litter queue/ with useless files
  o Don't use moderation/queue for outgoing, just use queue/
  o Christoph Thiel pointed out that listaddress and moderators belong in
    control/ so move them there

diff --git a/README b/README
index 06786a228be3bb8599645b1d91415b66f482fe7b..be9b0eb6f51aa4e33be0d43977498750851351c3 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README mlmmj-0.5.2                                     May 29th 2004
+README mlmmj-0.6.0                                     Jun 6th 2004
 
 This is an attempt at implementing a mailing list manager with the same
 functionality as the brilliant ezmlm, but with a decent license and mail server
@@ -59,9 +59,13 @@ To use mlmmj, do the following:
 
    NOTE: Don't forget newaliases.
 
+4) Start mlmmj-maintd (remember full path when starting it!) or add it to
+   crontab with -F switch. Note that mlmmj-maintd is still work in progress,
+   but except bouncehandling everything should be there.
+
 That's it! You might want to go through the next steps too.
 
-4) Subscribe some people
+5) Subscribe some people
 
    mlmmj-sub -L /var/spool/mlmmj/mlmmj-test/ -a joe@domain.tld
 
@@ -71,30 +75,30 @@ That's it! You might want to go through the next steps too.
    directory and files in there, if you don't perform all list actions as the
    user that writes mail.
 
-5) If you want custom headers like X-Mailinglist, Reply-To: etc. just add a
+6) If you want custom headers like X-Mailinglist, Reply-To: etc. just add a
    file called 'customheaders' in the list control/ directory like this:
    $ cat /var/spool/mlmmj/mlmmj-test/control/customheaders
    X-Mailinglist: mlmmj-test
    Reply-To: mlmmj-test@domain.tld
 
-6) If you want every mail to have something like:
+7) If you want every mail to have something like:
    -- 
    To unsubscribe send a mail to coollist+unsubscribe@lists.domain.net
 
    Just add what you want to a file named "footer" in the same dir as
    "customheader" (listdir/control/).
 
-7) For having a moderated list, simply create a file called 'moderated' in the
+8) For having a moderated list, simply create a file called 'moderated' in the
    control/ directory. Moderators are added to a file called 'moderators' in
    the listdir, just like subscribers are in the subscribers file.
 
-8) Have a look at the file TUNABLES for runtime configurable things.
+9) Have a look at the file TUNABLES for runtime configurable things.
 
 Tunables in include/mlmmj.h:
-If you want to use something else than localhost for your maildelivery you have
-to change RELAYHOST.
-If you want to spawn more than 3 smtp connections to your relayhost, change
-MAX_CONNECTIONS to the desired value.
+ · If you want to use something else than localhost for your maildelivery you have
+   to change RELAYHOST.
+ · There's some time intervals for how mlmmj-maintd operates. I've choosen
+   non-strict defaults, so depending on your BOFH rate you might want to tweak.
 
 Have a fun!
 

diff --git a/TODO b/TODO
index 76b5c73d9f6c39e3a2ec9a8c8fc6f0d4072c0c50..59438761c7fd3c11334ccce8faa6bdc71b1dcd20 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,4 +7,4 @@
  o mlmmj-maintenance (in progress)
 
 An ever ongoing TODO is we need someone to run it all through valgrind or
-similar and plug all memory leaks etc.
+similar and plug all memory and fd leaks etc.

diff --git a/UPGRADE b/UPGRADE
index 4abf41295bb04da3001bcbb91ad9c69205684226..c805e33cc25d6c5e3988906df508e0fce930e282 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -10,6 +10,8 @@ This applies to everyone using mlmmj > 0.5.2:
 
   · moderation/queue
 
+ Start mlmmj-maintd
+
 This applies to everyone using mlmmj > 0.5.1:
 ---------------------------------------------
 

diff --git a/VERSION b/VERSION
index f05cdec49cd6f8fae3a3d03e25ba8f2cae03a8fc..a918a2aa18d5bec6a8bb93891a7a63c243111796 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.0-RC1
+0.6.0

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 0ccfc0cfed614808ac6c69342ba3c73ed8981171..762bf127b4929679d519a7b93bee4b8edd44d55a 100644 (file)
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -303,7 +303,7 @@ int send_mail_many(int sockfd, const char *from, const char *replyto,
        for(next = cur = start; next < start + st.st_size; next++) {
                if(*next == '\n' || next == start + st.st_size - 1) {
                        len = next - cur;
-                       if(next == start + st.st_size - 1)
+                       if(next == start + st.st_size - 1 && *next != '\n')
                                len++;
                        addr = malloc(len + 1);
                        strncpy(addr, cur, len);
@@ -349,8 +349,7 @@ int send_mail_many(int sockfd, const char *from, const char *replyto,
                                do {
                                        /* Dirty hack to add newline. */
                                        len = strlen(addr);
-                                       addr[len] = '\n';
-                                       if(writen(addrfd, addr, len+1) < 0)
+                                       if(writen(addrfd, addr, len) < 0)
                                                log_error(LOG_ARGS,
                                                        "Could not add [%s] "
                                                        "to requeue address "