X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=ac3efe64d63b27b35c7a6ec55b1550c1854c4680;hb=aedbecae9e5f0a7ea5e8309d56978daa56f1d9cc;hp=4826a445caa5604ca2c61f75a3dc1c8730bc8cf1;hpb=e8e1ac249c8fc2c22a61f774024e2d2bcba22f5a;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 4826a44..ac3efe6 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -105,19 +105,19 @@ class Tainted:
 		assert(self._ok is not True)
 		self._ok=False
 		complain('bad parameter: %s: %s' % (what, why))
-		return self
+		return False
 
 	def _max_ok(self,what,maxlen):
 		if len(self._s) > maxlen:
-			self._bad(what,'too long (max %d)' % maxlen)
-		return self
+			return self._bad(what,'too long (max %d)' % maxlen)
+		return True
 
 	def _re_ok(self,bad,what,maxlen=None):
 		if maxlen is None: maxlen=max[what]
 		self._max_ok(what,maxlen)
-		if self._ok is False: return self
+		if self._ok is False: return False
 		if bad.search(self._s): return self._bad(what,'bad syntax')
-		return self
+		return True
 
 	def _rtnval(self, is_ok, ifgood, ifbad=''):
 		if is_ok:
@@ -214,6 +214,7 @@ def parse_args():
 	global group
 	global user
 	global of
+	global prefix
 	global key_prefix
 
 	ap = argparse.ArgumentParser(description='process secnet sites files')
@@ -228,6 +229,7 @@ def parse_args():
 	av = ap.parse_args()
 	#print(repr(av), file=sys.stderr)
 	service = 1 if av.userv else 0
+	prefix = '' if av.prefix is None else av.prefix[0]
 	key_prefix = av.conf_key_prefix
 	if service:
 		if len(av.arg)!=4:
@@ -536,9 +538,7 @@ levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 
 def complain(msg):
 	"Complain about a particular input line"
-	global complaints
-	print(("%s line %d: "%(file,line))+msg)
-	complaints=complaints+1
+	moan(("%s line %d: "%(file,line))+msg)
 def moan(msg):
 	"Complain about something in general"
 	global complaints
@@ -554,7 +554,6 @@ root=level([UntaintedRoot(x) for x in ['root','root']])
 # All vpns are children of this node
 obstack=[root]
 allow_defs=0   # Level above which new definitions are permitted
-prefix=''
 
 def set_property(obj,w):
 	"Set a property on a configuration node"