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

diff --git a/make-secnet-sites b/make-secnet-sites
index c26cab0..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:
@@ -538,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