# HG changeset patch
# User Ben Schmidt
# Date 1289489209 -39600
# Node ID 62f9b36df5a5d47f1e96aad41eb7be182197d411
# Parent  2add5c5f88f87ebebbd4f1ca396de666240aac83
Avoid checking addresses multiple times for notmetoo

diff -r 2add5c5f88f8 -r 62f9b36df5a5 ChangeLog
--- a/ChangeLog	Fri Nov 12 00:53:36 2010 +1100
+++ b/ChangeLog	Fri Nov 12 02:26:49 2010 +1100
@@ -1,3 +1,5 @@
+ o Avoid checking addresses multiple times for notmetoo and make it work even
+   when delivering messages individually
  o Fixed small memory leaks when SMTP errors occur
  o Improved error logging when requeuing
  o Fix php-admin to work when topdir contains a symlink (e.g. on Mac)
diff -r 2add5c5f88f8 -r 62f9b36df5a5 src/mlmmj-send.c
--- a/src/mlmmj-send.c	Fri Nov 12 00:53:36 2010 +1100
+++ b/src/mlmmj-send.c	Fri Nov 12 02:26:49 2010 +1100
@@ -1189,10 +1189,11 @@
 				continue;
 			}
 			do {
+				i = stl.count;
 				res = getaddrsfromfd(&stl, subfd,
 						maxverprecips);
-				if(omit != NULL && maxverprecips > 1) {
-					for(i = 0; i < stl.count; i++) {
+				if(omit != NULL) {
+					while(i < stl.count) {
 						if(strcmp(stl.strs[i], omit)
 							== 0) {
 						    myfree(stl.strs[i]);
@@ -1205,6 +1206,7 @@
 						    stl.strs[stl.count] = NULL;
 						    break;
 						}
+						i++;
 					}
 				}
 				if(stl.count == maxverprecips) {