Attachment #52680 for bug #79777

View | Details | Raw Unified | Return to bug 79777
Collapse All | Expand All

Lines 32-38 Link Here

(-)postfix-current/Makefile (-1 / +1 lines)
32	MAINTAINER= marcus@corp.grupos.com.br	32	MAINTAINER= marcus@corp.grupos.com.br
33	COMMENT= A secure alternative to widely-used Sendmail	33	COMMENT= A secure alternative to widely-used Sendmail
34		34
35	PORTVERSIONRAW= 2.3-20050401	35	PORTVERSIONRAW= 2.3-20050404
36		36
37	CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.2.* \	37	CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.2.* \
38	sendmail-8.* sendmail--8. smail-3.* zmailer-2.*	38	sendmail-8.* sendmail--8. smail-3.* zmailer-2.*

Lines 1-2 Link Here

(-)postfix-current/distinfo (-2 / +2 lines)
1	MD5 (postfix/postfix-2.3-20050401.tar.gz) = b0760635e7e767e67c0ee39056819388	1	MD5 (postfix/postfix-2.3-20050404.tar.gz) = ed014027f63626bffe5dd7dd3a4e187b
2	SIZE (postfix/postfix-2.3-20050401.tar.gz) = 2442891	2	SIZE (postfix/postfix-2.3-20050404.tar.gz) = 2442512




--- src/lmtp/lmtp_sasl_glue.c.orig	Mon Apr 11 00:08:53 2005
+++ src/lmtp/lmtp_sasl_glue.c	Mon Apr 11 00:09:03 2005
@@ -292,6 +292,14 @@
 
 void    lmtp_sasl_initialize(void)
 {
+    /*
+     * Global callbacks. These have no per-session context.
+     */
+    static sasl_callback_t callbacks[] = {
+	{SASL_CB_LOG, &lmtp_sasl_log, 0},
+	{SASL_CB_LIST_END, 0, 0}
+    };
+
 #if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
     || (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
     int     sasl_major;
@@ -313,14 +321,6 @@
 		  SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
 		  sasl_major, sasl_minor, sasl_step);
 #endif
-
-    /*
-     * Global callbacks. These have no per-session context.
-     */
-    static sasl_callback_t callbacks[] = {
-	{SASL_CB_LOG, &lmtp_sasl_log, 0},
-	{SASL_CB_LIST_END, 0, 0}
-    };
 
     /*
      * Sanity check.




--- src/smtp/smtp_sasl_glue.c.orig	Mon Apr 11 00:09:17 2005
+++ src/smtp/smtp_sasl_glue.c	Mon Apr 11 00:09:30 2005
@@ -321,6 +321,14 @@
 
 void    smtp_sasl_initialize(void)
 {
+    /*
+     * Global callbacks. These have no per-session context.
+     */
+    static sasl_callback_t callbacks[] = {
+	{SASL_CB_LOG, &smtp_sasl_log, 0},
+	{SASL_CB_LIST_END, 0, 0}
+    };
+
 #if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
     || (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
     int     sasl_major;
@@ -342,14 +350,6 @@
 		  SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
 		  sasl_major, sasl_minor, sasl_step);
 #endif
-
-    /*
-     * Global callbacks. These have no per-session context.
-     */
-    static sasl_callback_t callbacks[] = {
-	{SASL_CB_LOG, &smtp_sasl_log, 0},
-	{SASL_CB_LIST_END, 0, 0}
-    };
 
     /*
      * Sanity check.

Return to bug 79777

Line 0 Link Here

(-)postfix-current/files/patch-src::lmtp::lmtp_sasl_glue.c (+32 lines)
	1	--- src/lmtp/lmtp_sasl_glue.c.orig Mon Apr 11 00:08:53 2005
	2	+++ src/lmtp/lmtp_sasl_glue.c Mon Apr 11 00:09:03 2005
	3	@@ -292,6 +292,14 @@
	4
	5	void lmtp_sasl_initialize(void)
	6	{
	7	+ /*
	8	+ * Global callbacks. These have no per-session context.
	9	+ */
	10	+ static sasl_callback_t callbacks[] = {
	11	+ {SASL_CB_LOG, &lmtp_sasl_log, 0},
	12	+ {SASL_CB_LIST_END, 0, 0}
	13	+ };
	14	+
	15	#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
	16	\|\| (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
	17	int sasl_major;
	18	@@ -313,14 +321,6 @@
	19	SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
	20	sasl_major, sasl_minor, sasl_step);
	21	#endif
	22	-
	23	- /*
	24	- * Global callbacks. These have no per-session context.
	25	- */
	26	- static sasl_callback_t callbacks[] = {
	27	- {SASL_CB_LOG, &lmtp_sasl_log, 0},
	28	- {SASL_CB_LIST_END, 0, 0}
	29	- };
	30
	31	/*
	32	* Sanity check.

Line 0 Link Here

(-)postfix-current/files/patch-src::smtp::smtp_sasl_glue.c (+32 lines)
	1	--- src/smtp/smtp_sasl_glue.c.orig Mon Apr 11 00:09:17 2005
	2	+++ src/smtp/smtp_sasl_glue.c Mon Apr 11 00:09:30 2005
	3	@@ -321,6 +321,14 @@
	4
	5	void smtp_sasl_initialize(void)
	6	{
	7	+ /*
	8	+ * Global callbacks. These have no per-session context.
	9	+ */
	10	+ static sasl_callback_t callbacks[] = {
	11	+ {SASL_CB_LOG, &smtp_sasl_log, 0},
	12	+ {SASL_CB_LIST_END, 0, 0}
	13	+ };
	14	+
	15	#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
	16	\|\| (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
	17	int sasl_major;
	18	@@ -342,14 +350,6 @@
	19	SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
	20	sasl_major, sasl_minor, sasl_step);
	21	#endif
	22	-
	23	- /*
	24	- * Global callbacks. These have no per-session context.
	25	- */
	26	- static sasl_callback_t callbacks[] = {
	27	- {SASL_CB_LOG, &smtp_sasl_log, 0},
	28	- {SASL_CB_LIST_END, 0, 0}
	29	- };
	30
	31	/*
	32	* Sanity check.