diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:42:30 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:42:30 +0000 |
commit | e78efaf2bfcc6663589347eb78b8ba2b005f50e9 (patch) | |
tree | 2a961ba4225f1a7cbea7dda52d2b2268d79ff7c4 /debian/patches/07_sasl_config.diff | |
parent | Merging upstream version 3.9.0. (diff) | |
download | postfix-e78efaf2bfcc6663589347eb78b8ba2b005f50e9.tar.xz postfix-e78efaf2bfcc6663589347eb78b8ba2b005f50e9.zip |
Merging debian version 3.9.0-1~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/07_sasl_config.diff')
-rw-r--r-- | debian/patches/07_sasl_config.diff | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/debian/patches/07_sasl_config.diff b/debian/patches/07_sasl_config.diff index e1ab0fc..29c6658 100644 --- a/debian/patches/07_sasl_config.diff +++ b/debian/patches/07_sasl_config.diff @@ -9,11 +9,11 @@ Forwarded: not-needed src/xsasl/xsasl_cyrus_server.c | 3 +++ 4 files changed, 25 insertions(+) -diff --git a/src/xsasl/xsasl_cyrus_client.c b/src/xsasl/xsasl_cyrus_client.c -index fc799c9..e76f0db 100644 ---- a/src/xsasl/xsasl_cyrus_client.c -+++ b/src/xsasl/xsasl_cyrus_client.c -@@ -229,6 +229,9 @@ XSASL_CLIENT_IMPL *xsasl_cyrus_client_init(const char *unused_client_type, +Index: postfix/src/xsasl/xsasl_cyrus_client.c +=================================================================== +--- postfix.orig/src/xsasl/xsasl_cyrus_client.c ++++ postfix/src/xsasl/xsasl_cyrus_client.c +@@ -229,6 +229,9 @@ XSASL_CLIENT_IMPL *xsasl_cyrus_client_in */ static sasl_callback_t callbacks[] = { {SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, 0}, @@ -23,10 +23,10 @@ index fc799c9..e76f0db 100644 {SASL_CB_LIST_END, 0, 0} }; -diff --git a/src/xsasl/xsasl_cyrus_common.h b/src/xsasl/xsasl_cyrus_common.h -index 5447378..1cd2251 100644 ---- a/src/xsasl/xsasl_cyrus_common.h -+++ b/src/xsasl/xsasl_cyrus_common.h +Index: postfix/src/xsasl/xsasl_cyrus_common.h +=================================================================== +--- postfix.orig/src/xsasl/xsasl_cyrus_common.h ++++ postfix/src/xsasl/xsasl_cyrus_common.h @@ -16,12 +16,17 @@ */ #if defined(USE_SASL_AUTH) && defined(USE_CYRUS_SASL) @@ -45,10 +45,10 @@ index 5447378..1cd2251 100644 #endif -diff --git a/src/xsasl/xsasl_cyrus_log.c b/src/xsasl/xsasl_cyrus_log.c -index 7bf25c3..6d1e413 100644 ---- a/src/xsasl/xsasl_cyrus_log.c -+++ b/src/xsasl/xsasl_cyrus_log.c +Index: postfix/src/xsasl/xsasl_cyrus_log.c +=================================================================== +--- postfix.orig/src/xsasl/xsasl_cyrus_log.c ++++ postfix/src/xsasl/xsasl_cyrus_log.c @@ -28,10 +28,16 @@ /* System library. */ @@ -66,7 +66,7 @@ index 7bf25c3..6d1e413 100644 /* Application-specific */ -@@ -101,4 +107,12 @@ int xsasl_cyrus_log(void *unused_context, int priority, +@@ -101,4 +107,12 @@ int xsasl_cyrus_log(void *unused_con return (SASL_OK); } @@ -79,11 +79,11 @@ index 7bf25c3..6d1e413 100644 +#endif + #endif -diff --git a/src/xsasl/xsasl_cyrus_server.c b/src/xsasl/xsasl_cyrus_server.c -index 89e1fc9..8f5edae 100644 ---- a/src/xsasl/xsasl_cyrus_server.c -+++ b/src/xsasl/xsasl_cyrus_server.c -@@ -181,6 +181,9 @@ static const char *xsasl_cyrus_server_get_username(XSASL_SERVER *); +Index: postfix/src/xsasl/xsasl_cyrus_server.c +=================================================================== +--- postfix.orig/src/xsasl/xsasl_cyrus_server.c ++++ postfix/src/xsasl/xsasl_cyrus_server.c +@@ -185,6 +185,9 @@ static const char *xsasl_cyrus_server_ge static sasl_callback_t callbacks[] = { {SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, NO_CALLBACK_CONTEXT}, |