[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3834 - trunk/OpenDNSSEC/enforcer/utils

Sion Lloyd sion at nominet.org.uk
Tue Aug 31 10:39:51 CEST 2010


Author: sion
Date: 2010-08-31 10:39:50 +0200 (Tue, 31 Aug 2010)
New Revision: 3834

Modified:
   trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
   trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in
Log:
ksmutil policy import as a synonym for "update kasp", pivotal story 3998449.


Modified: trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-08-31 08:20:18 UTC (rev 3833)
+++ trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-08-31 08:39:50 UTC (rev 3834)
@@ -181,6 +181,13 @@
 }
 
     void
+usage_policyimport ()
+{
+    fprintf(stderr,
+            "  policy import\n");
+}
+
+    void
 usage_policylist ()
 {
     fprintf(stderr,
@@ -194,6 +201,7 @@
             "usage: %s [-f config] \n\n",
 	    progname);
     usage_policyexport ();
+    usage_policyimport ();
     usage_policylist ();
 }
 
@@ -2981,9 +2989,11 @@
     } else if (!strncmp(case_command, "POLICY", 6)) {
         argc --; argc --;
         argv ++; argv ++;
-        /* verb should be export or list */
+        /* verb should be export, import or list */
         if (!strncmp(case_verb, "EXPORT", 6)) {
             result = cmd_exportpolicy();
+        } else if (!strncmp(case_verb, "IMPORT", 6)) {
+            result = cmd_update("KASP");
         } else if (!strncmp(case_verb, "LIST", 4)) {
             result = cmd_listpolicy();
         } else {

Modified: trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in	2010-08-31 08:20:18 UTC (rev 3833)
+++ trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in	2010-08-31 08:39:50 UTC (rev 3834)
@@ -19,7 +19,7 @@
 .B ods-ksmutil rollover list
 .RB ...
 .br
-.B ods-ksmutil policy export
+.B ods-ksmutil policy export|import
 .RB ...
 .br
 .B ods-ksmutil repository list
@@ -238,6 +238,9 @@
 .TP
 .B policy export [--policy|--all|-p|-a]
 Export a policy from the database in the same format as the kasp.xml file.
+.TP
+.B policy import
+Update the database with the contents of kasp.xml; identical to "update kasp".
 .SH "REPOSITORY AND BACKUP SUBCOMMANDS"
 .LP
 .TP




More information about the Opendnssec-commits mailing list