subonlyget and confirmation possible with closedlist

diff --git a/ChangeLog b/ChangeLog
index a867ffcaa4dfceb720abc860a729131f63c9d11d..1ea81cf40474964ecceb4d625d179accc6ede757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ o Make it possible to confirm subscription even though it's a closedlist.
+   It makes sense to be able to confirm a request submitted by the sysadmin
+   on the commandline
+ o Add 'subonlyget' tunable which makes +get-N only work for subscribers
 1.2.8
  o Don't closedir() before done (GOOD spotting Christian Laursen)
  o Make sure the resend of queue files will not loop indefinately

diff --git a/TUNABLES b/TUNABLES
index 7b079ba3ae11380aebf5fe5150300ca85f37620a..7e861822c6a77c34504f05e7c479f49f493d1645 100644 (file)
--- a/TUNABLES
+++ b/TUNABLES
@@ -120,6 +120,11 @@ to specify several entries (one pr. line), it's marked "list".
 
    If this file exists, then retrieving old posts with +get-N is disabled
 
+ · subonlyget                  (boolean)
+
+   If this file exists, then retrieving old posts with +get-N is only
+   possible for subscribers. The above mentioned 'noget' have precedence.
+
  · verp                                (normal)
 
    Enable VERP support. Anything added in this variable will be appended the

diff --git a/VERSION b/VERSION
index db6fb4a9113767d50f4a5027af3423a5d383dd55..9d4f8239dc9c87dcec48f0b9631e72ddbfbae9e5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.8
+1.2.9

diff --git a/src/listcontrol.c b/src/listcontrol.c
index 5813975806e66f9532d11d105fe369cc5491b857..bada1dafa25a887e5dd2d6b9ca6aef11f3c04489 100644 (file)
--- a/src/listcontrol.c
+++ b/src/listcontrol.c
@@ -44,6 +44,7 @@
 #include "memory.h"
 #include "log_oper.h"
 #include "ctrlvalues.h"
+#include "subscriberfuncs.h"
 
 enum ctrl_e {
        CTRL_SUBSCRIBE_DIGEST,
@@ -106,7 +107,7 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
        const char *subswitch;
        size_t len;
        struct stat stbuf;
-       int closedlist, nosubconfirm, tmpfd, noget, i;
+       int closedlist, nosubconfirm, tmpfd, noget, i, subonlyget = 0;
        size_t cmdlen;
        unsigned int ctrl;
        struct strlist *owners;
@@ -241,8 +242,6 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
        /* listname+subconf-digest-COOKIE@domain.tld */
        case CTRL_CONFSUB_DIGEST:
                unlink(mailname);
-               if (closedlist)
-                       exit(EXIT_SUCCESS);
                conffilename = concatstr(3, listdir, "/subconf/", param);
                myfree(param);
                if((tmpfd = open(conffilename, O_RDONLY)) < 0) {
@@ -268,8 +267,6 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
        /* listname+subconf-nomail-COOKIE@domain.tld */
        case CTRL_CONFSUB_NOMAIL:
                unlink(mailname);
-               if (closedlist)
-                       exit(EXIT_SUCCESS);
                conffilename = concatstr(3, listdir, "/subconf/", param);
                myfree(param);
                if((tmpfd = open(conffilename, O_RDONLY)) < 0) {
@@ -295,8 +292,6 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
        /* listname+subconf-COOKIE@domain.tld */
        case CTRL_CONFSUB:
                unlink(mailname);
-               if (closedlist)
-                       exit(EXIT_SUCCESS);
                conffilename = concatstr(3, listdir, "/subconf/", param);
                myfree(param);
                if((tmpfd = open(conffilename, O_RDONLY)) < 0) {
@@ -532,6 +527,10 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
                noget = statctrl(listdir, "noget");
                if(noget)
                        exit(EXIT_SUCCESS);
+               subonlyget = statctrl(listdir, "subonlyget");
+               if(subonlyget)
+                       if(is_subbed(listdir, fromemails->emaillist[0]) != 0)
+                               exit(EXIT_SUCCESS);
                /* sanity check--is it all digits? */
                for(c = param; *c != '\0'; c++) {
                        if(!isdigit((int)*c))