X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=57c55b03dfe1f39719e04377273e0fc5edc6ba66;hb=68c5cc783b518571f3ab1d25179a1bcf7015a7ce;hp=355656ab52d888ee93297c9771a7285ca730a6f7;hpb=83f6f54ff172d43c9ab0fab87b10280d0c99ccec;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 355656ab5..57c55b03d 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-2021 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.
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -46,7 +45,7 @@
 #include <iconv.h>
 
 #if 0
-/* This is the non-define version in case of s.b. needing to debug */
+/* This is the non-define version in case it is needed for debugging */
 inline void FindNextEnd (char *bptr, char *end)
 {
 	/* Find the next ?Q? */
@@ -94,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) {
@@ -135,8 +134,7 @@ void utf8ify_rfc822_string(char *buf) {
 	if (start != NULL) 
 		FindNextEnd (start, end);
 
-	while ((start != NULL) && (end != NULL))
-	{
+	while ((start != NULL) && (end != NULL)) {
 		next = strstr(end, "=?");
 		if (next != NULL)
 			FindNextEnd(next, nextend);
@@ -144,9 +142,7 @@ void utf8ify_rfc822_string(char *buf) {
 			next = NULL;
 
 		/* did we find two partitions */
-		if ((next != NULL) && 
-		    ((next - end) > 2))
-		{
+		if ((next != NULL) && ((next - end) > 2)) {
 			ptr = end + 2;
 			while ((ptr < next) && 
 			       (isspace(*ptr) ||
@@ -181,8 +177,7 @@ void utf8ify_rfc822_string(char *buf) {
 	 */
 	start = strstr(buf, "=?");
 	FindNextEnd((start != NULL)? start : buf, end);
-	while (start != NULL && end != NULL && end > start)
-	{
+	while (start != NULL && end != NULL && end > start) {
 		extract_token(charset, start, 1, '?', sizeof charset);
 		extract_token(encoding, start, 2, '?', sizeof encoding);
 		extract_token(istr, start, 3, '?', sizeof istr);
@@ -198,12 +193,10 @@ void utf8ify_rfc822_string(char *buf) {
 			
 			len = strlen(istr);
 			pos = 0;
-			while (pos < len)
-			{
+			while (pos < len) {
 				if (istr[pos] == '_') istr[pos] = ' ';
 				pos++;
 			}
-
 			ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
 		}
 		else {
@@ -275,8 +268,6 @@ struct trynamebuf {
 };
 
 char *inetcfg = NULL;
-struct spamstrings_t *spamstrings = NULL;
-
 
 /*
  * Return nonzero if the supplied name is an alias for this host.
@@ -288,12 +279,12 @@ int CtdlHostAlias(char *fqdn) {
 	char host[256], type[256];
 	int found = 0;
 
-	if (fqdn == NULL) return(hostalias_nomatch);
-	if (IsEmptyStr(fqdn)) return(hostalias_nomatch);
-	if (!strcasecmp(fqdn, "localhost")) return(hostalias_localhost);
-	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_fqdn"))) return(hostalias_localhost);
-	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_nodename"))) return(hostalias_localhost);
-	if (inetcfg == NULL) return(hostalias_nomatch);
+	if (fqdn == NULL)					return(hostalias_nomatch);
+	if (IsEmptyStr(fqdn))					return(hostalias_nomatch);
+	if (!strcasecmp(fqdn, "localhost"))			return(hostalias_localhost);
+	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_fqdn")))	return(hostalias_localhost);
+	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_nodename")))	return(hostalias_localhost);
+	if (inetcfg == NULL)					return(hostalias_nomatch);
 
 	config_lines = num_tokens(inetcfg, '\n');
 	for (i=0; i<config_lines; ++i) {
@@ -304,22 +295,24 @@ int CtdlHostAlias(char *fqdn) {
 		found = 0;
 
 		/* Process these in a specific order, in case there are multiple matches.
-		 * We want directory to override masq, for example.
+		 * We want localhost to override masq, for example.
 		 */
 
 		if ( (!strcasecmp(type, "masqdomain")) && (!strcasecmp(fqdn, host))) {
 			found = hostalias_masq;
 		}
+
 		if ( (!strcasecmp(type, "localhost")) && (!strcasecmp(fqdn, host))) {
 			found = hostalias_localhost;
 		}
+
+		// "directory" used to be a distributed version of "localhost" but they're both the same now
 		if ( (!strcasecmp(type, "directory")) && (!strcasecmp(fqdn, host))) {
-			found = hostalias_directory;
+			found = hostalias_localhost;
 		}
 
 		if (found) return(found);
 	}
-
 	return(hostalias_nomatch);
 }
 
@@ -329,7 +322,7 @@ int CtdlHostAlias(char *fqdn) {
  */
 int CtdlIsMe(char *addr, int addr_buf_len)
 {
-	recptypes *recp;
+	struct recptypes *recp;
 	int i;
 
 	recp = validate_recipients(addr, NULL, 0);
@@ -354,7 +347,7 @@ int CtdlIsMe(char *addr, int addr_buf_len)
 
 
 /* If the last item in a list of recipients was truncated to a partial address,
- * remove it completely in order to avoid choking libSieve
+ * remove it completely in order to avoid choking library functions.
  */
 void sanitize_truncated_recipient(char *str)
 {
@@ -381,19 +374,17 @@ void sanitize_truncated_recipient(char *str)
  * This function is self explanatory.
  * (What can I say, I'm in a weird mood today...)
  */
-void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
-{
-	unsigned int i;
-
-	for (i = 0; i < strlen(name); ++i) {
-		if (name[i] == '@') {
-			while (isspace(name[i - 1]) && i > 0) {
-				strcpy(&name[i - 1], &name[i]);
-				--i;
-			}
-			while (isspace(name[i + 1])) {
-				strcpy(&name[i + 1], &name[i + 2]);
-			}
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
+	char *ptr;
+	if (!name) return;
+
+	for (ptr=name; *ptr; ++ptr) {
+		while ( (isspace(*ptr)) && (*(ptr+1)=='@') ) {
+			strcpy(ptr, ptr+1);
+			if (ptr > name) --ptr;
+		}
+		while ( (*ptr=='@') && (*(ptr+1)!=0) && (isspace(*(ptr+1))) ) {
+			strcpy(ptr+1, ptr+2);
 		}
 	}
 }
@@ -402,17 +393,11 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
 /*
  * Aliasing for network mail.
  */
-int alias(char *name)
-{				/* process alias and routing info for mail */
-	FILE *fp;
-	int a, i;
-	char aaa[SIZ], bbb[SIZ];
-	char *ignetcfg = NULL;
-	char *ignetmap = NULL;
+int alias(char *name) {				/* process alias and routing info for mail */
+	int a;
+	char aaa[SIZ];
 	int at = 0;
 	char node[64];
-	char testnode[64];
-	char buf[SIZ];
 
 	char original_name[256];
 	safestrncpy(original_name, name, sizeof original_name);
@@ -421,33 +406,7 @@ int alias(char *name)
 	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 	stripallbut(name, '<', '>');
 
-	fp = fopen(file_mail_aliases, "r");
-	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 Global Address Book */
+	/* Hit the email address directory */
 	if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
 		strcpy(name, aaa);
 	}
@@ -483,34 +442,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);
 }
@@ -525,18 +456,14 @@ int alias(char *name)
  *
  * Caller needs to free the result using free_recipients()
  */
-recptypes *validate_recipients(const char *supplied_recipients, 
-			       const char *RemoteIdentifier, 
-			       int Flags) {
-	struct CitContext *CCC = CC;
-	recptypes *ret;
+struct recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
+	struct recptypes *ret;
 	char *recipients = NULL;
 	char *org_recp;
 	char this_recp[256];
 	char this_recp_cooked[256];
 	char append[SIZ];
 	long len;
-	int num_recps = 0;
 	int i, j;
 	int mailtype;
 	int invalid;
@@ -548,11 +475,11 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	int in_quotes = 0;
 
 	/* Initialize */
-	ret = (recptypes *) malloc(sizeof(recptypes));
+	ret = (struct recptypes *) malloc(sizeof(struct recptypes));
 	if (ret == NULL) return(NULL);
 
 	/* Set all strings to null and numeric values to zero */
-	memset(ret, 0, sizeof(recptypes));
+	memset(ret, 0, sizeof(struct recptypes));
 
 	if (supplied_recipients == NULL) {
 		recipients = strdup("");
@@ -569,7 +496,6 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	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);
@@ -578,7 +504,6 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	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;
@@ -593,7 +518,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	}
 
 	/* Now start extracting recipients... */
-
+	Array *recp_array = array_new(1024);
 	while (!IsEmptyStr(recipients)) {
 		for (i=0; i<=strlen(recipients); ++i) {
 			if (recipients[i] == '\"') in_quotes = 1 - in_quotes;
@@ -613,8 +538,12 @@ recptypes *validate_recipients(const char *supplied_recipients,
 		striplt(this_recp);
 		if (IsEmptyStr(this_recp))
 			break;
-		syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp);
-		++num_recps;
+		syslog(LOG_DEBUG, "internet_addressing: evaluating recipient: %s", this_recp);
+		array_append(recp_array, this_recp);
+	}
+
+	for (int r=0; r<array_len(recp_array); ++r) {
+		strcpy(this_recp, (char *)array_get_element_at(recp_array, r));
 
 		strcpy(org_recp, this_recp);
 		alias(this_recp);
@@ -642,12 +571,11 @@ recptypes *validate_recipients(const char *supplied_recipients,
 				}
 				strcat(ret->recp_room, this_recp);
 			}
-			else if ( (!strncasecmp(this_recp, "room_", 5))
-				  && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
+			else if ( (!strncasecmp(this_recp, "room_", 5)) && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
 
 				/* Save room so we can restore it later */
-				tempQR2 = CCC->room;
-				CCC->room = tempQR;
+				tempQR2 = CC->room;
+				CC->room = tempQR;
 					
 				/* Check permissions to send mail to this room */
 				err = CtdlDoIHavePermissionToPostInThisRoom(
@@ -657,8 +585,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 					Flags,
 					0			/* 0 = not a reply */
 					);
-				if (err)
-				{
+				if (err) {
 					++ret->num_error;
 					invalid = 1;
 				} 
@@ -677,7 +604,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 				}
 					
 				/* Restore room in case something needs it */
-				CCC->room = tempQR2;
+				CC->room = tempQR2;
 
 			}
 			else if (CtdlGetUser(&tempUS, this_recp) == 0) {
@@ -703,8 +630,8 @@ recptypes *validate_recipients(const char *supplied_recipients,
 			break;
 		case MES_INTERNET:
 			/* Yes, you're reading this correctly: if the target
-			 * domain points back to the local system or an attached
-			 * Citadel directory, the address is invalid.  That's
+			 * domain points back to the local system,
+			 * the address is invalid.  That's
 			 * because if the address were valid, we would have
 			 * already translated it to a local address by now.
 			 */
@@ -720,13 +647,6 @@ recptypes *validate_recipients(const char *supplied_recipients,
 				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;
@@ -760,17 +680,18 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	}
 	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);
+	array_free(recp_array);
+
 	return(ret);
 }
 
@@ -778,7 +699,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 /*
  * Destructor for recptypes
  */
-void free_recipients(recptypes *valid) {
+void free_recipients(struct recptypes *valid) {
 
 	if (valid == NULL) {
 		return;
@@ -792,7 +713,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);
@@ -803,8 +723,7 @@ void free_recipients(recptypes *valid) {
 }
 
 
-char *qp_encode_email_addrs(char *source)
-{
+char *qp_encode_email_addrs(char *source) {
 	char *user, *node, *name;
 	const char headerStr[] = "=?UTF-8?Q?";
 	char *Encoded;
@@ -839,20 +758,19 @@ char *qp_encode_email_addrs(char *source)
 			free (AddrPtr), AddrPtr = ptr;
 
 			ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2);
-			memset(&ptr[nAddrPtrMax], 0, 
-			       sizeof (long) * nAddrPtrMax);
+			memset(&ptr[nAddrPtrMax], 0, sizeof (long) * nAddrPtrMax);
 
 			memcpy (ptr, AddrUtf8, sizeof (long) * nAddrPtrMax);
 			free (AddrUtf8), AddrUtf8 = ptr;
 			nAddrPtrMax *= 2;				
 		}
-		if (((unsigned char) source[i] < 32) || 
-		    ((unsigned char) source[i] > 126)) {
+		if (((unsigned char) source[i] < 32) || ((unsigned char) source[i] > 126)) {
 			need_to_encode = 1;
 			AddrUtf8[nColons] = 1;
 		}
-		if (source[i] == '"')
+		if (source[i] == '"') {
 			InQuotes = !InQuotes;
+		}
 		if (!InQuotes && source[i] == ',') {
 			AddrPtr[nColons] = i;
 			nColons++;
@@ -882,28 +800,19 @@ char *qp_encode_email_addrs(char *source)
 	for (i = 0; i < nColons && nPtr != NULL; i++) {
 		nmax = EncodedMaxLen - (nPtr - Encoded);
 		if (AddrUtf8[i]) {
-			process_rfc822_addr(&source[AddrPtr[i]], 
-					    user,
-					    node,
-					    name);
+			process_rfc822_addr(&source[AddrPtr[i]], user, node, name);
 			/* TODO: libIDN here ! */
 			if (IsEmptyStr(name)) {
-				n = snprintf(nPtr, nmax, 
-					     (i==0)?"%s@%s" : ",%s@%s",
-					     user, node);
+				n = snprintf(nPtr, nmax, (i==0)?"%s@%s" : ",%s@%s", user, node);
 			}
 			else {
 				EncodedName = rfc2047encode(name, strlen(name));			
-				n = snprintf(nPtr, nmax, 
-					     (i==0)?"%s <%s@%s>" : ",%s <%s@%s>",
-					     EncodedName, user, node);
+				n = snprintf(nPtr, nmax, (i==0)?"%s <%s@%s>" : ",%s <%s@%s>", EncodedName, user, node);
 				free(EncodedName);
 			}
 		}
 		else { 
-			n = snprintf(nPtr, nmax, 
-				     (i==0)?"%s" : ",%s",
-				     &source[AddrPtr[i]]);
+			n = snprintf(nPtr, nmax, (i==0)?"%s" : ",%s", &source[AddrPtr[i]]);
 		}
 		if (n > 0 )
 			nPtr += n;
@@ -955,20 +864,17 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
 	{
 		if ((*sField=='\r') || (*sField=='\n'))
 		{
-			int Offset = 1;
-			while (((*(sField + Offset) == '\r') ||
-				(*(sField + Offset) == '\n') ||
-				(isspace(*(sField + Offset)))) && 
-			       (sField + Offset < pFieldEnd))
-				Offset ++;
-			sField += Offset;
+			int offset = 1;
+			while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) {
+				offset ++;
+			}
+			sField += offset;
 			*pField = *sField;
 		}
 		else {
 			if (*sField=='\"') quote = 1 - quote;
 			if (!quote) {
-				if (isspace(*sField))
-				{
+				if (isspace(*sField)) {
 					*pField = ' ';
 					pField++;
 					sField++;
@@ -992,8 +898,7 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
  * Split an RFC822-style address into userid, host, and full name
  *
  */
-void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
-{
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) {
 	int a;
 
 	strcpy(user, "");
@@ -1088,7 +993,6 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 	) {
 		strcpy(node, CtdlGetConfigStr("c_nodename"));
 	}
-
 	else {
 
 		/* strip anything to the left of a @ */
@@ -1187,10 +1091,12 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
 		process_rfc822_addr(value, user, node, name);
 		syslog(LOG_DEBUG, "internet_addressing: converted to <%s@%s> (%s)", user, node, name);
 		snprintf(addr, sizeof(addr), "%s@%s", user, node);
-		if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name))
-			CM_SetField(msg, eAuthor, name, strlen(name));
-		if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr))
-			CM_SetField(msg, erFc822Addr, addr, strlen(addr));
+		if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) {
+			CM_SetField(msg, eAuthor, name, -1);
+		}
+		if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) {
+			CM_SetField(msg, erFc822Addr, addr, -1);
+		}
 		processed = 1;
 	}
 
@@ -1499,8 +1405,8 @@ void directory_key(char *key, char *addr) {
 }
 
 
-/* Return nonzero if the supplied address is in a domain we keep in
- * the directory
+/*
+ * Return nonzero if the supplied address is in one of "our" domains
  */
 int IsDirectory(char *addr, int allow_masq_domains) {
 	char domain[256];
@@ -1514,7 +1420,7 @@ int IsDirectory(char *addr, int allow_masq_domains) {
 	if ( (h == hostalias_masq) && allow_masq_domains)
 		return(1);
 	
-	if ( (h == hostalias_localhost) || (h == hostalias_directory) ) {
+	if (h == hostalias_localhost) {
 		return(1);
 	}
 	else {
@@ -1523,22 +1429,15 @@ int IsDirectory(char *addr, int allow_masq_domains) {
 }
 
 
-/*
- * Initialize the directory database (erasing anything already there)
- */
-void CtdlDirectoryInit(void) {
-	cdb_trunc(CDB_DIRECTORY);
-}
-
-
 /*
  * Add an Internet e-mail address to the directory for a user
  */
 int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
 
-	if (IsDirectory(internet_addr, 0) == 0) 
+	if (IsDirectory(internet_addr, 0) == 0) {
 		return 0;
+	}
 	syslog(LOG_DEBUG, "internet_addressing: create directory entry: %s --> %s", internet_addr, citadel_addr);
 	directory_key(key, internet_addr);
 	cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 );
@@ -1571,7 +1470,9 @@ int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) {
 	char key[SIZ];
 
 	/* Dump it in there unchanged, just for kicks */
-	safestrncpy(target, internet_addr, targbuflen);
+	if (target != NULL) {
+		safestrncpy(target, internet_addr, targbuflen);
+	}
 
 	/* Only do lookups for addresses with hostnames in them */
 	if (num_tokens(internet_addr, '@') != 2) return(-1);
@@ -1582,7 +1483,9 @@ int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) {
 	directory_key(key, internet_addr);
 	cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) );
 	if (cdbrec != NULL) {
-		safestrncpy(target, cdbrec->ptr, targbuflen);
+		if (target != NULL) {
+			safestrncpy(target, cdbrec->ptr, targbuflen);
+		}
 		cdb_free(cdbrec);
 		return(0);
 	}
@@ -1640,7 +1543,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 					utf8ify_rfc822_string(addr);
 				process_rfc822_addr(addr, user, node, name);
 				h = CtdlHostAlias(node);
-				if ( (h != hostalias_localhost) && (h != hostalias_directory) ) {
+				if (h != hostalias_localhost) {
 					coll = realloc(coll, strlen(coll) + strlen(addr) + 4);
 					if (coll == NULL) return(NULL);
 					if (!IsEmptyStr(coll)) {
@@ -1659,3 +1562,106 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	}
 	return(coll);
 }
+
+
+/*
+ * Helper function for CtdlRebuildDirectoryIndex()
+ */
+void CtdlRebuildDirectoryIndex_backend(char *username, void *data) {
+
+	int j = 0;
+	struct ctdluser usbuf;
+
+	if (CtdlGetUser(&usbuf, username) != 0) {
+		return;
+	}
+
+	if ( (!IsEmptyStr(usbuf.fullname)) && (!IsEmptyStr(usbuf.emailaddrs)) ) {
+		for (j=0; j<num_tokens(usbuf.emailaddrs, '|'); ++j) {
+			char one_email[512];
+			extract_token(one_email, usbuf.emailaddrs, j, '|', sizeof one_email);
+			CtdlDirectoryAddUser(one_email, usbuf.fullname);
+		}
+	}
+}
+
+
+/*
+ * Initialize the directory database (erasing anything already there)
+ */
+void CtdlRebuildDirectoryIndex(void) {
+	syslog(LOG_INFO, "internet_addressing: rebuilding email address directory index");
+	cdb_trunc(CDB_DIRECTORY);
+	ForEachUser(CtdlRebuildDirectoryIndex_backend, NULL);
+}
+
+
+/*
+ * Configure Internet email addresses for a user account, updating the Directory Index in the process
+ */
+void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs)
+{
+	struct ctdluser usbuf;
+	int i;
+	char buf[SIZ];
+
+	if (CtdlGetUserLock(&usbuf, requested_user) != 0) {	// We are relying on the fact that the DirectoryIndex functions don't lock.
+		return;						// Silently fail here if we can't acquire a lock on the user record.
+	}
+
+	syslog(LOG_DEBUG, "internet_addressing: setting email addresses for <%s> to <%s>", usbuf.fullname, new_emailaddrs);
+
+	/* Delete all of the existing directory index records for the user (easier this way) */
+	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+		CtdlDirectoryDelUser(buf, requested_user);
+	}
+
+	strcpy(usbuf.emailaddrs, new_emailaddrs);		// make it official.
+
+	/* Index all of the new email addresses (they've already been sanitized) */
+	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+		CtdlDirectoryAddUser(buf, requested_user);
+	}
+
+	CtdlPutUserLock(&usbuf);
+}
+
+
+/*
+ * Auto-generate an Internet email address for a user account
+ */
+void AutoGenerateEmailAddressForUser(struct ctdluser *user)
+{
+	char synthetic_email_addr[1024];
+	int i, j;
+	int u = 0;
+
+	for (i=0; u==0; ++i) {
+		if (i == 0) {
+			// first try just converting the user name to lowercase and replacing spaces with underscores
+			snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "%s@%s", user->fullname, CtdlGetConfigStr("c_fqdn"));
+			for (j=0; ((synthetic_email_addr[j] != '\0')&&(synthetic_email_addr[j] != '@')); j++) {
+				synthetic_email_addr[j] = tolower(synthetic_email_addr[j]);
+				if (!isalnum(synthetic_email_addr[j])) {
+					synthetic_email_addr[j] = '_';
+				}
+			}
+		}
+		else if (i == 1) {
+			// then try 'ctdl' followed by the user number
+			snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn"));
+		}
+		else if (i > 1) {
+			// oof.  just keep trying other numbers until we find one
+			snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08x@%s", i, CtdlGetConfigStr("c_fqdn"));
+		}
+		u = CtdlDirectoryLookup(NULL, synthetic_email_addr, 0);
+		syslog(LOG_DEBUG, "user_ops: address <%s> lookup returned <%d>", synthetic_email_addr, u);
+	}
+
+	CtdlSetEmailAddressesForUser(user->fullname, synthetic_email_addr);
+	strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(user->emailaddrs));
+	syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, user->fullname);
+}