FastMail.FM patchset - new patches

[David Carter]

On Fri, 16 Mar 2007, David Carter wrote:

> Ah, have_uuid is new in 2.3. That line definitely needs to move, but I 
> think that the message_uuid_master_init() call should stay where it is.

Or even (as per the fastmail patch).

-- 
David Carter                             Email: David.Carter at ucs.cam.ac.uk
University Computing Service,            Phone: (01223) 334502
New Museums Site, Pembroke Street,       Fax:   (01223) 334679
Cambridge UK. CB2 3QH.

--- master/master.c-DIST        2007-03-16 08:45:56.000000000 +0000
+++ master/master.c     2007-03-16 09:49:01.000000000 +0000
@@ -1931,6 +1931,8 @@
      init_snmp("cyrusMaster");
  #endif

+    have_uuid = (config_getint(IMAPOPT_SYNC_MACHINEID) >= 0);
+
      masterconf_getsection("START", &add_start, NULL);
      masterconf_getsection("SERVICES", &add_service, NULL);
      masterconf_getsection("EVENTS", &add_event, NULL);
@@ -1954,7 +1956,6 @@
         }
      }

-    have_uuid = (config_getint(IMAPOPT_SYNC_MACHINEID) >= 0);
      if (have_uuid && !message_uuid_master_init()) {
          syslog(LOG_ERR, "Couldn't initialise UUID subsystem");
          exit(EX_OSERR);