From 3f1d9cc607b4dd70aa56999f0fb6f5f8fdc56666 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Sun, 25 May 2003 09:47:01 +0000 Subject: *** empty log message *** --- userspace/ebtables2/ebtables.c | 3 ++- userspace/ebtables2/extensions/ebt_arp.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/userspace/ebtables2/ebtables.c b/userspace/ebtables2/ebtables.c index 271415c..a79cfd1 100644 --- a/userspace/ebtables2/ebtables.c +++ b/userspace/ebtables2/ebtables.c @@ -1296,7 +1296,8 @@ static void delete_rule(int begin, int end) begin += entries->nentries + 1; if (end < 0) end += entries->nentries + 1; - if (begin <= 0 || begin > end || end > entries->nentries) + + if (begin < 0 || begin > end || end > entries->nentries) print_error("Sorry, wrong rule numbers"); if ((begin = check_rule_exists(begin)) == -1 || diff --git a/userspace/ebtables2/extensions/ebt_arp.c b/userspace/ebtables2/extensions/ebt_arp.c index 13cbc7b..a4a4105 100644 --- a/userspace/ebtables2/extensions/ebt_arp.c +++ b/userspace/ebtables2/extensions/ebt_arp.c @@ -57,7 +57,7 @@ static void print_help() "--arp-mac-dst [!] address[/mask]: ARP MAC target specification\n" " opcode strings: \n"); for (i = 0; i < NUMOPCODES; i++) - printf("%d = %s\n", i + 1, opcodes[i]); + printf(" %d = %s\n", i + 1, opcodes[i]); printf( " hardware type string: 1 = Ethernet\n" " protocol type string: see "_PATH_ETHERTYPES"\n"); @@ -288,12 +288,14 @@ static void print(const struct ebt_u_entry *entry, if (arpinfo->invflags & EBT_ARP_SRC_MAC) printf("! "); print_mac_and_mask(arpinfo->smaddr, arpinfo->smmsk); + printf(" "); } if (arpinfo->bitmask & EBT_ARP_DST_MAC) { printf("--arp-mac-dst "); if (arpinfo->invflags & EBT_ARP_DST_MAC) printf("! "); print_mac_and_mask(arpinfo->dmaddr, arpinfo->dmmsk); + printf(" "); } } -- cgit v1.2.3