mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
86a2b342de
version 8.2.7 (July 7, 2022):
- configure.ac: autoconf-2.70 fix (Lars Wendler <polynomial-c@gentoo.org>)
- Add high baud rates (Peter Chubb <Peter.Chubb@data61.csiro.au>)
- Make compile --with-ipv6 & setproctitle (Bjoern A. Zeeb <patch@zabbadoz.net>)
- conserver.cf: devicesubst add 'b' for baud rate (Bjoern A. Zeeb <patch@zabbadoz.net>)
- Reflect that baud values have increased to 7 digits (Bjoern A. Zeeb <patch@zabbadoz.net>)
- cirrus-ci: move to freebsd-13-0 (Bryan Stansell <bryan@stansell.org>)
- configure.ac: support libgssapi_krb5 (Jiri Kastner <cz172638@gmail.com>)
Drop upstreamed patch 000-100-backport-config-macro-fix.patch
Signed-off-by: Bjørn Mork <bjorn@mork.no>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
--- a/conserver/consent.c
|
|
+++ b/conserver/consent.c
|
|
@@ -1308,7 +1308,7 @@ AddrsMatch(char *addr1, char *addr2)
|
|
{
|
|
#if USE_IPV6
|
|
int error, ret = 0;
|
|
- struct addrinfo *ai1, *ai2, hints;
|
|
+ struct addrinfo *ai1, *ai2, *rp1, *rp2, hints;
|
|
#else
|
|
/* so, since we might use inet_addr, we're going to use
|
|
* (in_addr_t)(-1) as a sign of an invalid ip address.
|
|
@@ -1346,17 +1346,19 @@ AddrsMatch(char *addr1, char *addr2)
|
|
goto done;
|
|
}
|
|
|
|
- for (; ai1 != NULL; ai1 = ai1->ai_next) {
|
|
- for (; ai2 != NULL; ai2 = ai2->ai_next) {
|
|
- if (ai1->ai_addr->sa_family != ai2->ai_addr->sa_family)
|
|
+ rp1 = ai1;
|
|
+ rp2 = ai2;
|
|
+ for (; rp1 != NULL; rp1 = rp1->ai_next) {
|
|
+ for (; rp2 != NULL; rp2 = rp2->ai_next) {
|
|
+ if (rp1->ai_addr->sa_family != rp2->ai_addr->sa_family)
|
|
continue;
|
|
|
|
if (
|
|
# if HAVE_MEMCMP
|
|
- memcmp(&ai1->ai_addr, &ai2->ai_addr,
|
|
+ memcmp(&rp1->ai_addr, &rp2->ai_addr,
|
|
sizeof(struct sockaddr_storage))
|
|
# else
|
|
- bcmp(&ai1->ai_addr, &ai2->ai_addr,
|
|
+ bcmp(&rp1->ai_addr, &rp2->ai_addr,
|
|
sizeof(struct sockaddr_storage))
|
|
# endif
|
|
== 0) {
|