equal
deleted
inserted
replaced
100 Import zone name from rr |
100 Import zone name from rr |
101 """ |
101 """ |
102 |
102 |
103 if '.' in name : |
103 if '.' in name : |
104 host, domain = name.split('.', 1) |
104 host, domain = name.split('.', 1) |
105 domain = pvl.dns.zone.join(domain, origin) |
105 domain = pvl.dns.join(domain, origin) |
106 else : |
106 else : |
107 host = name |
107 host = name |
108 domain = origin |
108 domain = origin |
109 |
109 |
110 if domain : |
110 if domain : |
152 alias_host, alias_domain = import_zone_host_name(options, alias, rr.origin) |
152 alias_host, alias_domain = import_zone_host_name(options, alias, rr.origin) |
153 |
153 |
154 if domain == alias_domain : |
154 if domain == alias_domain : |
155 yield (alias_host, alias_domain), 'alias', host |
155 yield (alias_host, alias_domain), 'alias', host |
156 else : |
156 else : |
157 yield (alias_host, alias_domain), 'alias', pvl.dns.zone.join(host, domain) |
157 yield (alias_host, alias_domain), 'alias', pvl.dns.join(host, domain) |
158 |
158 |
159 elif rr.type == 'TXT' : |
159 elif rr.type == 'TXT' : |
160 txt, = rr.data |
160 txt, = rr.data |
161 |
161 |
162 yield (host, domain), 'comment', txt |
162 yield (host, domain), 'comment', txt |