diff --git a/onedns/resolver.py b/onedns/resolver.py index 0362c40..10b5792 100644 --- a/onedns/resolver.py +++ b/onedns/resolver.py @@ -8,6 +8,8 @@ from dnslib import dns from IPy import IP +from onedns import utils + class DynamicResolver(server.BaseResolver): """ @@ -55,12 +57,7 @@ class DynamicResolver(server.BaseResolver): self._add_reverse(ip, name) def _get_fqdn(self, name): - if not name.endswith(self.domain): - if name.endswith('.'): - return name + self.domain - else: - return '.'.join([name, self.domain]) - return name + return utils.get_fqdn(name, self.domain) def _add_forward(self, name, ip): f = dnslib.RR(rname=dnslib.DNSLabel(self._get_fqdn(name)), diff --git a/onedns/utils.py b/onedns/utils.py index e457430..e9fca0e 100644 --- a/onedns/utils.py +++ b/onedns/utils.py @@ -3,6 +3,15 @@ import os from onedns.logger import log +def get_fqdn(name, domain): + if not name.endswith(domain): + if name.endswith('.'): + return name + domain + else: + return '.'.join([name, domain]) + return name + + def get_kwargs_from_dict(d, prefix, lower=False): tups_list = [] for i in d: