summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:53:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:53:22 +0200
commit359ddad3c5dce82ab48964c1d8b804c4155ea39c (patch)
tree8e93dffd3eff113cc05537d9699d5065dcb06ee4 /tests
parent26a668f8fa352e63aefcc762eadd123002b3895d (diff)
parent943a2070a6f556c48a903d55da0317b5942a41b6 (diff)
downloadrsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.gz
rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.xz
rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tests')
-rw-r--r--tests/tcpflood.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index 49b1e9e6..8485acbb 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -797,7 +797,7 @@ closeTLSSess(int i)
# else /* NO TLS available */
static void initTLS(void) {}
static void initTLSSess(int __attribute__((unused)) i) {}
-static int sendTLS(int i, char *buf, int lenBuf) { return 0; }
+static int sendTLS(int __attribute__((unused)) i, char __attribute__((unused)) *buf, int __attribute__((unused)) lenBuf) { return 0; }
static void closeTLSSess(int __attribute__((unused)) i) {}
# endif
@@ -889,7 +889,8 @@ int main(int argc, char *argv[])
# if defined(ENABLE_GNUTLS)
transport = TP_TLS;
# else
- fprintf(stderr, "compiled without TLS support!\n", optarg);
+ fprintf(stderr, "compiled without TLS support: "
+ "\"-Ttls\" not supported!\n");
exit(1);
# endif
} else {