summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-02-07 19:52:54 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2012-02-07 19:52:54 +0100
commitd383b7281ac6beecc8775c8d220a9fb611f99f94 (patch)
treea253760beb0d72f4afb099ff7cf16d92c59d9ae0
parent7ebfb5d36c0f4d64ad5260fc5f21333855c0c187 (diff)
expect: fix missing whitespace after expectation flags in nfexp_snprintf
Before: proto=17 src=192.168.11.4 dst=192.168.10.4 sport=0 dport=5060 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.10.4 master-dst=192.168.11.4 sport=5060 dport=5060 PERMANENTclass=0 helper=sip [active since 8s] After: proto=17 src=192.168.11.4 dst=192.168.10.4 sport=0 dport=5060 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.10.4 master-dst=192.168.11.4 sport=5060 dport=5060 PERMANENT class=0 helper=sip [active since 8s] Note the space after PERMANENT. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/expect/snprintf_default.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/expect/snprintf_default.c b/src/expect/snprintf_default.c
index 44b7719..f2b5c97 100644
--- a/src/expect/snprintf_default.c
+++ b/src/expect/snprintf_default.c
@@ -110,7 +110,11 @@ int __snprintf_expect_default(char *buf,
ret = snprintf(buf+offset, len, "%sUSERSPACE", delim);
BUFFER_SIZE(ret, size, len, offset);
}
-
+ /* extra space not to stick to next field. */
+ if (exp->flags) {
+ ret = snprintf(buf+offset, len, " ");
+ BUFFER_SIZE(ret, size, len, offset);
+ }
ret = __snprintf_expect_class(buf+offset, len, exp);
BUFFER_SIZE(ret, size, len, offset);