diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:26:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 12:26:53 +0200 |
| commit | b882a009284547852efbfee65c2348f729ff7053 (patch) | |
| tree | ce3d749a677bab59b78d81290427a9d6453d1f07 /runtime | |
| parent | a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3 (diff) | |
| parent | 9bea045e60fa612336ae6a78267284bcec2e9e25 (diff) | |
| download | rsyslog-b882a009284547852efbfee65c2348f729ff7053.tar.gz rsyslog-b882a009284547852efbfee65c2348f729ff7053.tar.xz rsyslog-b882a009284547852efbfee65c2348f729ff7053.zip | |
Merge branch 'v4-stable' into v4-beta
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/net.c b/runtime/net.c index 4eb5a3bb..8fd8cc2b 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -721,7 +721,7 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS SIN(allowIP.addr.NetAddr)->sin_port = 0; memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr), &(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]), - sizeof (struct sockaddr_in)); + sizeof (in_addr_t)); if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP, iSignificantBits)) |