-- fix the resend the email a ton of times bug. the queue was out of sync causing delivery to appear to fail

Makefile.am

@@ -95,7 +95,6 @@ clean-docs:
 
 #	disabled agents
 #	src/agents/mailprox			
-#	src/agents/rules			
 #	src/agents/calcmd
 
 include_subdirs =				\
@@ -129,6 +128,7 @@ include_subdirs =				\
 	src/agents/itip				\
 	src/agents/pop				\
 	src/agents/queue			\
+	src/agents/rules			\
 	src/agents/smtp				\
 	src/agents/store			\
 	src/agents/store/tests			\
@@ -181,7 +181,7 @@ include src/agents/itip/Bongo.rules
 #include src/agents/mailprox/Bongo.rules
 include src/agents/pop/Bongo.rules
 include src/agents/queue/Bongo.rules
-#include src/agents/rules/Bongo.rules
+include src/agents/rules/Bongo.rules
 include src/agents/smtp/Bongo.rules
 include src/agents/store/Bongo.rules
 include src/agents/store/tests/Bongo.rules

configure.ac

@@ -682,7 +682,6 @@ ac_configure_args="$ac_configure_args --enable-threadsafe --enable-cross-thread-
 
 # disabled agents
 # src/agents/mailprox/Makefile
-# src/agents/rules/Makefile
 # src/agents/pluspack/Makefile
 # src/agents/calcmd/Makefile
 
@@ -710,6 +709,7 @@ src/agents/imap/tests/Makefile
 src/agents/itip/Makefile
 src/agents/pop/Makefile
 src/agents/queue/Makefile
+src/agents/rules/Makefile
 src/agents/smtp/Makefile
 src/agents/store/Makefile
 src/agents/store/tests/Makefile

src/agents/smtp/smtpc.c

@@ -450,6 +450,9 @@ beginConversation:
     ConnFlush(Remote->conn);
     ConnReadAnswer(Remote->conn, Remote->line, CONN_BUFSIZE);
 
+    /* read in the 1000 OK */
+    ConnReadAnswer(Queue->conn, Queue->line, CONN_BUFSIZE);
+
 finalization:
     Log(LOG_INFO, "Remote server responded with: '%s' for message %s from %s to %s",
         Remote->line, Queue->qID, Queue->sender, Recip->To);