diff options
| -rwxr-xr-x | rp/rcynic/rcynicng | 23 | ||||
| -rw-r--r-- | rpki/rpkic.py | 5 |
2 files changed, 11 insertions, 17 deletions
diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng index b05bf0ac..ccd75913 100755 --- a/rp/rcynic/rcynicng +++ b/rp/rcynic/rcynicng @@ -1386,31 +1386,22 @@ def main(): time.tzset() cfg, parser = rpki.config.argparser(section = "rcynic", doc = __doc__, cfg_optional = True) - - parser.add_argument("--unauthenticated", default = os.path.join(rpki.autoconf.RCYNIC_DIR, "data", "unauthenticated")) - - parser.add_argument("--xml-file", default = os.path.join(rpki.autoconf.RCYNIC_DIR, "data", "rcynic.xml"), - type = argparse.FileType("w")) - - parser.add_argument("--tals", default = os.path.join(rpki.autoconf.sysconfdir, "rpki", "trust-anchors")) - - parser.add_argument("--workers", default = 10, type = posint) - + parser.add_argument("-u", "--unauthenticated", + default = os.path.join(rpki.autoconf.RCYNIC_DIR, "data", "unauthenticated")) + parser.add_argument("-x", "--xml-file", type = argparse.FileType("w"), + default = os.path.join(rpki.autoconf.RCYNIC_DIR, "data", "rcynic.xml")) + parser.add_argument("-t", "--tals", + default = os.path.join(rpki.autoconf.sysconfdir, "rpki", "trust-anchors")) + parser.add_argument("-w", "--workers", default = 10, type = posint) parser.add_argument("--no-fetch", action = "store_true") parser.add_argument("--no-spawn-on-fetch", action = "store_true") parser.add_argument("--no-migrate", action = "store_true") - parser.add_argument("--prefer-rsync", action = "store_true") - parser.add_argument("--fetch-ahead-goal", default = 2, type = posint) - parser.add_argument("--https-timeout", default = 300, type = posint) - parser.add_argument("--validate-https", action = "store_true") - parser.add_argument("--max-https-body-size", type = posint, default = 512 * 1024 * 1024) - # We already have a whole bunch of logging control code in # rpki.log, just need to figure out / remember how to use it # properly. See rpki.log.init() & rpki.log.argparse_setup(). diff --git a/rpki/rpkic.py b/rpki/rpkic.py index 68cac4b2..199a685d 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -151,7 +151,10 @@ class main(Cmd): try: os.setreuid(uid, pwd.getpwnam(rpki.autoconf.RPKI_USER).pw_uid) - except (KeyError, OSError) as e: + except KeyError: + # This is normal when testing uninstalled code, but warn user just in case + print "Warning: User \"{}\" not found, not dropping privileges".format(rpki.autoconf.RPKI_USER) + except OSError as e: sys.exit("Couldn't drop privs to user {}: {!s}".format(rpki.autoconf.RPKI_USER, e)) except Exception as e: |