X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=inline;f=onak.c;h=89c2ec7ba04e5f779ef87c56863b1dd3d919b622;hb=63024252ef5bc13b0b920112b91c1945e0cc6f13;hp=575e7bcbafdaa67501fd295e2804f3c4348bb0c8;hpb=5cb3cfdb9d8caa6d7a4a1979c50c46896957b934;p=onak.git
diff --git a/onak.c b/onak.c
index 575e7bc..89c2ec7 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 .
*/
#include
@@ -149,6 +148,7 @@ void usage(void) {
puts("\tgetphoto - retrieves the first photoid on the given key and"
" dumps to\n\t stdout");
puts("\tindex - search for a key and list it");
+ puts("\treindex - retrieve and re-store a key in the backend db");
puts("\tvindex - search for a key and list it and its signatures");
}
@@ -206,7 +206,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;
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
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));
@@ -317,6 +317,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 &&
@@ -329,14 +336,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,
@@ -425,6 +432,16 @@ int main(int argc, char *argv[])
} else {
puts("Key not found");
}
+ } else if (!strcmp("reindex", argv[optind])) {
+ dbctx->starttrans(dbctx);
+ if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
+ dbctx->delete_key(dbctx, keyid, true);
+ cleankeys(keys);
+ dbctx->store_key(dbctx, keys, true, false);
+ } else {
+ puts("Key not found");
+ }
+ dbctx->endtrans(dbctx);
}
dbctx->cleanupdb(dbctx);
} else {
@@ -433,6 +450,7 @@ int main(int argc, char *argv[])
cleanuplogthing();
cleanupconfig();
+ free(configfile);
return rc;
}