if (ishex) {
count = dbctx->fetch_key_id(dbctx, keyid, &publickey,
false);
- } else if (isfp) {
+ } else if (isfp && exact) {
+ count = dbctx->fetch_key(dbctx, fingerprint,
+ &publickey, false);
+ } else if (isfp && !exact) {
count = dbctx->fetch_key_fp(dbctx, fingerprint,
&publickey, false);
} else {
char *end = NULL;
uint64_t keyid = 0;
int i;
+ bool exact = false;
bool ishex = false;
bool isfp = false;
bool update = false;
struct onak_dbctx *dbctx;
struct openpgp_fingerprint fingerprint;
- while ((optchar = getopt(argc, argv, "bc:fsuv")) != -1 ) {
+ while ((optchar = getopt(argc, argv, "bc:efsuv")) != -1 ) {
switch (optchar) {
case 'b':
binary = true;
break;
case 'c':
+ if (configfile != NULL) {
+ free(configfile);
+ }
configfile = strdup(optarg);
break;
+ case 'e':
+ exact = true;
+ break;
case 'f':
dispfp = true;
break;
usage();
} else if (!strcmp("dump", argv[optind])) {
dbctx = config.dbinit(config.backend, true);
+ if (dbctx == NULL) {
+ logthing(LOGTHING_ERROR,
+ "Failed to open key database.");
+ rc = EXIT_FAILURE;
+ goto err;
+ }
dumpstate.count = dumpstate.filenum = 0;
dumpstate.maxcount = 100000;
dumpstate.fd = -1;
result);
dbctx = config.dbinit(config.backend, false);
+ if (dbctx == NULL) {
+ logthing(LOGTHING_ERROR,
+ "Failed to open key database.");
+ rc = EXIT_FAILURE;
+ goto err;
+ }
result = cleankeys(dbctx, &keys,
config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
}
} else if (!strcmp("clean", argv[optind])) {
dbctx = config.dbinit(config.backend, true);
+ if (dbctx == NULL) {
+ logthing(LOGTHING_ERROR,
+ "Failed to open key database.");
+ rc = EXIT_FAILURE;
+ goto err;
+ }
if (binary) {
result = read_openpgp_stream(stdin_getchar, NULL,
&packets, 0);
}
}
dbctx = config.dbinit(config.backend, false);
+ if (dbctx == NULL) {
+ logthing(LOGTHING_ERROR,
+ "Failed to open key database.");
+ rc = EXIT_FAILURE;
+ goto err;
+ }
if (!strcmp("index", argv[optind])) {
find_keys(dbctx, search, keyid, &fingerprint, ishex,
isfp, dispfp, skshash,
- false, false);
+ exact, false);
} else if (!strcmp("vindex", argv[optind])) {
find_keys(dbctx, search, keyid, &fingerprint, ishex,
isfp, dispfp, skshash,
- false, true);
+ exact, true);
} else if (!strcmp("getphoto", argv[optind])) {
if (!ishex) {
puts("Can't get a key on uid text."
usage();
}
+err:
cleanuplogthing();
cleanupconfig();
free(configfile);