cscvs to tla changeset 86

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 311b44f9b16d9e67a741d04d7666280886e851e1..bba213b57b703c9cabed79165bde3631716f8134 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -6,6 +6,8 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple

+ *
+ * $Id: onak.c,v 1.14 2003/06/07 13:37:33 noodles Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -78,6 +80,8 @@ void usage(void) {
        puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
                " keyserver");
        puts("\tdelete - delete a given key from the keyserver");
        puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
                " keyserver");
        puts("\tdelete - delete a given key from the keyserver");

+       puts("\tdump   - dump all the keys from the keyserver to a file or"
+               " files\n\t         starting keydump*");

        puts("\tget    - retrieves the key requested from the keyserver");
        puts("\tindex  - search for a key and list it");
        puts("\tvindex - search for a key and list it and its signatures");
        puts("\tget    - retrieves the key requested from the keyserver");
        puts("\tindex  - search for a key and list it");
        puts("\tvindex - search for a key and list it and its signatures");


@@ -189,11 +193,15 @@ int main(int argc, char *argv[])
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {

-                       if (fetch_key(keyid, &keys, false)) {
+                       if (!ishex) {
+                               puts("Can't get a key on uid text."
+                                       " You must supply a keyid.");
+                       } else if (fetch_key(keyid, &keys, false)) {

                                logthing(LOGTHING_INFO, "Got key.");
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);
                                logthing(LOGTHING_INFO, "Got key.");
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);

+                               free_publickey(keys);

                                armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);
                                armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);