From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Nov 2019 21:47:18 +0000 (+0000)
Subject: make-secnet-sites: Delete old `reserved' attempt
X-Git-Tag: v0.5.1~45
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=d212a384b4ef631a876e1ddd3e52fd09e4b1f484

make-secnet-sites: Delete old `reserved' attempt

This appears to be a nascent attempt to fix the problem now solved by
  "make-secnet-sites: prefix names when writing sites file"
by reserving the names of make-secnet-sites keywords.

However this is wrong because what needs to be reserved are secnet
config file conventional key names, and predefined words; there is no
clash between node names and make-secnet-sites keywords because they
appear in different parts of the sites file syntax (and the mss
keywords don't appear in the config file at all).

And anyway the `reserved' dictionary was never used anywhere so this
mechanism wasn't complete.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 4be0160..d7a8494 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -533,11 +533,6 @@ class sitelevel(level):
 # (depth,properties)
 levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 
-# Reserved vpn/location/site names
-reserved={'all-sites':None}
-reserved.update(keywords)
-reserved.update(levels)
-
 def complain(msg):
 	"Complain about a particular input line"
 	global complaints