fixed small GNS2DNS bug

1 files changed, 5 insertions, 2 deletions

diff --git a/ascension/ascension.py b/ascension/ascension.py
index 9e59a93..5f3b4cb 100644
--- a/ascension/ascension.py
+++ b/ascension/ascension.py
@@ -399,19 +399,21 @@ class Ascender():
             if nameserver[-1] == ".":
                 nameserver = nameserver[:-1]
             if str(value)[-1] == ".":
+                if label == "@":
+                    return (None, None, None)
                 # FQDN provided
                 if value.endswith(".%s." % zonename):
                     # in bailiwick
                     value = self.resolve_glue(record.target)
                 else:
-                     # out of bailiwick
+                    # out of bailiwick
                     value = '%s.%s@%s' % (str(label), zonename, nameserver)
             else:
                 # Name is relative to zone, must be in bailiwick
                 value = self.resolve_glue(record.target)
                 if not value:
                     if label.startswith("@"):
-                        value = '%s@%s.%s' % (self.domain,
+                        value = '%s@%s.%s' % (zonename,
                                               record.target,
                                               self.domain)
                     else:
@@ -634,6 +636,7 @@ class Ascender():
                     pkey = self.create_zone_and_get_pkey(zonename)
                     self.subzonedict[zonename] = (pkey, ttl)
 
+
         # Check if a delegated zone is available in GNS as per NS record
         # Adds NS records that contain "gns--pkey--" to dictionary
         nsrecords = self.zone.iterate_rdatasets(dns.rdatatype.NS)