dnsbl: src/dnsbl.cpp comparison

sendmail no longer guarantees <> wrapper on envelopes

comparison

equal deleted inserted replaced

-:05ae49d37896
+:2b1a4701e856
 		}
 	}
 	return false;
 }
-////////////////////////////////////////////////
-// this email address is passed in from sendmail, and will
+////////////////////////////////////////////////
-// always be enclosed in <>. It may have mixed case, just
+//
-// as the mail client sent it. We dup the string and convert
+// this email address is passed in from sendmail, and will normally be
-// the duplicate to lower case.
+// enclosed in <>.	I think older versions of sendmail supplied the <>
+// wrapper if the mail client did not, but the current version does not do
+// that.  So the <> wrapper is now optional.  It may have mixed case, just
+// as the mail client sent it.	We dup the string and convert the duplicate
+// to lower case.
 //
 char *to_lower_string(char *email);
 char *to_lower_string(char *email) {
-	int n = strlen(email)-2;
+	int n = strlen(email);
-	if (n < 1) return strdup(email);
+	if (*email == '<') {
-	char *key = strdup(email+1);
+		// assume it also ends with >
+		n -= 2;
+		if (n < 1) return strdup(email);	// return "<>"
+		email++;
+	}
+	char *key = strdup(email);
 	key[n] = '\0';
 	for (int i=0; i<n; i++) key[i] = tolower(key[i]);
 	return key;
 }

Mercurial > dnsbl