X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=85ee7a8eacda3e6701537034152e8daa22faad81;hb=1f4a8ae2a93e1d9abab0fae7bd7d545881cfec60;hp=70fa7a4b9dd7483dc78b3612dd6e25b04fa65c60;hpb=d51cde6e24dbf3ef16ec2d91ca99f1c029e45c92;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 70fa7a4..85ee7a8 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -293,6 +293,9 @@ class PkmElide(PkmBase):
 class OpBase():
 	# Base case is reading a sites file from self.inputfilee.
 	# And writing a sites file to self.sitesfile.
+	def check_group(self,group,w):
+		if len(w) >= 3:
+			w[2].groupname()
 	def positional_args(self, av):
 		if len(av.arg)>3:
 			print("Too many arguments")
@@ -321,7 +324,6 @@ class OpBase():
 class OpConf(OpBase):
 	opts = ['--conf']
 	help = 'sites.conf generation mode (default)'
-	def check_group(self,group,w): pass
 	def write_out(self):
 		if self.outputfile is None:
 			of=sys.stdout
@@ -369,11 +371,11 @@ class OpUserv(OpBase):
 		for i in ugs.split():
 			if self.group==i: ok=1
 		if not ok:
-			print("caller not in group %s"%group)
+			print("caller not in group %s"%self.group.groupname())
 			sys.exit(1)
 	def check_group(self,group,w):
 		if group!=self.group: complain("Incorrect group!")
-		w[2].groupname()
+		OpBase.check_group(self,group,w)
 	def read_in(self):
 		self.headerinput=pfilepath(self.header,allow_include=True)
 		self.userinput=sys.stdin.readlines()