X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=030291f6c6412ec2286a356e64b33f986bae71e7;hb=2f8e2137a6b9cb436d9dd01c2cf28a8a772044c1;hp=416586bedeb0e9bd35503e1715aca1dc661737c9;hpb=9ffea7c3315046ddcea2589656c13da5f5e0c076;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 416586bed..030291f6c 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-2019 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.
@@ -134,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);
@@ -143,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) ||
@@ -180,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);
@@ -197,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 {
@@ -353,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)
 {
@@ -380,8 +374,7 @@ 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)
-{
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
 	unsigned int i;
 
 	for (i = 0; i < strlen(name); ++i) {
@@ -465,8 +458,7 @@ 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;
@@ -594,8 +586,7 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 					Flags,
 					0			/* 0 = not a reply */
 					);
-				if (err)
-				{
+				if (err) {
 					++ret->num_error;
 					invalid = 1;
 				} 
@@ -690,8 +681,7 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	}
 	free(org_recp);
 
-	if ( (ret->num_local + ret->num_internet + 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.");
 	}
@@ -884,13 +874,11 @@ 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 {
@@ -1116,10 +1104,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;
 	}
 
@@ -1428,7 +1418,8 @@ void directory_key(char *key, char *addr) {
 }
 
 
-/* Return nonzero if the supplied address is in one of "our" domains
+/*
+ * Return nonzero if the supplied address is in one of "our" domains
  */
 int IsDirectory(char *addr, int allow_masq_domains) {
 	char domain[256];
@@ -1680,6 +1671,7 @@ void AutoGenerateEmailAddressForUser(struct ctdluser *user)
 			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);