X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=33d70451a6f36406c36056d8b91954ce0e728f4e;hp=74f69493f895964794835dd5951bc4aa19126f61;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hpb=0e19dfa22f8f12f33b095abd24b10d7d39c74c60

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 74f69493f..33d70451a 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -403,9 +403,8 @@ 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;
-	char aaa[SIZ], bbb[SIZ];
+	char aaa[SIZ];
 	int at = 0;
 	char node[64];
 
@@ -416,32 +415,6 @@ int alias(char *name)
 	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 	stripallbut(name, '<', '>');
 
-	fp = fopen(file_mail_aliases, "r");		// when are we going to get rid of this?
-	if (fp == NULL) {
-		fp = fopen("/dev/null", "r");
-	}
-	if (fp == NULL) {
-		return (MES_ERROR);
-	}
-	strcpy(aaa, "");
-	strcpy(bbb, "");
-	while (fgets(aaa, sizeof aaa, fp) != NULL) {
-		while (isspace(name[0]))
-			strcpy(name, &name[1]);
-		aaa[strlen(aaa) - 1] = 0;
-		strcpy(bbb, "");
-		for (a = 0; aaa[a] != '\0'; ++a) {
-			if (aaa[a] == ',') {
-				strcpy(bbb, &aaa[a + 1]);
-				aaa[a] = 0;
-				break;
-			}
-		}
-		if (!strcasecmp(name, aaa))
-			strcpy(name, bbb);
-	}
-	fclose(fp);
-
 	/* Hit the email address directory */
 	if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
 		strcpy(name, aaa);