chiark / gitweb /
make-secnet-sites: Delete old `reserved' attempt
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Nov 2019 21:47:18 +0000 (21:47 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 7 Nov 2019 00:05:51 +0000 (00:05 +0000)
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>
make-secnet-sites

index 4be0160f8e2d5a8564f8da3dc593d5464de563a2..d7a849468cd9c7823cb1d781abdd05ade47b15e6 100755 (executable)
@@ -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