← Back to branch summary

~ubuntu-branches/ubuntu/maverick/postfix/maverick-security

« back to all changes in this revision

Viewing changes to debian/patches/10tls.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones
  • Date: 2006-12-06 14:09:25 UTC
  • Revision ID: james.westby@ubuntu.com-20061206140925-pdfrq6tx8y0y35h1
Tags: 2.3.4-3
http://bugs.debian.org/397771
http://bugs.debian.org/398534
Fix broken tls patch.  Closes: #397771, #398534

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10tls.dpatch
5
5
## DP: Debian tweaks to the default tls config
6
6
 
7
7
@DPATCH@
8
 
diff -urNad postfix-2.3.4~/conf/main.cf.tls postfix-2.3.4/conf/main.cf.tls
9
 
--- postfix-2.3.4~/conf/main.cf.tls     1970-01-01 02:00:00.000000000 +0200
10
 
+++ postfix-2.3.4/conf/main.cf.tls      2006-11-16 19:57:50.000000000 +0200
 
8
diff -urNad postfix~/conf/main.cf.tls postfix/conf/main.cf.tls
 
9
--- postfix~/conf/main.cf.tls   1969-12-31 17:00:00.000000000 -0700
 
10
+++ postfix/conf/main.cf.tls    2006-12-06 13:16:29.000000000 -0700
11
11
@@ -0,0 +1,11 @@
12
12
+
13
13
+# TLS parameters
20
20
+# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
21
21
+# information on enabling SSL in the smtp client.
22
22
+
23
 
diff -urNad postfix-2.3.4~/src/global/mail_params.h postfix-2.3.4/src/global/mail_params.h
24
 
--- postfix-2.3.4~/src/global/mail_params.h     2006-11-16 19:57:50.000000000 +0200
25
 
+++ postfix-2.3.4/src/global/mail_params.h      2006-11-16 19:57:50.000000000 +0200
 
23
diff -urNad postfix~/src/global/mail_params.h postfix/src/global/mail_params.h
 
24
--- postfix~/src/global/mail_params.h   2006-12-06 13:16:28.000000000 -0700
 
25
+++ postfix/src/global/mail_params.h    2006-12-06 13:16:29.000000000 -0700
26
26
@@ -591,7 +591,7 @@
27
27
 extern int var_dup_filter_limit;
28
28
 
32
32
 extern char *var_tls_rand_exch_name;
33
33
 
34
34
 #define VAR_TLS_RAND_SOURCE    "tls_random_source"
35
 
diff -urNad postfix-2.3.4~/src/xsasl/xsasl_cyrus_client.c postfix-2.3.4/src/xsasl/xsasl_cyrus_client.c
36
 
--- postfix-2.3.4~/src/xsasl/xsasl_cyrus_client.c       2006-06-26 15:59:19.000000000 +0300
37
 
+++ postfix-2.3.4/src/xsasl/xsasl_cyrus_client.c        2006-11-16 19:57:50.000000000 +0200
 
35
diff -urNad postfix~/src/xsasl/xsasl_cyrus_client.c postfix/src/xsasl/xsasl_cyrus_client.c
 
36
--- postfix~/src/xsasl/xsasl_cyrus_client.c     2006-07-24 10:24:45.000000000 -0600
 
37
+++ postfix/src/xsasl/xsasl_cyrus_client.c      2006-12-06 13:25:12.000000000 -0700
38
38
@@ -222,6 +222,10 @@
39
39
      */
40
40
     static sasl_callback_t callbacks[] = {
41
41
        {SASL_CB_LOG, &xsasl_cyrus_log, 0},
42
42
+       {SASL_CB_GETPATH,&xsasl_getpath, 0},
43
 
+#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MAJOR > 2 || SASL_VERSION_MINOR >= 1) && (SASL_VERSION_MAJOR > 2 || (SASL_VERSION_MINOR > 1 || SASL_VERSION_STEP >= 22))
44
 
+   {SASL_CB_GETCONFPATH,&xsasl_getconfpath, 0},
 
43
+#ifdef SASL_CB_GETCONFPATH
 
44
+       {SASL_CB_GETCONFPATH,&xsasl_getconfpath, 0},
45
45
+#endif
46
46
        {SASL_CB_LIST_END, 0, 0}
47
47
     };
48
48
 
49
 
diff -urNad postfix-2.3.4~/src/xsasl/xsasl_cyrus_common.h postfix-2.3.4/src/xsasl/xsasl_cyrus_common.h
50
 
--- postfix-2.3.4~/src/xsasl/xsasl_cyrus_common.h       2005-12-20 19:48:22.000000000 +0200
51
 
+++ postfix-2.3.4/src/xsasl/xsasl_cyrus_common.h        2006-11-16 19:58:26.000000000 +0200
 
49
diff -urNad postfix~/src/xsasl/xsasl_cyrus_common.h postfix/src/xsasl/xsasl_cyrus_common.h
 
50
--- postfix~/src/xsasl/xsasl_cyrus_common.h     2006-07-24 10:24:45.000000000 -0600
 
51
+++ postfix/src/xsasl/xsasl_cyrus_common.h      2006-12-06 13:25:29.000000000 -0700
52
52
@@ -16,12 +16,18 @@
53
53
   */
54
54
 #if defined(USE_SASL_AUTH) && defined(USE_CYRUS_SASL)
62
62
 extern int xsasl_cyrus_log(void *, int, const char *);
63
63
 extern int xsasl_cyrus_security_parse_opts(const char *);
64
64
+extern int xsasl_getpath(void * context, char ** path);
65
 
+#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MAJOR > 2 || SASL_VERSION_MINOR >= 1) && (SASL_VERSION_MAJOR > 2 || (SASL_VERSION_MINOR > 1 || SASL_VERSION_STEP >= 22))
 
65
+#ifdef SASL_CB_GETCONFPATH
66
66
+extern int xsasl_getconfpath(void * context, char ** path);
67
67
+#endif
68
68
 
69
69
 #endif
70
70
 
71
 
diff -urNad postfix-2.3.4~/src/xsasl/xsasl_cyrus_log.c postfix-2.3.4/src/xsasl/xsasl_cyrus_log.c
72
 
--- postfix-2.3.4~/src/xsasl/xsasl_cyrus_log.c  2005-12-20 19:48:22.000000000 +0200
73
 
+++ postfix-2.3.4/src/xsasl/xsasl_cyrus_log.c   2006-11-16 19:57:50.000000000 +0200
 
71
diff -urNad postfix~/src/xsasl/xsasl_cyrus_log.c postfix/src/xsasl/xsasl_cyrus_log.c
 
72
--- postfix~/src/xsasl/xsasl_cyrus_log.c        2006-07-24 10:24:45.000000000 -0600
 
73
+++ postfix/src/xsasl/xsasl_cyrus_log.c 2006-12-06 13:25:50.000000000 -0700
74
74
@@ -28,6 +28,7 @@
75
75
 /* System library. */
76
76
 
93
93
+    return SASL_OK;
94
94
+}
95
95
+
96
 
+#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MAJOR > 2 || SASL_VERSION_MINOR >= 1) && (SASL_VERSION_MAJOR > 2 || (SASL_VERSION_MINOR > 1 || SASL_VERSION_STEP >= 22))
 
96
+#ifdef SASL_CB_GETCONFPATH
97
97
+int xsasl_getconfpath(void * context, char ** path)
98
98
+{
99
99
+    *path = strdup("/etc/postfix/sasl:/usr/lib/sasl2");
102
102
+#endif
103
103
+
104
104
 #endif
105
 
diff -urNad postfix-2.3.4~/src/xsasl/xsasl_cyrus_server.c postfix-2.3.4/src/xsasl/xsasl_cyrus_server.c
106
 
--- postfix-2.3.4~/src/xsasl/xsasl_cyrus_server.c       2006-06-26 15:59:19.000000000 +0300
107
 
+++ postfix-2.3.4/src/xsasl/xsasl_cyrus_server.c        2006-11-16 19:57:50.000000000 +0200
 
105
diff -urNad postfix~/src/xsasl/xsasl_cyrus_server.c postfix/src/xsasl/xsasl_cyrus_server.c
 
106
--- postfix~/src/xsasl/xsasl_cyrus_server.c     2006-07-24 10:24:45.000000000 -0600
 
107
+++ postfix/src/xsasl/xsasl_cyrus_server.c      2006-12-06 13:25:58.000000000 -0700
108
108
@@ -174,6 +174,10 @@
109
109
 
110
110
 static sasl_callback_t callbacks[] = {
111
111
     {SASL_CB_LOG, &xsasl_cyrus_log, NO_CALLBACK_CONTEXT},
112
112
+    {SASL_CB_GETPATH,&xsasl_getpath, 0},
113
 
+#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MAJOR > 2 || SASL_VERSION_MINOR >= 1) && (SASL_VERSION_MAJOR > 2 || (SASL_VERSION_MINOR > 1 || SASL_VERSION_STEP >= 22))
 
113
+#ifdef SASL_CB_GETCONFPATH
114
114
+    {SASL_CB_GETCONFPATH,&xsasl_getconfpath, 0},
115
115
+#endif
116
116
     {SASL_CB_LIST_END, 0, 0}