| blob | 085d8c9dfc70e768f2752ee905883574bab40046 |
1 --- samba-4.17.0/lib/tsocket/tsocket_bsd.c 2022-08-08 07:15:39.152190400 +0000
2 +++ samba-4.17.0/lib/tsocket/tsocket_bsd.c.new 2022-09-17 05:56:02.043645009 +0000
3 @@ -457,7 +457,7 @@
4 char *buf = NULL;
5 uint64_t port = 0;
6 int ret;
7 - char *s_addr = NULL;
8 + char *so_addr = NULL;
9 uint16_t s_port = default_port;
10 bool conv_ret;
11 bool is_ipv6_by_squares = false;
12 @@ -486,7 +486,7 @@
13 /* IPv6 possibly with port - squares detected */
14 port_sep = pr_sq + 1;
15 if (*port_sep == '\0') {
16 - s_addr = pl_sq + 1;
17 + so_addr = pl_sq + 1;
18 *pr_sq = 0;
19 s_port = default_port;
20 goto get_addr;
21 @@ -508,7 +508,7 @@
22 s_port = (uint16_t)port;
23 *port_sep = 0;
24 *pr_sq = 0;
25 - s_addr = pl_sq + 1;
26 + so_addr = pl_sq + 1;
27 *pl_sq = 0;
28 goto get_addr;
29 } else if (pl_period != NULL && port_sep != NULL) {
30 @@ -525,18 +525,18 @@
31 }
32 s_port = (uint16_t)port;
33 *port_sep = 0;
34 - s_addr = buf;
35 + so_addr = buf;
36 goto get_addr;
37 } else {
38 /* Everything else, let tsocket_address_inet_from string() */
39 /* find parsing errors */
40 - s_addr = buf;
41 + so_addr = buf;
42 s_port = default_port;
43 goto get_addr;
44 }
45 get_addr:
46 ret = _tsocket_address_inet_from_strings(
47 - mem_ctx, fam, s_addr, s_port, _addr, location);
48 + mem_ctx, fam, so_addr, s_port, _addr, location);
50 return ret;
51 }