[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r5995 - trunk/OpenDNSSEC/enforcer/utils

sion at nominet.org.uk sion at nominet.org.uk
Wed Jan 4 14:58:55 CET 2012


Author: sion
Date: 2012-01-04 14:58:54 +0100 (Wed, 04 Jan 2012)
New Revision: 5995

Modified:
   trunk/OpenDNSSEC/enforcer/utils/Makefile.am
   trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
Log:
Include the c version of ods-kaspcheck (will be overwritten by the ruby version if the auditor is being built). ksmutil now should work with either the ruby or the c version. OPENDNSSEC-114


Modified: trunk/OpenDNSSEC/enforcer/utils/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/Makefile.am	2012-01-03 16:14:24 UTC (rev 5994)
+++ trunk/OpenDNSSEC/enforcer/utils/Makefile.am	2012-01-04 13:58:54 UTC (rev 5995)
@@ -26,17 +26,17 @@
 dist_opendnssecdata_DATA = database_create.sqlite3
 endif
 
-bin_PROGRAMS =	ods-ksmutil #ods-kaspcheck
+bin_PROGRAMS =	ods-ksmutil ods-kaspcheck
 man1_MANS =	ods-ksmutil.1
 
 ods_ksmutil_SOURCES = ksmutil.c
 ods_ksmutil_LDADD = $(LIBKSM) $(LIBHSM) $(LIBCOMPAT)
 ods_ksmutil_LDADD += @XML2_LIBS@ @DB_LIBS@ @LDNS_LIBS@
 
-#ods_kaspcheck_SOURCES = kaspcheck.c kaspcheck.h \
-#						kc_helper.c kc_helper.h
+ods_kaspcheck_SOURCES = kaspcheck.c kaspcheck.h \
+						kc_helper.c kc_helper.h
 
-#ods_kaspcheck_LDADD = $(LIBHSM) $(LIBCOMPAT)
-#ods_kaspcheck_LDADD += @XML2_LIBS@
+ods_kaspcheck_LDADD = $(LIBHSM) $(LIBCOMPAT)
+ods_kaspcheck_LDADD += @XML2_LIBS@
 
 EXTRA_DIST = $(srcdir)/migrate_*.pl

Modified: trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2012-01-03 16:14:24 UTC (rev 5994)
+++ trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2012-01-04 13:58:54 UTC (rev 5995)
@@ -4369,7 +4369,7 @@
     StrAppend(&kaspcheck_cmd, kasp_filename);
 
     StrAppend(&kaspcheck_cmd_version, ODS_AU_KASPCHECK);
-    StrAppend(&kaspcheck_cmd_version, " -v > /dev/null");
+    StrAppend(&kaspcheck_cmd_version, " --version > /dev/null");
 
     /* Run kaspcheck */
     status = system(kaspcheck_cmd_version);




More information about the Opendnssec-commits mailing list