Begin upgrading processor from spamassassin 3.1.3 to 3.2.5.

(get_transport): Initialize the transport with transport_init (should have
  already been doing this).  Set connect_retries and retry_sleep to the
  hard-coded settings from 3.1.3.

diff --git a/processor.c b/processor.c
index b09106e..66652d7 100644 (file)
--- a/processor.c
+++ b/processor.c
@@ -102,10 +102,14 @@ get_transport(struct transport *t)
 {
     int status;
 
 {
     int status;
 

+    transport_init(t);

     t->type = T_TYPE;
     t->socketpath = T_SOCK;
     t->hostname = T_HOST;
     t->port = T_PORT;
     t->type = T_TYPE;
     t->socketpath = T_SOCK;
     t->hostname = T_HOST;
     t->port = T_PORT;

+    /* In 3.1.3, these were the hard-coded settings. */
+    t->connect_retries = 3;
+    t->retry_sleep = 1;

 
     if ((status = transport_setup(t, 0)) != EX_OK) {
         warnx("non-fatal: transport_setup");
 
     if ((status = transport_setup(t, 0)) != EX_OK) {
         warnx("non-fatal: transport_setup");