make-secnet-sites: Tolerate missing group in userv sites file

When processing a sites file fragment via userv, the group in the
provided file is supposed to be optional.  This was accidentally
regressed in 19482a2958fa
   make-secnet-sites: Do not write out unchecked output in sites

The additional call to w[2].groupname ought to have been conditional.
Now we have precisely the right code in OpBase, so simply call it.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 0520486492d20b9850941c810f0c7b7c21bd9f5f..85ee7a8eacda3e6701537034152e8daa22faad81 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -375,7 +375,7 @@ class OpUserv(OpBase):
                        sys.exit(1)
        def check_group(self,group,w):
                if group!=self.group: complain("Incorrect group!")
                        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()
        def read_in(self):
                self.headerinput=pfilepath(self.header,allow_include=True)
                self.userinput=sys.stdin.readlines()