X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=33d70451a6f36406c36056d8b91954ce0e728f4e;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=90dd55a57e61f90081160e2349098f0110a7c423;hpb=76cbed11b16936a77f4c41d72ce04fb11df5d7d1;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 90dd55a57..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);
@@ -1519,7 +1492,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);
@@ -1530,7 +1505,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);
 	}
@@ -1716,7 +1693,31 @@ void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs)
 void AutoGenerateEmailAddressForUser(struct ctdluser *user)
 {
 	char synthetic_email_addr[1024];
-	snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn"));
+	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);