X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/fa63bd9399a07c4b26affb3fc214291331d120b4..300fe4ed2e3210ad3d90a8f4f5937224300691ac:/hippotatd diff --git a/hippotatd b/hippotatd index e458853..c03ae48 100755 --- a/hippotatd +++ b/hippotatd @@ -297,7 +297,7 @@ def process_cfg(_opts, putative_servers, putative_clients): global c c = ConfigResults() - try: c.server = cfg.get('SERVER','server') + try: c.server = cfg1get('SERVER','server') except NoOptionError: c.server = 'SERVER' cfg_process_general(c, c.server) @@ -314,14 +314,14 @@ def process_cfg(_opts, putative_servers, putative_clients): Client(ci, cc) try: - c.vrelay = cfg.get(c.server, 'vrelay') + c.vrelay = cfg1get(c.server, 'vrelay') except NoOptionError: for search in c.vnetwork.hosts(): if search == c.vaddr: continue c.vrelay = search break - try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True) + try: c.ifname = cfg1get(c.server, 'ifname_server', raw=True) except NoOptionError: pass cfg_process_ipif(c, @@ -331,7 +331,7 @@ def process_cfg(_opts, putative_servers, putative_clients): ('rnets','vnetwork'))) if opts.printconfig is not None: - try: val = cfg.get(c.server, opts.printconfig) + try: val = cfg1get(c.server, opts.printconfig) except NoOptionError: pass else: print(val) sys.exit(0)