#include "charfuncs.h"
#include "cleankey.h"
#include "cleanup.h"
-#include "config.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
+#include "version.h"
#define OP_UNKNOWN 0
#define OP_GET 1
struct openpgp_publickey *publickey = NULL;
struct openpgp_packet_list *packets = NULL;
struct openpgp_packet_list *list_end = NULL;
+ int result;
params = getcgivars(argc, argv);
for (i = 0; params != NULL && params[i] != NULL; i += 2) {
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
- config.dbbackend->initdb(true);
+ config.dbbackend->initdb(false);
switch (op) {
case OP_GET:
- logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
- keyid);
- if (config.dbbackend->fetch_key(keyid, &publickey,
- false)) {
+ if (ishex) {
+ result = config.dbbackend->fetch_key(keyid,
+ &publickey, false);
+ } else {
+ result = config.dbbackend->fetch_key_text(
+ search,
+ &publickey);
+ }
+ if (result) {
+ logthing(LOGTHING_NOTICE,
+ "Found %d key(s) for search %s",
+ result,
+ search);
puts("<pre>");
cleankeys(publickey);
flatten_publickey(publickey,
puts("</pre>");
} else {
logthing(LOGTHING_NOTICE,
- "Failed to fetch key.");
+ "Failed to find key for search %s",
+ search);
puts("Key not found");
}
break;
unsigned char *photo = NULL;
size_t length = 0;
- if (getphoto(publickey, 0, &photo, &length)) {
+ if (getphoto(publickey, indx, &photo,
+ &length)) {
fwrite(photo,
1,
length,
}
if (!mrhkp) {
puts("<hr>");
- puts("Produced by onak " PACKAGE_VERSION
+ puts("Produced by onak " ONAK_VERSION
" by Jonathan McDowell");
end_html();
}