Merge branch 'multibind'

diff --combined ppp.c
index bd70e4d,960a269..cb39db6
--- 1/ppp.c
--- 2/ppp.c
+++ b/ppp.c
@@@ -12,9 -12,7 +12,7 @@@
  #include "tbf.h"
  #include "cluster.h"
  
- #ifdef LAC
  #include "l2tplac.h"
- #endif
  #include "pppoe.h"
  
  extern tunnelt *tunnel;
@@@ -105,13 -103,11 +103,11 @@@ void processpap(sessionidt s, tunnelid
                LOG(3, s, t, "PAP login %s/%s\n", user, pass);
        }
  
- #ifdef LAC
        if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, user))
        {
                // Creating a tunnel/session has been started
                return;
        }
- #endif
  
        if (session[s].ip || !(r = radiusnew(s)))
        {
@@@ -264,7 -260,6 +260,6 @@@ void processchap(sessionidt s, tunnelid
                packet.username = calloc(l + 1, 1);
                memcpy(packet.username, p, l);
  
- #ifdef LAC
                if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, packet.username))
                {
                        free(packet.username);
@@@ -272,7 -267,6 +267,6 @@@
                        // Creating a tunnel/session has been started
                        return;
                }
- #endif
  
                run_plugins(PLUGIN_PRE_AUTH, &packet);
                if (!packet.continue_auth)
@@@ -2244,7 -2238,7 +2238,7 @@@ void processipv6in(sessionidt s, tunnel
                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",