diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
| commit | f90675f33f33b8a83046f8a8462dd8dbe7648a4a (patch) | |
| tree | f695e6371b52141de4c4ce2295b317a1e487e7b3 /plugins/imptcp | |
| parent | 14d415e4a84e2c08df1b23a86959f0d9b0006687 (diff) | |
| parent | 74e09afd6db56f6e23c965f0949cfb9979928f13 (diff) | |
| download | rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.gz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.xz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
configure.ac
doc/imuxsock.html
doc/manual.html
runtime/queue.c
Diffstat (limited to 'plugins/imptcp')
| -rw-r--r-- | plugins/imptcp/imptcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index a735b0b2..f95d1193 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -290,7 +290,9 @@ startupSrv(ptcpsrv_t *pSrv) continue; } #endif - } + } else { + isIPv6 = 0; + } if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on)) < 0 ) { DBGPRINTF("error %d setting tcp socket option\n", errno); close(sock); |