1c8d6d0d32
- Rebase to version 1.8.5 plus upstream-indicated fixes - Fix for duplicate files in RPM due to imprecise globbing - Drop bootstrap code again Resolves: rhbz#2211063
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From bea48d4a3323ce41973674e2edd64b990f8a849e Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Sat, 1 Oct 2022 00:17:50 +0200
|
|
Subject: [PATCH] extensions: libip6t_dst: Fix output for empty options
|
|
|
|
If no --dst-opts were given, print_options() would print just a
|
|
whitespace.
|
|
|
|
Fixes: 73866357e4a7a ("iptables: do not print trailing whitespaces")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit 11e06cbb3a87739a3d958ba4c2f08fea7b100a68)
|
|
---
|
|
extensions/libip6t_dst.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
|
|
index fe7e3403468ce..ba8cd66b13182 100644
|
|
--- a/extensions/libip6t_dst.c
|
|
+++ b/extensions/libip6t_dst.c
|
|
@@ -127,15 +127,15 @@ static void
|
|
print_options(unsigned int optsnr, uint16_t *optsp)
|
|
{
|
|
unsigned int i;
|
|
+ char sep = ' ';
|
|
|
|
- printf(" ");
|
|
for(i = 0; i < optsnr; i++) {
|
|
- printf("%d", (optsp[i] & 0xFF00) >> 8);
|
|
+ printf("%c%d", sep, (optsp[i] & 0xFF00) >> 8);
|
|
|
|
if ((optsp[i] & 0x00FF) != 0x00FF)
|
|
printf(":%d", (optsp[i] & 0x00FF));
|
|
|
|
- printf("%c", (i != optsnr - 1) ? ',' : ' ');
|
|
+ sep = ',';
|
|
}
|
|
}
|
|
|
|
--
|
|
2.40.0
|
|
|