]> the.earth.li Git - onak.git/blobdiff - keyd.c
Add test for blacklisting functionality
[onak.git] / keyd.c
diff --git a/keyd.c b/keyd.c
index 9994dea303b812588fe00ff9d18cec5424ce8668..ddd1366a9bb7c94b56b6d31fc7b181005ae2c663 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -444,8 +444,9 @@ static int sock_do(struct onak_dbctx *dbctx, int fd)
                                ret = 1;
                        }
                        if (ret == 0) {
-                               bytes = read(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
+                               bytes = read(fd, &fingerprint,
+                                               sizeof(fingerprint));
+                               if (bytes != sizeof(fingerprint)) {
                                        ret = 1;
                                }
                        }
@@ -455,32 +456,7 @@ static int sock_do(struct onak_dbctx *dbctx, int fd)
                                                ", result: %d",
                                                keyid,
                                                dbctx->delete_key(dbctx,
-                                                       keyid, false));
-                       }
-                       break;
-               case KEYD_CMD_GETFULLKEYID:
-                       if (!keyd_write_reply(fd, KEYD_REPLY_OK)) {
-                               ret = 1;
-                       }
-                       if (ret == 0) {
-                               bytes = read(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
-                                       ret = 1;
-                               }
-                       }
-                       if (ret == 0) {
-                               keyid = dbctx->getfullkeyid(dbctx, keyid);
-                               cmd = sizeof(keyid);
-                               bytes = write(fd, &cmd, sizeof(cmd));
-                               if (bytes != sizeof(cmd)) {
-                                       ret = 1;
-                               }
-                       }
-                       if (ret == 0) {
-                               bytes = write(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
-                                       ret = 1;
-                               }
+                                                       &fingerprint, false));
                        }
                        break;
                case KEYD_CMD_KEYITER: