Use CLOCK_MONOTONIC for all our timing needs, when possible

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index a84479ca0ce2fc41939d0c73d3e50721aa57bbb0..85ee7a8eacda3e6701537034152e8daa22faad81 100755 (executable)
--- 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()
@@ -591,10 +593,10 @@ class rsakey (pubkey):
                self.n=w[3].bignum_10('rsa','rsa n')
                if len(w) >= 5: w[4].email()
                self.a='rsa1'
-               self.d=base91s_encode(b'%d %s %s' %
-                                     (self.l,
-                                      self.e.encode('ascii'),
-                                      self.n.encode('ascii')))
+               self.d=base91s_encode(('%d %s %s' %
+                                      (self.l,
+                                       self.e,
+                                       self.n)).encode('ascii'))
                # ^ this allows us to use the pubkey.forsites()
                # method for output in versions>=2
        def __str__(self):