rpms
/
postfix
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patch for SRV record resolution feature 

Related: rhbz#2134789
This commit is contained in:
Tomas Korbar 2023-05-17 10:05:36 +02:00
parent 990309a6c1
commit dd2d45e2a6
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
postfix-3.5.9-SRV-resolve.patch
View File

@ -1,6 +1,6 @@
commit 15dc275ce64c7c715094347456ac62a001f65b08 commit 3a64b35100aa150ce80957dc56f0db7fbdb07017
Author: Tomas Korbar <tkorbar@redhat.com> Author: Tomas Korbar <tkorbar@redhat.com>
Date: Thu Apr 27 10:45:22 2023 +0200 Date: Wed May 17 10:01:21 2023 +0200
Backport SRV record resolution feature Backport SRV record resolution feature
@ -659,7 +659,7 @@ index 27b17d5..e8d9c28 100644
/* .ad /* .ad
/* .fi /* .fi
diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c
index a3a9946..a56bad1 100644 index a3a9946..60bf047 100644
--- a/src/posttls-finger/posttls-finger.c --- a/src/posttls-finger/posttls-finger.c
+++ b/src/posttls-finger/posttls-finger.c +++ b/src/posttls-finger/posttls-finger.c
@@ -236,6 +236,8 @@ @@ -236,6 +236,8 @@
@ -838,17 +838,22 @@ index a3a9946..a56bad1 100644
if (alldig(service)) { if (alldig(service)) {
if ((port = atoi(service)) >= 65536 || port == 0) if ((port = atoi(service)) >= 65536 || port == 0)
msg_fatal("bad network port in destination: %s", destination); msg_fatal("bad network port in destination: %s", destination);
@@ -1509,15 +1587,18 @@ static void connect_remote(STATE *state, char *dest) @@ -1507,17 +1585,21 @@ static char *parse_destination(char *destination, char *def_service,
static void connect_remote(STATE *state, char *dest)
{
DNS_RR *addr; DNS_RR *addr;
char *buf; - char *buf;
char *domain; - char *domain;
+ char *service;
/* When reconnecting use IP address of previous session */ /* When reconnecting use IP address of previous session */
if (state->addr == 0) { if (state->addr == 0) {
+ char *buf;
+ char *domain;
+ char *service;
+
buf = parse_destination(dest, state->smtp ? "smtp" : "24", buf = parse_destination(dest, state->smtp ? "smtp" : "24",
- &domain, &state->port); - &domain, &state->port);
+ &domain, service, &state->port); + &domain, &service, &state->port);
if (!state->nexthop) if (!state->nexthop)
state->nexthop = mystrdup(domain); state->nexthop = mystrdup(domain);
if (state->smtp == 0 || *dest == '[') if (state->smtp == 0 || *dest == '[')
@ -858,7 +863,7 @@ index a3a9946..a56bad1 100644
else else
state->addr = domain_addr(state, domain); state->addr = domain_addr(state, domain);
myfree(buf); myfree(buf);
@@ -1531,10 +1612,14 @@ static void connect_remote(STATE *state, char *dest) @@ -1531,10 +1613,14 @@ static void connect_remote(STATE *state, char *dest)
for (addr = state->addr; addr; addr = addr->next) { for (addr = state->addr; addr; addr = addr->next) {
int level = dane_host_level(state, addr); int level = dane_host_level(state, addr);
@ -869,13 +874,13 @@ index a3a9946..a56bad1 100644
|| (state->stream = connect_addr(state, addr)) == 0) { || (state->stream = connect_addr(state, addr)) == 0) {
- msg_info("Failed to establish session to %s via %s: %s", - msg_info("Failed to establish session to %s via %s: %s",
- dest, HNAME(addr), vstring_str(state->why->reason)); - dest, HNAME(addr), vstring_str(state->why->reason));
+ msg_info("Failed to establish session to %s:%s via %s:%u: %s", + msg_info("Failed to establish session to %s via %s:%u: %s",
+ dest, service, HNAME(addr), addr->port, + dest, HNAME(addr), addr->port,
+ vstring_str(state->why->reason)); + vstring_str(state->why->reason));
continue; continue;
} }
/* We have a connection */ /* We have a connection */
@@ -1819,6 +1904,7 @@ static void parse_options(STATE *state, int argc, char *argv[]) @@ -1819,6 +1905,7 @@ static void parse_options(STATE *state, int argc, char *argv[])
state->smtp = 1; state->smtp = 1;
state->pass = 1; state->pass = 1;
@ -883,7 +888,7 @@ index a3a9946..a56bad1 100644
state->reconnect = -1; state->reconnect = -1;
state->max_reconnect = 5; state->max_reconnect = 5;
state->wrapper_mode = 0; state->wrapper_mode = 0;
@@ -1829,7 +1915,7 @@ static void parse_options(STATE *state, int argc, char *argv[]) @@ -1829,7 +1916,7 @@ static void parse_options(STATE *state, int argc, char *argv[])
memset((void *) &state->options, 0, sizeof(state->options)); memset((void *) &state->options, 0, sizeof(state->options));
state->options.host_lookup = mystrdup("dns"); state->options.host_lookup = mystrdup("dns");
@ -892,7 +897,7 @@ index a3a9946..a56bad1 100644
#ifdef USE_TLS #ifdef USE_TLS
#define TLSOPTS "A:Cd:fF:g:H:k:K:l:L:m:M:p:P:r:s:wX" #define TLSOPTS "A:Cd:fF:g:H:k:K:l:L:m:M:p:P:r:s:wX"
@@ -1868,6 +1954,9 @@ static void parse_options(STATE *state, int argc, char *argv[]) @@ -1868,6 +1955,9 @@ static void parse_options(STATE *state, int argc, char *argv[])
case 'o': case 'o':
override(optarg); override(optarg);
break; break;

6
postfix.spec
View File

@ -49,7 +49,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.5.9 Version: 3.5.9
Release: 20%{?dist} Release: 21%{?dist}
Epoch: 2 Epoch: 2
URL: http://www.postfix.org URL: http://www.postfix.org
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@ -809,6 +809,10 @@ fi
%endif %endif
%changelog %changelog
* Wed May 17 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.5.9-21
- Fix patch for SRV record resolution feature
Related: rhbz#2134789
* Thu May 04 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.5.9-20 * Thu May 04 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.5.9-20
- Backport dns SRV record resolution feature (RFC6186) - Backport dns SRV record resolution feature (RFC6186)
Resolves: rhbz#2134789 Resolves: rhbz#2134789