[SVN] r637 - /branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch

[debian at incase.de]

Author: farzy
Date: Fri Sep 29 17:01:59 2006
New Revision: 637

URL: https://mail.incase.de/viewcvs?rev=637&root=cyrus22&view=rev
Log:
Withdraw the patch which adds "free(Services[i].exec)", as it causes "cyrmaster" to segfault on reload in version 2.3.7 with a double free in glibc.
The other free() patch, "free(Services[i].name)", does not seem to cause any trouble.

Modified:
    branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch

Modified: branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch?rev=637&root=cyrus22&r1=636&r2=637&view=diff
==============================================================================
--- branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch (original)
+++ branches/cyrus23-farzy/cyrus-imapd-2.3-2.3.7/debian/patches/13-master_process_handling.dpatch Fri Sep 29 17:01:59 2006
@@ -146,18 +146,6 @@
  #else
      }
  #endif /* HAVE_GETRLIMIT */
-@@ -1575,7 +1607,10 @@
- 
-     /* disable all services -
-        they will be re-enabled if they appear in config file */
--    for (i = 0; i < nservices; i++) Services[i].exec = NULL;
-+    for (i = 0; i < nservices; i++) {
-+	if (Services[i].exec) free((void*)Services[i].exec);
-+	Services[i].exec = NULL;
-+    }
- 
-     /* read services */
-     masterconf_getsection("SERVICES", &add_service, (void*) 1);
 @@ -1590,13 +1625,18 @@
  		       Services[i].stat[0], Services[i].stat[1]);