[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3665 - trunk/OpenDNSSEC/libhsm/checks

Jakob Schlyter jakob at kirei.se
Fri Aug 6 14:30:08 CEST 2010


Author: jakob
Date: 2010-08-06 14:30:07 +0200 (Fri, 06 Aug 2010)
New Revision: 3665

Modified:
   trunk/OpenDNSSEC/libhsm/checks/Makefile.am
   trunk/OpenDNSSEC/libhsm/checks/hsmcheck.c
Log:
use -c for config file (to be consistent with other libhsm programs

Modified: trunk/OpenDNSSEC/libhsm/checks/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/libhsm/checks/Makefile.am	2010-08-06 12:20:42 UTC (rev 3664)
+++ trunk/OpenDNSSEC/libhsm/checks/Makefile.am	2010-08-06 12:30:07 UTC (rev 3665)
@@ -32,25 +32,25 @@
 	@echo use target 'regress-{aepkeyper,sca6000,softhsm,etoken,opensc,ncipher,multi}'
 
 regress-aepkeyper: hsmcheck
-	./hsmcheck -f conf-aepkeyper.xml -gsdr
+	./hsmcheck -c conf-aepkeyper.xml -gsdr
 
 regress-sca6000: hsmcheck
-	./hsmcheck -f conf-sca6000.xml -gsdr
+	./hsmcheck -c conf-sca6000.xml -gsdr
 
 regress-softhsm: hsmcheck token.db
 	env $(SOFTHSM_ENV) \
-	./hsmcheck -f conf-softhsm.xml -gsdr
+	./hsmcheck -c conf-softhsm.xml -gsdr
 
 regress-etoken: hsmcheck
-	./hsmcheck -f conf-etoken.xml -gsdr
+	./hsmcheck -c conf-etoken.xml -gsdr
 
 regress-opensc: hsmcheck
-	./hsmcheck -f conf-opensc.xml -gsdr
+	./hsmcheck -c conf-opensc.xml -gsdr
 
 regress-ncipher: hsmcheck
-	./hsmcheck -f conf-ncipher.xml -gsdr
+	./hsmcheck -c conf-ncipher.xml -gsdr
 
 regress-multi: hsmcheck token.db othertoken.db
 	env $(SOFTHSM_ENV) \
-	./hsmcheck -f conf-multi.xml -gsdr
+	./hsmcheck -c conf-multi.xml -gsdr
 

Modified: trunk/OpenDNSSEC/libhsm/checks/hsmcheck.c
===================================================================
--- trunk/OpenDNSSEC/libhsm/checks/hsmcheck.c	2010-08-06 12:20:42 UTC (rev 3664)
+++ trunk/OpenDNSSEC/libhsm/checks/hsmcheck.c	2010-08-06 12:30:07 UTC (rev 3665)
@@ -42,7 +42,7 @@
 void
 usage ()
 {
-    fprintf(stderr, "usage: %s [-f config] [-gsd]\n", progname);
+    fprintf(stderr, "usage: %s [-c config] [-gsd]\n", progname);
 }
 
 int
@@ -76,9 +76,9 @@
 
     progname = argv[0];
 
-    while ((ch = getopt(argc, argv, "hgsdrf:")) != -1) {
+    while ((ch = getopt(argc, argv, "hgsdrc:")) != -1) {
         switch (ch) {
-        case 'f':
+        case 'c':
             config = strdup(optarg);
             break;
         case 'g':




More information about the Opendnssec-commits mailing list