config: fix client config (no SERVER)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/hippotatd b/hippotatd
index cb86c2bd4d4a805c6f20c2cd359de205ef099580..fe10eeca6166186c49af06ae6da93d8b45a35dde 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -296,7 +296,8 @@ def process_cfg(_opts, putative_servers, putative_clients):
 
   global c
   c = ConfigResults()
-  c.server = cfg.get('SERVER','server')
+  try: c.server = cfg.get('SERVER','server')
+  except NoOptionError: c.server = 'SERVER'
 
   cfg_process_common(c, c.server)
   cfg_process_saddrs(c, c.server)

diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py
index 397dfb2c23459cf4f9a7c17bd4064b63cec2e215..16bba813016f88654f33d890ebb9588ef2794003 100644 (file)
--- a/hippotatlib/__init__.py
+++ b/hippotatlib/__init__.py
@@ -143,8 +143,6 @@ ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
 # relating to virtual network
 mtu = 1500
 
-[SERVER]
-server = SERVER
 # addrs = 127.0.0.1 ::1
 # url