diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | rpkid/rpki/sql_schemas.py | 2 | ||||
| -rwxr-xr-x | rtr-origin/rtr-origin.py | 7 |
4 files changed, 4 insertions, 9 deletions
@@ -5062,7 +5062,7 @@ fi if test $build_rp_tools = yes then - ac_config_files="$ac_config_files rcynic/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/uri/Makefile rtr-origin/Makefile" + ac_config_files="$ac_config_files rcynic/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/scan_routercerts/Makefile utils/uri/Makefile rtr-origin/Makefile" fi @@ -5819,6 +5819,7 @@ do "utils/print_rpki_manifest/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_rpki_manifest/Makefile" ;; "utils/print_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/print_roa/Makefile" ;; "utils/scan_roas/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_roas/Makefile" ;; + "utils/scan_routercerts/Makefile") CONFIG_FILES="$CONFIG_FILES utils/scan_routercerts/Makefile" ;; "utils/uri/Makefile") CONFIG_FILES="$CONFIG_FILES utils/uri/Makefile" ;; "rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rtr-origin/Makefile" ;; "rpkid/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/Makefile" ;; diff --git a/configure.ac b/configure.ac index adeb2fa1..4f4aa244 100644 --- a/configure.ac +++ b/configure.ac @@ -825,6 +825,7 @@ then utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile + utils/scan_routercerts/Makefile utils/uri/Makefile rtr-origin/Makefile]) fi diff --git a/rpkid/rpki/sql_schemas.py b/rpkid/rpki/sql_schemas.py index 554dee0b..9a82f0ef 100644 --- a/rpkid/rpki/sql_schemas.py +++ b/rpkid/rpki/sql_schemas.py @@ -2,7 +2,7 @@ ## @var rpkid ## SQL schema rpkid -rpkid = '''-- $Id: rpkid.sql 5660 2014-02-01 00:14:32Z sra $ +rpkid = '''-- $Id: rpkid.sql 3745 2011-03-27 00:21:57Z sra $ -- Copyright (C) 2009--2011 Internet Systems Consortium ("ISC") -- diff --git a/rtr-origin/rtr-origin.py b/rtr-origin/rtr-origin.py index 11132288..f37d2ce0 100755 --- a/rtr-origin/rtr-origin.py +++ b/rtr-origin/rtr-origin.py @@ -906,13 +906,6 @@ class axfr_set(pdu_set): line = line.split() gski = line[0] key = line[-1] - - # XXX - if False: - print "++ Got: ", line - print "++ g(SKI):", gski - print "++ key: ", key - self.extend(router_key.from_text(asn, gski, key) for asn in line[1:-1]) except OSError, e: sys.exit("Could not run %s, check your $PATH variable? (%s)" % (scan_routercerts, e)) |