From 3edef4719d570b68979a2afaaa2001d122c501a2 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 19 Apr 2014 21:41:43 +0100
Subject: [PATCH] Legitimate for same MAC to be in two VLANs on same switchport

---
 Netdisco/Changes                          | 1 +
 Netdisco/lib/App/Netdisco/Core/Macsuck.pm | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index fe3b44ae..97bb0306 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -8,6 +8,7 @@
 
   * Search for localenv could not find $HOME
   * Fixes to allow output of get_init_file to be used as init script
+  * Legitimate for same MAC to be in two VLANs on same switchport
 
 2.025001 - 2014-04-08
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
index 5dd94bcd..d9da31e5 100644
--- a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
@@ -151,14 +151,13 @@ sub store_node {
   schema('netdisco')->txn_do(sub {
     my $nodes = schema('netdisco')->resultset('Node');
 
-    # TODO: probably needs changing if we're to support VTP domains
     my $old = $nodes->search(
         { mac   => $mac,
+          vlan   => $vlan,
           -bool => 'active',
           -not  => {
                     switch => $ip,
                     port   => $port,
-                    vlan   => $vlan,
                   },
         })->update( { active => \'false' } );