X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=74f69493f895964794835dd5951bc4aa19126f61;hb=8db8def130c7e0b01dfce85aa2bc207e22188b94;hp=907d0eaac61719709fed8f5a7fcfbd00637d4bb0;hpb=ca4d25b9bd7c3038c5421cdae705c51f68657351;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 907d0eaac..74f69493f 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1,6 +1,16 @@
 /*
  * This file contains functions which handle the mapping of Internet addresses
  * to users on the Citadel system.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -13,18 +23,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.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? */
@@ -83,27 +82,27 @@ void utf8ify_rfc822_string(char *buf) {
 	char encoding[16];
 	char istr[1024];
 	iconv_t ic = (iconv_t)(-1) ;
-	char *ibuf;			/**< Buffer of characters to be converted */
-	char *obuf;			/**< Buffer for converted characters */
-	size_t ibuflen;			/**< Length of input buffer */
-	size_t obuflen;			/**< Length of output buffer */
-	char *isav;			/**< Saved pointer to input buffer */
-	char *osav;			/**< Saved pointer to output buffer */
+	char *ibuf;			// Buffer of characters to be converted
+	char *obuf;			// Buffer for converted characters
+	size_t ibuflen;			// Length of input buffer
+	size_t obuflen;			// Length of output buffer
+	char *isav;			// Saved pointer to input buffer
+	char *osav;			// Saved pointer to output buffer
 	int passes = 0;
 	int i, len, delta;
 	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) {
 		if ((buf[i] < 32) || (buf[i] > 126)) {
 			illegal_non_rfc2047_encoding = 1;
-			i = len; ///< take a shortcut, it won't be more than one.
+			i = len;	// take a shortcut, it won't be more than one.
 		}
 	}
 	if (illegal_non_rfc2047_encoding) {
@@ -189,12 +188,12 @@ void utf8ify_rfc822_string(char *buf) {
 
 		ibuf = malloc(1024);
 		isav = ibuf;
-		if (!strcasecmp(encoding, "B")) {	/**< base64 */
+		if (!strcasecmp(encoding, "B")) {	// base64
 			ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
 		}
-		else if (!strcasecmp(encoding, "Q")) {	/**< quoted-printable */
+		else if (!strcasecmp(encoding, "Q")) {	// quoted-printable
 			size_t len;
-			long pos;
+			unsigned long pos;
 			
 			len = strlen(istr);
 			pos = 0;
@@ -207,7 +206,7 @@ void utf8ify_rfc822_string(char *buf) {
 			ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
 		}
 		else {
-			strcpy(ibuf, istr);		/**< unknown encoding */
+			strcpy(ibuf, istr);		// unknown encoding
 			ibuflen = strlen(istr);
 		}
 
@@ -269,15 +268,12 @@ inline void utf8ify_rfc822_string(char *a){};
 #endif
 
 
-
 struct trynamebuf {
 	char buffer1[SIZ];
 	char buffer2[SIZ];
 };
 
 char *inetcfg = NULL;
-struct spamstrings_t *spamstrings = NULL;
-
 
 /*
  * Return nonzero if the supplied name is an alias for this host.
@@ -289,12 +285,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, config.c_fqdn)) return(hostalias_localhost);
-	if (!strcasecmp(fqdn, config.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) {
@@ -305,27 +301,28 @@ 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);
 }
 
 
-
 /*
  * Determine whether a given Internet address belongs to the current user
  */
@@ -379,16 +376,13 @@ 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)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < strlen(name); ++i) {
 		if (name[i] == '@') {
@@ -406,20 +400,14 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
 
 /*
  * Aliasing for network mail.
- * (Error messages have been commented out, because this is a server.)
  */
 int alias(char *name)
 {				/* process alias and routing info for mail */
-	struct CitContext *CCC = CC;
 	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);
@@ -428,7 +416,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");
+	fp = fopen(file_mail_aliases, "r");		// when are we going to get rid of this?
 	if (fp == NULL) {
 		fp = fopen("/dev/null", "r");
 	}
@@ -442,10 +430,11 @@ int alias(char *name)
 			strcpy(name, &name[1]);
 		aaa[strlen(aaa) - 1] = 0;
 		strcpy(bbb, "");
-		for (a = 0; a < strlen(aaa); ++a) {
+		for (a = 0; aaa[a] != '\0'; ++a) {
 			if (aaa[a] == ',') {
 				strcpy(bbb, &aaa[a + 1]);
 				aaa[a] = 0;
+				break;
 			}
 		}
 		if (!strcasecmp(name, aaa))
@@ -453,21 +442,22 @@ int alias(char *name)
 	}
 	fclose(fp);
 
-	/* Hit the Global Address Book */
+	/* Hit the email address directory */
 	if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
 		strcpy(name, aaa);
 	}
 
 	if (strcasecmp(original_name, name)) {
-		MSG_syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name);
+		syslog(LOG_INFO, "internet_addressing: %s is being forwarded to %s", original_name, name);
 	}
 
 	/* Change "user @ xxx" to "user" if xxx is an alias for this host */
-	for (a=0; a<strlen(name); ++a) {
+	for (a=0; name[a] != '\0'; ++a) {
 		if (name[a] == '@') {
 			if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
 				name[a] = 0;
-				MSG_syslog(LOG_INFO, "Changed to <%s>\n", name);
+				syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name);
+				break;
 			}
 		}
 	}
@@ -488,40 +478,11 @@ 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);
 }
 
 
-
 /*
  * Validate recipients, count delivery types and errors, and handle aliasing
  * FIXME check for dupes!!!!!
@@ -531,9 +492,8 @@ 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) {
+recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags)
+{
 	struct CitContext *CCC = CC;
 	recptypes *ret;
 	char *recipients = NULL;
@@ -575,7 +535,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);
@@ -584,7 +543,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;
@@ -619,7 +577,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 		striplt(this_recp);
 		if (IsEmptyStr(this_recp))
 			break;
-		MSG_syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp);
+		syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp);
 		++num_recps;
 
 		strcpy(org_recp, this_recp);
@@ -642,7 +600,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 		case MES_LOCAL:
 			if (!strcasecmp(this_recp, "sysop")) {
 				++ret->num_room;
-				strcpy(this_recp, config.c_aideroom);
+				strcpy(this_recp, CtdlGetConfigStr("c_aideroom"));
 				if (!IsEmptyStr(ret->recp_room)) {
 					strcat(ret->recp_room, "|");
 				}
@@ -709,8 +667,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.
 			 */
@@ -726,13 +684,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;
@@ -766,18 +717,15 @@ 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.");
 	}
 
-	MSGM_syslog(LOG_DEBUG, "validate_recipients()\n");
-	MSG_syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local);
-	MSG_syslog(LOG_DEBUG, "  room: %d <%s>\n", ret->num_room, ret->recp_room);
-	MSG_syslog(LOG_DEBUG, "  inet: %d <%s>\n", ret->num_internet, ret->recp_internet);
-	MSG_syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet);
-	MSG_syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg);
+	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);
 	return(ret);
@@ -794,15 +742,13 @@ void free_recipients(recptypes *valid) {
 	}
 
 	if (valid->recptypes_magic != RECPTYPES_MAGIC) {
-		struct CitContext *CCC = CC;
-		MSGM_syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n");
+		syslog(LOG_ERR, "internet_addressing: attempt to call free_recipients() on some other data type!");
 		abort();
 	}
 
 	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);
@@ -815,7 +761,6 @@ void free_recipients(recptypes *valid) {
 
 char *qp_encode_email_addrs(char *source)
 {
-	struct CitContext *CCC = CC;
 	char *user, *node, *name;
 	const char headerStr[] = "=?UTF-8?Q?";
 	char *Encoded;
@@ -834,8 +779,7 @@ char *qp_encode_email_addrs(char *source)
 
 	if (source == NULL) return source;
 	if (IsEmptyStr(source)) return source;
-	if (MessageDebugEnabled != 0) cit_backtrace();
-	MSG_syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source);
+	syslog(LOG_DEBUG, "internet_addressing: qp_encode_email_addrs <%s>", source);
 
 	AddrPtr = malloc (sizeof (long) * nAddrPtrMax);
 	AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax);
@@ -881,8 +825,9 @@ char *qp_encode_email_addrs(char *source)
 	EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3;
 	Encoded = (char*) malloc (EncodedMaxLen);
 
-	for (i = 0; i < nColons; i++)
+	for (i = 0; i < nColons; i++) {
 		source[AddrPtr[i]++] = '\0';
+	}
 	/* TODO: if libidn, this might get larger*/
 	user = malloc(SourceLen + 1);
 	node = malloc(SourceLen + 1);
@@ -940,31 +885,6 @@ char *qp_encode_email_addrs(char *source)
 }
 
 
-/*
- * Return 0 if a given string fuzzy-matches a Citadel user account
- *
- * FIXME ... this needs to be updated to handle aliases.
- */
-int fuzzy_match(struct ctdluser *us, char *matchstring) {
-	int a;
-	long len;
-
-	if ( (!strncasecmp(matchstring, "cit", 3)) 
-	   && (atol(&matchstring[3]) == us->usernum)) {
-		return 0;
-	}
-
-	len = strlen(matchstring);
-	for (a=0; !IsEmptyStr(&us->fullname[a]); ++a) {
-		if (!strncasecmp(&us->fullname[a],
-		   matchstring, len)) {
-			return 0;
-		}
-	}
-	return -1;
-}
-
-
 /*
  * Unfold a multi-line field into a single line, removing multi-whitespaces
  */
@@ -991,15 +911,14 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
 	{
 		if ((*sField=='\r') || (*sField=='\n'))
 		{
-			int offset = 1;
-
-			if  (*(sField+1) == '\n')
-				offset++;
-
-			if (sField + offset == pFieldEnd)
-				break;
-
-			*pField = *sField + offset;
+			int Offset = 1;
+			while (((*(sField + Offset) == '\r') ||
+				(*(sField + Offset) == '\n') ||
+				(isspace(*(sField + Offset)))) && 
+			       (sField + Offset < pFieldEnd))
+				Offset ++;
+			sField += Offset;
+			*pField = *sField;
 		}
 		else {
 			if (*sField=='\"') quote = 1 - quote;
@@ -1025,7 +944,6 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
 }
 
 
-
 /*
  * Split an RFC822-style address into userid, host, and full name
  *
@@ -1035,7 +953,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 	int a;
 
 	strcpy(user, "");
-	strcpy(node, config.c_fqdn);
+	strcpy(node, CtdlGetConfigStr("c_fqdn"));
 	strcpy(name, "");
 
 	if (rfc822 == NULL) return;
@@ -1049,11 +967,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		strcpy(name, &name[1]);
 
 	/* and anything to the right of a @ or % */
-	for (a = 0; a < strlen(name); ++a) {
-		if (name[a] == '@')
+	for (a = 0; name[a] != '\0'; ++a) {
+		if (name[a] == '@') {
 			name[a] = 0;
-		if (name[a] == '%')
+			break;
+		}
+		if (name[a] == '%') {
 			name[a] = 0;
+			break;
+		}
 	}
 
 	/* but if there are parentheses, that changes the rules... */
@@ -1069,9 +991,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 			strcpy(&name[0], &name[1]);
 		}
 		strcpy(&name[0], &name[1]);
-		for (a = 0; a < strlen(name); ++a)
-			if (name[a] == 34)
+		for (a = 0; name[a] != '\0'; ++a)
+			if (name[a] == 34) {
 				name[a] = 0;
+				break;
+			}
 	}
 	/* extract user id */
 	strcpy(user, rfc822);
@@ -1089,11 +1013,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		strcpy(user, &user[1]);
 
 	/* and anything to the right of a @ or % */
-	for (a = 0; a < strlen(user); ++a) {
-		if (user[a] == '@')
+	for (a = 0; user[a] != '\0'; ++a) {
+		if (user[a] == '@') {
 			user[a] = 0;
-		if (user[a] == '%')
+			break;
+		}
+		if (user[a] == '%') {
 			user[a] = 0;
+			break;
+		}
 	}
 
 
@@ -1114,7 +1042,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		&& (haschar(node, '%')==0)
 		&& (haschar(node, '!')==0)
 	) {
-		strcpy(node, config.c_nodename);
+		strcpy(node, CtdlGetConfigStr("c_nodename"));
 	}
 
 	else {
@@ -1132,9 +1060,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 			strcpy(node, &node[1]);
 	
 		/* now get rid of the user portion of a node!user string */
-		for (a = 0; a < strlen(node); ++a)
-			if (node[a] == '!')
+		for (a = 0; node[a] != '\0'; ++a)
+			if (node[a] == '!') {
 				node[a] = 0;
+				break;
+			}
 	}
 
 	/* strip leading and trailing spaces in all strings */
@@ -1152,7 +1082,6 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 }
 
 
-
 /*
  * convert_field() is a helper function for convert_internet_message().
  * Given start/end positions for an rfc822 field, it converts it to a Citadel
@@ -1212,11 +1141,11 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
 
 	else if (!strcasecmp(key, "From")) {
 		process_rfc822_addr(value, user, node, name);
-		syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", 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))
+		if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name))
 			CM_SetField(msg, eAuthor, name, strlen(name));
-		if (CM_IsEmpty(msg, erFc822Addr))
+		if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr))
 			CM_SetField(msg, erFc822Addr, addr, strlen(addr));
 		processed = 1;
 	}
@@ -1247,7 +1176,7 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
 
 	else if (!strcasecmp(key, "Message-ID")) {
 		if (!CM_IsEmpty(msg, emessageId)) {
-			syslog(LOG_WARNING, "duplicate message id\n");
+			syslog(LOG_WARNING, "internet_addressing: duplicate message id");
 		}
 		else {
 			char *pValue;
@@ -1358,7 +1287,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 }
 
 
-
 struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
 {
 	struct CtdlMessage *msg;
@@ -1453,7 +1381,6 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
 }
 
 
-
 /*
  * Look for a particular header field in an RFC822 message text.  If the
  * requested field is found, it is unfolded (if necessary) and returned to
@@ -1505,7 +1432,6 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 }
 
 
-
 /*****************************************************************************
  *                      DIRECTORY MANAGEMENT FUNCTIONS                       *
  *****************************************************************************/
@@ -1525,13 +1451,11 @@ void directory_key(char *key, char *addr) {
 	}
 	key[keylen++] = 0;
 
-	syslog(LOG_DEBUG, "Directory key is <%s>\n", key);
+	syslog(LOG_DEBUG, "internet_addressing: directory key is <%s>", key);
 }
 
 
-
-/* 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];
@@ -1545,7 +1469,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 {
@@ -1554,23 +1478,16 @@ 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, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr);
+	}
+	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 );
 	return 1;
@@ -1585,8 +1502,8 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
  */
 int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
-
-	syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr);
+	
+	syslog(LOG_DEBUG, "internet_addressing: delete directory entry: %s --> %s", internet_addr, citadel_addr);
 	directory_key(key, internet_addr);
 	return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0;
 }
@@ -1602,7 +1519,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);
@@ -1613,7 +1532,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);
 	}
@@ -1671,7 +1592,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)) {
@@ -1690,3 +1611,141 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	}
 	return(coll);
 }
+
+
+/*
+ * Helper function for CtdlRebuildDirectoryIndex()
+ *
+ * Call this function as a ForEachUser backend in order to queue up
+ * user names, or call it with a null user to make it do the processing.
+ * This allows us to maintain the list as a static instead of passing
+ * pointers around.
+ */
+void CtdlRebuildDirectoryIndex_backend(struct ctdluser *usbuf, void *data) {
+
+	struct crdib {
+		char name[64];
+		char emails[512];
+	};
+
+	static struct crdib *e = NULL;
+	static int num_e = 0;
+	static int alloc_e = 0;
+
+	/* this is the calling mode where we add a user */
+
+	if (usbuf != NULL) {
+		if (num_e >= alloc_e) {
+			if (alloc_e == 0) {
+				alloc_e = 100;
+				e = malloc(sizeof(struct crdib) * alloc_e);
+			}
+			else {
+				alloc_e *= 2;
+				e = realloc(e, (sizeof(struct crdib) * alloc_e));
+			}
+		}
+		strcpy(e[num_e].name, usbuf->fullname);
+		strcpy(e[num_e].emails, usbuf->emailaddrs);
+		++num_e;
+		return;
+	}
+
+	/* this is the calling mode where we do the processing */
+
+	int i, j;
+	for (i=0; i<num_e; ++i) {
+		if ( (!IsEmptyStr(e[i].name)) && (!IsEmptyStr(e[i].emails)) ) {
+			for (j=0; j<num_tokens(e[i].emails, '|'); ++j) {
+				char one_email[512];
+				extract_token(one_email, e[i].emails, j, '|', sizeof one_email);
+				CtdlDirectoryAddUser(one_email, e[i].name);
+			}
+		}
+	}
+	free(e);
+	num_e = 0;
+	alloc_e = 0;
+	return;
+}
+
+
+/*
+ * 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);
+	CtdlRebuildDirectoryIndex_backend(NULL, 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);
+	}
+
+	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);
+}