From 23a962a1af3894b6834ad08c12b3c3fd99775247 Mon Sep 17 00:00:00 2001 From: startx2017 Date: Tue, 14 Aug 2018 08:35:01 -0400 Subject: 0.9.56-rc1 merges --- src/firemon/arp.c | 2 +- src/firemon/route.c | 6 +++--- src/firemon/usage.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/firemon') 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) { char mac[64]; char mask[64]; char device[64]; - int rv = sscanf(start, "%s %s %s %s %s %s\n", ip, type, flags, mac, mask, device); + int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s\n", ip, type, flags, mac, mask, device); if (rv != 6) continue; 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) { char use[64]; char metric[64]; char mask[64]; - int rv = sscanf(start, "%s %s %s %s %s %s %s %s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); + int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s %63s %63s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); if (rv != 8) continue; @@ -161,7 +161,7 @@ static void print_route(const char *fname) { // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask); if (gw != 0) - printf(" %u.%u.%u.%u/%u via %u.%u.%u.%u, dev %s, metric %s\n", + printf(" %d.%d.%d.%d/%u via %d.%d.%d.%d, dev %s, metric %s\n", PRINT_IP(destip), mask2bits(destmask), PRINT_IP(gw), ifname, @@ -169,7 +169,7 @@ static void print_route(const char *fname) { else { // this is an interface IfList *ifentry = list_find(destip, destmask); if (ifentry) { - printf(" %u.%u.%u.%u/%u, dev %s, scope link src %d.%d.%d.%d\n", + printf(" %d.%d.%d.%d/%u, dev %s, scope link src %d.%d.%d.%d\n", PRINT_IP(destip), mask2bits(destmask), ifname, 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 = "\tUser - The owner of the sandbox.\n" "\n" "License GPL version 2 or later\n" - "Homepage: http://firejail.wordpress.com\n" + "Homepage: https://firejail.wordpress.com\n" "\n"; void usage(void) { -- cgit v1.2.3-70-g09d2