From: fendo <fendo@bi12info.com>
Date: Thu, 28 Mar 2013 09:29:32 +0000 (+0100)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.8~3
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/58d994f8f4aa2a6465dc9a2f13e7ba8ddf412ec7?hp=658f6aea7b968c7db3a1c2be58c62efb091c3984

Merge branch 'master' into samesversion
---

diff --git a/ppp.c b/ppp.c
index c8e128e..cb8512f 100644
--- a/ppp.c
+++ b/ppp.c
@@ -2241,7 +2241,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		return;
 
 	// no spoof
-	if (ipv4 != session[s].ip && memcmp(&config->ipv6_prefix, &ip, 8) && sessionbyipv6(ip) != s)
+	if ((ipv4 != session[s].ip || memcmp(&config->ipv6_prefix, &ip, 8)) && sessionbyipv6(ip) != s)
 	{
 		char str[INET6_ADDRSTRLEN];
 		LOG(5, s, t, "Dropping packet with spoofed IP %s\n",