rsa: Prepare rsa_loadpub_core for failure.

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 4826a445caa5604ca2c61f75a3dc1c8730bc8cf1..b4cd9afb80ac404c03b6f3575718cbf0863e3005 100755 (executable)
--- 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:
@@ -214,6 +214,7 @@ def parse_args():
        global group
        global user
        global of
+       global prefix
        global key_prefix
 
        ap = argparse.ArgumentParser(description='process secnet sites files')
@@ -228,6 +229,7 @@ def parse_args():
        av = ap.parse_args()
        #print(repr(av), file=sys.stderr)
        service = 1 if av.userv else 0
+       prefix = '' if av.prefix is None else av.prefix[0]
        key_prefix = av.conf_key_prefix
        if service:
                if len(av.arg)!=4:
@@ -554,7 +556,6 @@ root=level([UntaintedRoot(x) for x in ['root','root']])
 # All vpns are children of this node
 obstack=[root]
 allow_defs=0   # Level above which new definitions are permitted
-prefix=''
 
 def set_property(obj,w):
        "Set a property on a configuration node"