Some fixes in reg code

2 files changed, 9 insertions, 5 deletions

diff --git a/cobbler/item.py b/cobbler/item.py
index 2549dce..bdd7c8b 100644
--- a/cobbler/item.py
+++ b/cobbler/item.py
@@ -198,8 +198,9 @@ class Item(serializable.Serializable):
             if key in [ "mac_address", "ip_address", "subnet", "gateway", "virt_bridge", "dhcp_tag", "hostname" ]:
                 key_found_already = True
                 for (name, interface) in data["interfaces"].iteritems(): 
-                    if interface[key].lower() == value.lower():
-                        return True
+                    if value is not None:
+                        if interface[key].lower() == value.lower():
+                            return True
 
         if not data.has_key(key):
             if not key_found_already:
diff --git a/cobbler/remote.py b/cobbler/remote.py
index 28041b4..d9ec275 100644
--- a/cobbler/remote.py
+++ b/cobbler/remote.py
@@ -201,14 +201,17 @@ class CobblerXMLRPCInterface:
         READ: https://fedorahosted.org/cobbler/wiki/AutoRegistration
         """
 
-        if not self.api.settings().register_new_installs:
+        if mac is None:
             return 1
 
+        if not self.api.settings().register_new_installs:
+            return 2
+
         system = self.api.find_system(mac_address=mac)
         if system is not None:
-            return 2
+            return 3
 
-        obj = server.new_system(token)
+        obj = self.api.new_system()
         obj.set_profile(profile)
         obj.set_name(mac.replace(":","_"))
         obj.set_mac_address(mac, "intf0")