diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
| commit | e82c6eec6f91e9c212103d81fdd4b10028c9bf6a (patch) | |
| tree | 157a358cdef97a1d5e97e9b446b9bf7ccfa95d26 /tcpsrv.c | |
| parent | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (diff) | |
| parent | b9198d251218f13803cf121c4ef5f69a0e850d24 (diff) | |
| download | rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.gz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.bz2 rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.zip | |
Merge branch 'bsd-port'
Conflicts:
ChangeLog
plugins/imklog/imklog.c
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -327,7 +327,7 @@ static int *create_tcp_socket(tcpsrv_t *pThis) /* We need to enable BSD compatibility. Otherwise an attacker * could flood our log files by sending us tons of ICMP errors. */ -#ifndef BSD +#ifndef OS_BSD if(net.should_use_so_bsdcompat()) { if (setsockopt(*s, SOL_SOCKET, SO_BSDCOMPAT, (char *) &on, sizeof(on)) < 0) { |