From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 24 Oct 2019 14:35:39 +0000 (+0100)
Subject: make-secnet-sites: allow Tainted construction to specify file/line
X-Git-Tag: v0.5.0~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=fcfa19e603539af0e3c97635dead1ec4e4816756

make-secnet-sites: allow Tainted construction to specify file/line

Unfortunately these default values are evaluated to constants at the
time of class definition, so we need some circumlocution.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 845cdd5..f14a725 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -84,11 +84,11 @@ if version_info.major == 2:  # for python2
 max={'rsa_bits':8200,'name':33,'dh_bits':8200}
 
 class Tainted:
-	def __init__(self,s):
+	def __init__(self,s,tline=None,tfile=None):
 		self._s=s
 		self._ok=None
-		self._line=line
-		self._file=file
+		self._line=line if tline is None else tline
+		self._file=file if tfile is None else tfile
 	def __eq__(self,e):
 		return self._s==e
 	def __ne__(self,e):