dnsmasq: Backport some security updates
[librecmc/librecmc.git] / package / network / services / dnsmasq / patches / 0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch
1 From cc0b4489c782f6b90ca118abb18e716a7a831289 Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Fri, 15 Jan 2021 22:21:52 +0000
4 Subject: Update to new struct frec fields in conntrack code.
5
6 ---
7  src/forward.c | 4 ++--
8  1 file changed, 2 insertions(+), 2 deletions(-)
9
10 --- a/src/forward.c
11 +++ b/src/forward.c
12 @@ -530,7 +530,7 @@ static int forward_query(int udpfd, unio
13                   if (option_bool(OPT_CONNTRACK))
14                     {
15                       unsigned int mark;
16 -                     if (get_incoming_mark(&forward->source, &forward->dest, 0, &mark))
17 +                     if (get_incoming_mark(&forward->frec_src.source, &forward->frec_src.dest, 0, &mark))
18                         setsockopt(fd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
19                     }
20  #endif
21 @@ -1178,7 +1178,7 @@ void reply_query(int fd, int family, tim
22                           if (option_bool(OPT_CONNTRACK))
23                             {
24                               unsigned int mark;
25 -                             if (get_incoming_mark(&orig->source, &orig->dest, 0, &mark))
26 +                             if (get_incoming_mark(&orig->frec_src.source, &orig->frec_src.dest, 0, &mark))
27                                 setsockopt(fd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
28                             }
29  #endif