From d383b7281ac6beecc8775c8d220a9fb611f99f94 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 7 Feb 2012 19:52:54 +0100 Subject: 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 --- src/expect/snprintf_default.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3