diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:18:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-13 08:18:08 +0200 |
commit | b0d33ab78056f06dee06694990a71fc7895ddbb5 (patch) | |
tree | ea4d633e8452b2f56df419d9e6bf5ec4da95e0b0 /tests | |
parent | 76b4c6547d5526a375ee217e2722a164c811c58c (diff) | |
parent | d6a6666b66733e63255f806dd272a0b85e0f0c13 (diff) | |
download | rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.tar.gz rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.tar.xz rsyslog-b0d33ab78056f06dee06694990a71fc7895ddbb5.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'tests')
-rw-r--r-- | tests/tcpflood.c | 5 |
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 { |