From 8518f94c80a841f0ba42ba88ce1f07d0dfc51a23 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Fri, 21 Dec 2007 22:28:35 +0000 Subject: [PATCH] * inverted flag logic, so now the smtp public posting isn't default anymore. --- citadel/ipcdef.h | 2 +- citadel/msgbase.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h index 2073589ee..d5dc44e84 100644 --- 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 9c65dc030..a57de91ca 100644 --- 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); } -- 2.39.2