Add man page for keyd, even though it's not currently recommended for

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 0732a11156eae085c991428fa7f4bd75641be89c..a4cc90b78710fb4ee417d30352df0e62407a9adf 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -21,6 +21,7 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"

+#include "onak-conf.h"

 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {


@@ -30,7 +31,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 
        while (sigs != NULL) {
                sigid = sig_keyid(sigs->packet);
 
        while (sigs != NULL) {
                sigid = sig_keyid(sigs->packet);

-               uid = keyid2uid(sigid);
+               uid = config.dbbackend->keyid2uid(sigid);

                if (sigs->packet->data[0] == 4 &&
                                sigs->packet->data[1] == 0x30) {
                        /* It's a Type 4 sig revocation */
                if (sigs->packet->data[0] == 4 &&
                                sigs->packet->data[1] == 0x30) {
                        /* It's a Type 4 sig revocation */


@@ -268,8 +269,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        printf("%s%s%s\n", 
                                (html) ? txt2html(buf) : buf,
                                (html) ? "</a>" : "",
                        printf("%s%s%s\n", 
                                (html) ? txt2html(buf) : buf,
                                (html) ? "</a>" : "",

-                               (keys->revocations == NULL) ? "" :
-                                       " *** REVOKED ***");
+                               (keys->revoked) ? " *** REVOKED ***" : "");

                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }


@@ -279,8 +279,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        curuid = curuid->next;
                } else {
                        printf("%s\n", 
                        curuid = curuid->next;
                } else {
                        printf("%s\n", 

-                               (keys->revocations == NULL) ? "" :
-                                       "*** REVOKED ***");
+                               (keys->revoked) ? "*** REVOKED ***": "");

                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }


@@ -354,7 +353,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                        type,
                        length,
                        created_time,
                        type,
                        length,
                        created_time,

-                       (keys->revocations == NULL) ? "" : "r");
+                       (keys->revoked) ? "r" : "");

        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {
        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {