From d7f1f47302fff68f2651aa3491176a3fa572e03c Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Tue, 22 Jul 2008 12:08:54 -0400
Subject: Merge findks fix from master

---
 AUTHORS             | 1 +
 cobbler/services.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fdb94dc4..fc8efd19 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,7 @@ Patches and other contributions from:
     David Brown <dmlb2000@gmail.com>
     James Bowes <jbowes@redhat.com>
     James Cammarata <jimi@sgnx.net>
+    Carsten Clasohm <cclasohm@redhat.com>
     C. Daniel Chase <dan@cdchase.com>
     Dave Hatton <dave@davehatton.it>
     Máirín Duffy <duffy@redhat.com>
diff --git a/cobbler/services.py b/cobbler/services.py
index 5d428cc9..bd787559 100644
--- a/cobbler/services.py
+++ b/cobbler/services.py
@@ -102,7 +102,7 @@ class CobblerSvc(object):
             # FIXME: will not key off other NICs, problem?
             mac = macinput.split()[1].strip()
         else:
-            macinput = "None"
+            mac = "None"
 
         ip = rest["REMOTE_ADDR"]
 
@@ -110,7 +110,7 @@ class CobblerSvc(object):
 
         for x in systems:
             for y in x["interfaces"]:
-                if x["interfaces"][y]["mac_address"].lower() == macinput.lower():
+                if x["interfaces"][y]["mac_address"].lower() == mac.lower():
                     candidates.append(x)
 
         if len(candidates) == 0:
-- 
cgit