diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /mail/dbmail/files/patch-src_clientbase.c | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'mail/dbmail/files/patch-src_clientbase.c')
| -rw-r--r-- | mail/dbmail/files/patch-src_clientbase.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/mail/dbmail/files/patch-src_clientbase.c b/mail/dbmail/files/patch-src_clientbase.c index 19e6aa57533b..aa7fb8b4f9f4 100644 --- a/mail/dbmail/files/patch-src_clientbase.c +++ b/mail/dbmail/files/patch-src_clientbase.c @@ -1,29 +1,26 @@ ---- src/clientbase.c.orig 2022-10-15 15:02:38 UTC +--- src/clientbase.c.orig 2025-10-04 10:47:08 UTC +++ src/clientbase.c -@@ -152,7 +152,7 @@ ClientBase_T * client_init(client_sock *c) +@@ -152,20 +152,20 @@ ClientBase_T * client_init(client_sock *c) client->tx = STDOUT_FILENO; } else { /* server-side */ -- if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, -+ if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, - NI_MAXHOST, client->dst_port, - NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) { +- if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, ++ if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, + NI_MAXHOST, client->dst_port, + NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) { TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr)); -@@ -160,7 +160,7 @@ ClientBase_T * client_init(client_sock *c) + } /* client-side */ +- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip, ++ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip, + NI_MAXHOST-1, client->src_port, + NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) { + TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); + } if (server_conf->resolveIP) { - if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->clientname, + if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->clientname, - NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) { - TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); - } -@@ -171,7 +171,7 @@ ClientBase_T * client_init(client_sock *c) - client->clientname[0] ? client->clientname : "Lookup failed"); - } else { - -- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip, -+ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip, - NI_MAXHOST-1, client->src_port, - NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) { + NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) { TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); + } |