X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=7c9bac07aa3389405dccf4a3c505bbe212a15bed;hb=2f84905fd53640a922efc4bf30618e96776d8b49;hp=ed160fae73f9d5166fd67dbf6e9f65a6f7879fe4;hpb=d56a1a82b06ed401324fc252dcd5f29e0c8b3ae5;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index ed160fae7..7c9bac07a 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -2,7 +2,7 @@
  * This file contains functions which handle the mapping of Internet addresses
  * to users on the Citadel system.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -93,10 +93,10 @@ void utf8ify_rfc822_string(char *buf) {
 	int illegal_non_rfc2047_encoding = 0;
 
 	/* Sometimes, badly formed messages contain strings which were simply
-	 *  written out directly in some foreign character set instead of
-	 *  using RFC2047 encoding.  This is illegal but we will attempt to
-	 *  handle it anyway by converting from a user-specified default
-	 *  charset to UTF-8 if we see any nonprintable characters.
+	 * written out directly in some foreign character set instead of
+	 * using RFC2047 encoding.  This is illegal but we will attempt to
+	 * handle it anyway by converting from a user-specified default
+	 * charset to UTF-8 if we see any nonprintable characters.
 	 */
 	len = strlen(buf);
 	for (i=0; i<len; ++i) {
@@ -404,14 +404,10 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
 int alias(char *name)
 {				/* process alias and routing info for mail */
 	FILE *fp;
-	int a, i;
+	int a;
 	char aaa[SIZ], bbb[SIZ];
-	char *ignetcfg = NULL;
-	char *ignetmap = NULL;
 	int at = 0;
 	char node[64];
-	char testnode[64];
-	char buf[SIZ];
 
 	char original_name[256];
 	safestrncpy(original_name, name, sizeof original_name);
@@ -482,34 +478,6 @@ int alias(char *name)
 		return(MES_INTERNET);
 	}
 
-	/* Otherwise we look in the IGnet maps for a valid Citadel node.
-	 * Try directly-connected nodes first...
-	 */
-	ignetcfg = CtdlGetSysConfig(IGNETCFG);
-	for (i=0; i<num_tokens(ignetcfg, '\n'); ++i) {
-		extract_token(buf, ignetcfg, i, '\n', sizeof buf);
-		extract_token(testnode, buf, 0, '|', sizeof testnode);
-		if (!strcasecmp(node, testnode)) {
-			free(ignetcfg);
-			return(MES_IGNET);
-		}
-	}
-	free(ignetcfg);
-
-	/*
-	 * Then try nodes that are two or more hops away.
-	 */
-	ignetmap = CtdlGetSysConfig(IGNETMAP);
-	for (i=0; i<num_tokens(ignetmap, '\n'); ++i) {
-		extract_token(buf, ignetmap, i, '\n', sizeof buf);
-		extract_token(testnode, buf, 0, '|', sizeof testnode);
-		if (!strcasecmp(node, testnode)) {
-			free(ignetmap);
-			return(MES_IGNET);
-		}
-	}
-	free(ignetmap);
-
 	/* If we get to this point it's an invalid node name */
 	return (MES_ERROR);
 }
@@ -567,7 +535,6 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	ret->errormsg = malloc(len);
 	ret->recp_local = malloc(len);
 	ret->recp_internet = malloc(len);
-	ret->recp_ignet = malloc(len);
 	ret->recp_room = malloc(len);
 	ret->display_recp = malloc(len);
 	ret->recp_orgroom = malloc(len);
@@ -576,7 +543,6 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	ret->errormsg[0] = 0;
 	ret->recp_local[0] = 0;
 	ret->recp_internet[0] = 0;
-	ret->recp_ignet[0] = 0;
 	ret->recp_room[0] = 0;
 	ret->recp_orgroom[0] = 0;
 	ret->display_recp[0] = 0;
@@ -718,13 +684,6 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 				strcat(ret->recp_internet, this_recp);
 			}
 			break;
-		case MES_IGNET:
-			++ret->num_ignet;
-			if (!IsEmptyStr(ret->recp_ignet)) {
-				strcat(ret->recp_ignet, "|");
-			}
-			strcat(ret->recp_ignet, this_recp);
-			break;
 		case MES_ERROR:
 			++ret->num_error;
 			invalid = 1;
@@ -758,14 +717,14 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	}
 	free(org_recp);
 
-	if ((ret->num_local + ret->num_internet + ret->num_ignet +
-	     ret->num_room + ret->num_error) == 0) {
+	if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0)
+	{
 		ret->num_error = (-1);
 		strcpy(ret->errormsg, "No recipients specified.");
 	}
 
-	syslog(LOG_DEBUG, "internet_addressing: validate_recipients() = %d local, %d room, %d SMTP, %d IGnet, %d error",
-		ret->num_local, ret->num_room, ret->num_internet, ret->num_ignet, ret->num_error
+	syslog(LOG_DEBUG, "internet_addressing: validate_recipients() = %d local, %d room, %d SMTP, %d error",
+		ret->num_local, ret->num_room, ret->num_internet, ret->num_error
 	);
 
 	free(recipients);
@@ -790,7 +749,6 @@ void free_recipients(recptypes *valid) {
 	if (valid->errormsg != NULL)		free(valid->errormsg);
 	if (valid->recp_local != NULL)		free(valid->recp_local);
 	if (valid->recp_internet != NULL)	free(valid->recp_internet);
-	if (valid->recp_ignet != NULL)		free(valid->recp_ignet);
 	if (valid->recp_room != NULL)		free(valid->recp_room);
 	if (valid->recp_orgroom != NULL)        free(valid->recp_orgroom);
 	if (valid->display_recp != NULL)	free(valid->display_recp);