diff options
author | 2018-08-14 08:35:01 -0400 | |
---|---|---|
committer | 2018-08-14 08:35:01 -0400 | |
commit | 23a962a1af3894b6834ad08c12b3c3fd99775247 (patch) | |
tree | f086ad1afa06d0b054aec684917086b60d1a78ed /src/firemon | |
parent | merge 0.9.56-rc1 (diff) | |
download | firejail-23a962a1af3894b6834ad08c12b3c3fd99775247.tar.gz firejail-23a962a1af3894b6834ad08c12b3c3fd99775247.tar.zst firejail-23a962a1af3894b6834ad08c12b3c3fd99775247.zip |
0.9.56-rc1 merges
Diffstat (limited to 'src/firemon')
-rw-r--r-- | src/firemon/arp.c | 2 | ||||
-rw-r--r-- | src/firemon/route.c | 6 | ||||
-rw-r--r-- | src/firemon/usage.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/firemon/arp.c b/src/firemon/arp.c index aac1aeba3..9f3e50e94 100644 --- a/src/firemon/arp.c +++ b/src/firemon/arp.c | |||
@@ -51,7 +51,7 @@ static void print_arp(const char *fname) { | |||
51 | char mac[64]; | 51 | char mac[64]; |
52 | char mask[64]; | 52 | char mask[64]; |
53 | char device[64]; | 53 | char device[64]; |
54 | int rv = sscanf(start, "%s %s %s %s %s %s\n", ip, type, flags, mac, mask, device); | 54 | int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s\n", ip, type, flags, mac, mask, device); |
55 | if (rv != 6) | 55 | if (rv != 6) |
56 | continue; | 56 | continue; |
57 | 57 | ||
diff --git a/src/firemon/route.c b/src/firemon/route.c index 7426637df..6db212831 100644 --- a/src/firemon/route.c +++ b/src/firemon/route.c | |||
@@ -144,7 +144,7 @@ static void print_route(const char *fname) { | |||
144 | char use[64]; | 144 | char use[64]; |
145 | char metric[64]; | 145 | char metric[64]; |
146 | char mask[64]; | 146 | char mask[64]; |
147 | int rv = sscanf(start, "%s %s %s %s %s %s %s %s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); | 147 | int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s %63s %63s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); |
148 | if (rv != 8) | 148 | if (rv != 8) |
149 | continue; | 149 | continue; |
150 | 150 | ||
@@ -161,7 +161,7 @@ static void print_route(const char *fname) { | |||
161 | 161 | ||
162 | // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); | 162 | // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); |
163 | if (gw != 0) | 163 | if (gw != 0) |
164 | printf(" %u.%u.%u.%u/%u via %u.%u.%u.%u, dev %s, metric %s\n", | 164 | printf(" %d.%d.%d.%d/%u via %d.%d.%d.%d, dev %s, metric %s\n", |
165 | PRINT_IP(destip), mask2bits(destmask), | 165 | PRINT_IP(destip), mask2bits(destmask), |
166 | PRINT_IP(gw), | 166 | PRINT_IP(gw), |
167 | ifname, | 167 | ifname, |
@@ -169,7 +169,7 @@ static void print_route(const char *fname) { | |||
169 | else { // this is an interface | 169 | else { // this is an interface |
170 | IfList *ifentry = list_find(destip, destmask); | 170 | IfList *ifentry = list_find(destip, destmask); |
171 | if (ifentry) { | 171 | if (ifentry) { |
172 | printf(" %u.%u.%u.%u/%u, dev %s, scope link src %d.%d.%d.%d\n", | 172 | printf(" %d.%d.%d.%d/%u, dev %s, scope link src %d.%d.%d.%d\n", |
173 | PRINT_IP(destip), mask2bits(destmask), | 173 | PRINT_IP(destip), mask2bits(destmask), |
174 | ifname, | 174 | ifname, |
175 | PRINT_IP(ifentry->ip)); | 175 | PRINT_IP(ifentry->ip)); |
diff --git a/src/firemon/usage.c b/src/firemon/usage.c index a4d642d66..5714643cc 100644 --- a/src/firemon/usage.c +++ b/src/firemon/usage.c | |||
@@ -75,7 +75,7 @@ static char *help_str = | |||
75 | "\tUser - The owner of the sandbox.\n" | 75 | "\tUser - The owner of the sandbox.\n" |
76 | "\n" | 76 | "\n" |
77 | "License GPL version 2 or later\n" | 77 | "License GPL version 2 or later\n" |
78 | "Homepage: http://firejail.wordpress.com\n" | 78 | "Homepage: https://firejail.wordpress.com\n" |
79 | "\n"; | 79 | "\n"; |
80 | 80 | ||
81 | void usage(void) { | 81 | void usage(void) { |