1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
From 282d492e4cab7b4d9c7321f4c0c55b615948e280 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 11 May 2018 14:09:17 -0700
Subject: [PATCH] Disable gcc8 specific warnings
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/libipsec/ipsec_dump_policy.c | 5 +++++
src/libipsec/pfkey_dump.c | 5 +++++
src/racoon/isakmp.c | 11 ++++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/libipsec/ipsec_dump_policy.c b/src/libipsec/ipsec_dump_policy.c
index 4d0eb77..c3fc842 100644
--- a/src/libipsec/ipsec_dump_policy.c
+++ b/src/libipsec/ipsec_dump_policy.c
@@ -275,6 +275,10 @@ ipsec_dump_policy1(policy, delimiter, withports)
return buf;
}
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
static char *
ipsec_dump_ipsecrequest(buf, len, xisr, bound, withports)
char *buf;
@@ -419,3 +423,4 @@ set_address(buf, len, sa, withports)
return buf;
}
+#pragma GCC diagnostic pop
diff --git a/src/libipsec/pfkey_dump.c b/src/libipsec/pfkey_dump.c
index 4627ebc..451e535 100644
--- a/src/libipsec/pfkey_dump.c
+++ b/src/libipsec/pfkey_dump.c
@@ -691,6 +691,10 @@ str_ipport(sa)
/*
* set "/prefix[port number]" to buffer.
*/
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
static char *
str_prefport(family, pref, port, ulp)
u_int family, pref, port, ulp;
@@ -735,6 +739,7 @@ str_prefport(family, pref, port, ulp)
return buf;
}
+#pragma GCC diagnostic pop
static void
str_upperspec(ulp, p1, p2)
diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c
index 7ff53a3..4addf24 100644
--- a/src/racoon/isakmp.c
+++ b/src/racoon/isakmp.c
@@ -3124,7 +3124,12 @@ script_hook(iph1, script)
#endif
/* local address */
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
GETNAMEINFO(iph1->local, addrstr, portstr);
+#pragma GCC diagnostic pop
if (script_env_append(&envp, &envc, "LOCAL_ADDR", addrstr) != 0) {
plog(LLV_ERROR, LOCATION, NULL, "Cannot set LOCAL_ADDR\n");
@@ -3138,8 +3143,12 @@ script_hook(iph1, script)
/* Peer address */
if (iph1->remote != NULL) {
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
GETNAMEINFO(iph1->remote, addrstr, portstr);
-
+#pragma GCC diagnostic pop
if (script_env_append(&envp, &envc,
"REMOTE_ADDR", addrstr) != 0) {
plog(LLV_ERROR, LOCATION, NULL,
|
