X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=onak.c;h=085a876c54c9dac6ceb1d4f22bbb8ec2fcff8f91;hp=ef7134162a649d4861dbf9201043ec9d28941f20;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hpb=2e969db9d32b8fba8a22125fe5b66323b6d1f71e

diff --git a/onak.c b/onak.c
index ef71341..085a876 100644
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -234,7 +233,7 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
 
-			result = cleankeys(keys);
+			result = cleankeys(&keys, config.clean_policies);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
@@ -289,7 +288,8 @@ int main(int argc, char *argv[])
 					result);
 
 			if (keys != NULL) {
-				result = cleankeys(keys);
+				result = cleankeys(&keys,
+						config.clean_policies);
 				logthing(LOGTHING_INFO, "%d keys cleaned.",
 						result);
 
@@ -318,6 +318,13 @@ int main(int argc, char *argv[])
 			free_publickey(keys);
 			keys = NULL;
 		}
+	} else if (!strcmp("dumpconfig", argv[optind])) {
+		if ((argc - optind) == 2) {
+			writeconfig(argv[optind + 1]);
+		} else {
+			/* Dump config to stdout */
+			writeconfig(NULL);
+		}
 	} else if ((argc - optind) == 2) {
 		search = argv[optind+1];
 		if (search != NULL && strlen(search) == 42 &&
@@ -430,7 +437,7 @@ int main(int argc, char *argv[])
 			dbctx->starttrans(dbctx);
 			if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
 				dbctx->delete_key(dbctx, keyid, true);
-				cleankeys(keys);
+				cleankeys(&keys, config.clean_policies);
 				dbctx->store_key(dbctx, keys, true, false);
 			} else {
 				puts("Key not found");