X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netconfig.c;h=970057133bb4e4c49dedbdf6bb92d453034e7c05;hb=ede74167cad0b73758d77c2777e4efebe746f27b;hp=234a1fe5dca60e7a9525c755b00d7327b417699e;hpb=f29ccef8b33eb0c4e04736032cb5769b373eb546;p=citadel.git

diff --git a/citadel/modules/network/serv_netconfig.c b/citadel/modules/network/serv_netconfig.c
index 234a1fe5d..970057133 100644
--- a/citadel/modules/network/serv_netconfig.c
+++ b/citadel/modules/network/serv_netconfig.c
@@ -88,6 +88,7 @@
 
 #include "context.h"
 #include "netconfig.h"
+#include "netspool.h"
 #include "ctdl_module.h"
 
 
@@ -185,56 +186,6 @@ void write_network_map(void) {
 }
 
 
-
-/*
- * Keep track of what messages to reject
- */
-FilterList *load_filter_list(void) {
-	char *serialized_list = NULL;
-	int i;
-	char buf[SIZ];
-	FilterList *newlist = NULL;
-	FilterList *nptr;
-
-	serialized_list = CtdlGetSysConfig(FILTERLIST);
-	if (serialized_list == NULL) return(NULL); /* if null, no entries */
-
-	/* Use the string tokenizer to grab one line at a time */
-	for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
-		extract_token(buf, serialized_list, i, '\n', sizeof buf);
-		nptr = (FilterList *) malloc(sizeof(FilterList));
-		extract_token(nptr->fl_user, buf, 0, '|', sizeof nptr->fl_user);
-		striplt(nptr->fl_user);
-		extract_token(nptr->fl_room, buf, 1, '|', sizeof nptr->fl_room);
-		striplt(nptr->fl_room);
-		extract_token(nptr->fl_node, buf, 2, '|', sizeof nptr->fl_node);
-		striplt(nptr->fl_node);
-
-		/* Cowardly refuse to add an any/any/any entry that would
-		 * end up filtering every single message.
-		 */
-		if (IsEmptyStr(nptr->fl_user) && 
-		    IsEmptyStr(nptr->fl_room) &&
-		    IsEmptyStr(nptr->fl_node)) {
-			free(nptr);
-		}
-		else {
-			nptr->next = newlist;
-			newlist = nptr;
-		}
-	}
-
-	free(serialized_list);
-	return newlist;
-}
-
-
-void free_filter_list(FilterList *fl) {
-	if (fl == NULL) return;
-	free_filter_list(fl->next);
-	free(fl);
-}
-
 /* 
  * Check the network map and determine whether the supplied node name is
  * valid.  If it is not a neighbor node, supply the name of a neighbor node
@@ -475,6 +426,42 @@ void cmd_netp(char *cmdbuf)
 	cprintf("%d authenticated as network node '%s'\n", CIT_OK, CC->net_node);
 }
 
+int netconfig_check_roomaccess(
+	char *errmsgbuf, 
+	size_t n,
+	const char* RemoteIdentifier)
+{
+	SpoolControl *sc;
+	char filename[SIZ];
+	int found;
+
+	if (RemoteIdentifier == NULL)
+	{
+		snprintf(errmsgbuf, n, "Need sender to permit access.");
+		return (ERROR + USERNAME_REQUIRED);
+	}
+
+	assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+	begin_critical_section(S_NETCONFIGS);
+	if (!read_spoolcontrol_file(&sc, filename))
+	{
+		end_critical_section(S_NETCONFIGS);
+		snprintf(errmsgbuf, n,
+			 "This mailing list only accepts posts from subscribers.");
+		return (ERROR + NO_SUCH_USER);
+	}
+	end_critical_section(S_NETCONFIGS);
+	found = is_recipient (sc, RemoteIdentifier);
+	free_spoolcontrol_struct(&sc);
+	if (found) {
+		return (0);
+	}
+	else {
+		snprintf(errmsgbuf, n,
+			 "This mailing list only accepts posts from subscribers.");
+		return (ERROR + NO_SUCH_USER);
+	}
+}
 /*
  * Module entry point
  */