* inverted flag logic, so now the smtp public posting isn't default anymore.

diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h
index 2073589ee72e9f4ab1d485cb58cb8aca1c14e142..d5dc44e849f8ae0804c08188277b824a7d34a6fb 100644 (file)
--- a/citadel/ipcdef.h
+++ b/citadel/ipcdef.h
@@ -58,7 +58,7 @@ extern "C" {
 #define QR2_SELFLIST   2               /* Self-service mailing list mgmt   */
 #define QR2_COLLABDEL  4               /* Anyone who can post can delete   */
 #define QR2_SUBJECTREQ 8               /* Subject strongly recommended */
-#define QR2_SUBSONLY   16              /* Listservice Subscribers may post */
+#define QR2_SMTP_PUBLIC        16              /* Listservice Subscribers may post */
 #define QR2_MODERATED  32              /* Listservice aide has to permit posts  */
 
 #define US_NEEDVALID   1               /* User needs to be validated       */

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 9c65dc0307081dfee2d22de518422d8eae93567a..a57de91cacb46e8b2f04d957b157fee694026c59 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3110,7 +3110,11 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
                        snprintf(errmsgbuf, n, "Not logged in.");
                        return (ERROR + NOT_LOGGED_IN);
                }
-               else if (CC->room.QRflags2 & QR2_SUBSONLY){
+               if (CC->room.QRflags2 & QR2_MODERATED) {
+                       snprintf(errmsgbuf, n, "Not logged in Moderation feature not yet implemented!");
+                       return (ERROR + NOT_LOGGED_IN);
+               }
+               if (CC->room.QRflags2 & QR2_SMTP_PUBLIC == 0){
                        SpoolControl *sc;
                        char filename[SIZ];
                        int found;
@@ -3122,8 +3126,6 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
                        }
 
                        assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-               
-                       lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
                        begin_critical_section(S_NETCONFIGS);
                        if (!read_spoolcontrol_file(&sc, filename))
                        {
@@ -3139,9 +3141,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
                        else
                                return (ERROR + NO_SUCH_USER);
                }
-               else if (CC->room.QRflags2 & QR2_MODERATED) {
-                       return (0);
-               }
+               return (ERROR + NOT_LOGGED_IN);
 
        }