diff options
Diffstat (limited to 'src/pluto/demux.c')
| -rw-r--r-- | src/pluto/demux.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pluto/demux.c b/src/pluto/demux.c index 0590a3585..22976fe9a 100644 --- a/src/pluto/demux.c +++ b/src/pluto/demux.c @@ -1147,7 +1147,11 @@ read_packet(struct msg_digest *md) } else if (from_ugh != NULL) { +<<<<<<< HEAD plog("recvfrom on %s returned misformed source sockaddr: %s" +======= + plog("recvfrom on %s returned malformed source sockaddr: %s" +>>>>>>> upstream/4.5.1 , ifp->rname, from_ugh); return FALSE; } |