X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=63f19d769679ccd9287c59e9e048aac7fc471230;hb=a799cc2909f47d918d1ec7171a9edba28a9f5136;hp=ad86cb04bef6ff829c78034030ae314ccdb005f4;hpb=99e631a4e7aa7a22d7c9ff0797f4ce690decd92a;p=onak.git

diff --git a/onak.c b/onak.c
index ad86cb0..63f19d7 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>
@@ -28,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "build-config.h"
+
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
@@ -42,7 +43,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
-#include "version.h"
 
 void find_keys(struct onak_dbctx *dbctx,
 		char *search, uint64_t keyid,
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
 	if ((argc - optind) < 1) {
 		usage();
 	} else if (!strcmp("dump", argv[optind])) {
-		dbctx = config.dbinit(true);
+		dbctx = config.dbinit(config.backend, true);
 		dumpstate.count = dumpstate.filenum = 0;
 		dumpstate.maxcount = 100000;
 		dumpstate.fd = -1;
@@ -234,11 +234,11 @@ 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);
 
-			dbctx = config.dbinit(false);
+			dbctx = config.dbinit(config.backend, false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 					dbctx->update_keys(dbctx, &keys,
 					false));
@@ -289,7 +289,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 +319,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 &&
@@ -330,14 +338,14 @@ int main(int argc, char *argv[])
 			}
 			isfp = true;
 		} else if (search != NULL) {
-			keyid = strtoul(search, &end, 16);
+			keyid = strtouq(search, &end, 16);
 			if (*search != 0 &&
 					end != NULL &&
 					*end == 0) {
 				ishex = true;
 			}
 		}
-		dbctx = config.dbinit(false);
+		dbctx = config.dbinit(config.backend, false);
 		if (!strcmp("index", argv[optind])) {
 			find_keys(dbctx, search, keyid, &fingerprint, ishex,
 					isfp, dispfp, skshash,
@@ -430,7 +438,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");
@@ -444,6 +452,7 @@ int main(int argc, char *argv[])
 
 	cleanuplogthing();
 	cleanupconfig();
+	free(configfile);
 
 	return rc;
 }