projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscvs to tla changeset 94
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index e4ac9cefaecbe36fdbfbb7ba815d3de916e63940..71c27c3357f32e27806fd0be668a8c5d244b7a3b 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-4,19
+4,22
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
+ *
+ * $Id: lookup.c,v 1.10 2003/06/07 13:45:34 noodles Exp $
*/
*/
-//#include <stdint.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include "armor.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
#include <unistd.h>
#include "armor.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
+#include "log.h"
#include "mem.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "mem.h"
#include "onak-conf.h"
#include "parsekey.h"
@@
-32,7
+35,7
@@
int putnextchar(void *ctx, size_t count, unsigned char *c)
}
void find_keys(char *search, uint64_t keyid, bool ishex,
}
void find_keys(char *search, uint64_t keyid, bool ishex,
- bool fingerprint, bool exact, bool verbose)
+ bool fingerprint, bool exact, bool verbose
, bool mrhkp
)
{
struct openpgp_publickey *publickey = NULL;
int count = 0;
{
struct openpgp_publickey *publickey = NULL;
int count = 0;
@@
-43,15
+46,29
@@
void find_keys(char *search, uint64_t keyid, bool ishex,
count = fetch_key_text(search, &publickey);
}
if (publickey != NULL) {
count = fetch_key_text(search, &publickey);
}
if (publickey != NULL) {
- key_index(publickey, verbose, fingerprint, true);
+ if (mrhkp) {
+ printf("info:1:%d\n", count);
+ mrkey_index(publickey);
+ } else {
+ key_index(publickey, verbose, fingerprint, true);
+ }
free_publickey(publickey);
} else if (count == 0) {
free_publickey(publickey);
} else if (count == 0) {
- puts("Key not found.");
+ if (mrhkp) {
+ puts("info:1:0");
+ } else {
+ puts("Key not found.");
+ }
} else {
} else {
- printf("Found %d keys, but maximum number to return is %d.\n",
+ if (mrhkp) {
+ puts("info:1:0");
+ } else {
+ printf("Found %d keys, but maximum number to return"
+ " is %d.\n",
count,
config.maxkeys);
count,
config.maxkeys);
- puts("Try again with a more specific search.");
+ puts("Try again with a more specific search.");
+ }
}
}
}
}
@@
-63,6
+80,7
@@
int main(int argc, char *argv[])
bool fingerprint = false;
bool exact = false;
bool ishex = false;
bool fingerprint = false;
bool exact = false;
bool ishex = false;
+ bool mrhkp = false;
uint64_t keyid = 0;
char *search = NULL;
char *end = NULL;
uint64_t keyid = 0;
char *search = NULL;
char *end = NULL;
@@
-99,6
+117,15
@@
int main(int argc, char *argv[])
if (!strcmp(params[i+1], "on")) {
exact = true;
}
if (!strcmp(params[i+1], "on")) {
exact = true;
}
+ } else if (!strcmp(params[i], "options")) {
+ /*
+ * TODO: We should be smarter about this; options may
+ * have several entries. For now mr is the only valid
+ * one though.
+ */
+ if (!strcmp(params[i+1], "mr")) {
+ mrhkp = true;
+ }
}
free(params[i]);
params[i] = NULL;
}
free(params[i]);
params[i] = NULL;
@@
-112,13
+139,19
@@
int main(int argc, char *argv[])
params = NULL;
}
params = NULL;
}
- start_html("Lookup of key");
+ if (mrhkp) {
+ puts("Content-Type: text/plain\n");
+ } else {
+ start_html("Lookup of key");
+ }
if (op == OP_UNKNOWN) {
puts("Error: No operation supplied.");
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
if (op == OP_UNKNOWN) {
puts("Error: No operation supplied.");
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
+ readconfig();
+ initlogthing("lookup", config.logfile);
initdb();
switch (op) {
case OP_GET:
initdb();
switch (op) {
case OP_GET:
@@
-137,20
+170,24
@@
int main(int argc, char *argv[])
break;
case OP_INDEX:
find_keys(search, keyid, ishex, fingerprint, exact,
break;
case OP_INDEX:
find_keys(search, keyid, ishex, fingerprint, exact,
- false);
+ false
, mrhkp
);
break;
case OP_VINDEX:
find_keys(search, keyid, ishex, fingerprint, exact,
break;
case OP_VINDEX:
find_keys(search, keyid, ishex, fingerprint, exact,
- true);
+ true
, mrhkp
);
break;
default:
puts("Unknown operation!");
}
cleanupdb();
break;
default:
puts("Unknown operation!");
}
cleanupdb();
+ cleanuplogthing();
+ cleanupconfig();
+ }
+ if (!mrhkp) {
+ puts("<hr>");
+ puts("Produced by onak " VERSION " by Jonathan McDowell");
+ end_html();
}
}
- puts("<hr>");
- puts("Produced by onak " VERSION " by Jonathan McDowell");
- end_html();
if (search != NULL) {
free(search);
if (search != NULL) {
free(search);