X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=inline;f=keyd.c;h=ddd1366a9bb7c94b56b6d31fc7b181005ae2c663;hb=da1f0ee80a15a9fb6a7d15e81f39ad9dc34db406;hp=ad06e6aae77037b23697a78ac8835c0f03684bf0;hpb=f98869fbb272a11751a1477e083898b8d41c94c6;p=onak.git
diff --git a/keyd.c b/keyd.c
index ad06e6a..ddd1366 100644
--- a/keyd.c
+++ b/keyd.c
@@ -13,14 +13,15 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
#include
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -31,7 +32,7 @@
#include
#include
-#include "config.h"
+#include "build-config.h"
#ifdef HAVE_SYSTEMD
#include
@@ -47,7 +48,6 @@
#include "mem.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "version.h"
/* Maximum number of clients we're prepared to accept at once */
#define MAX_CLIENTS 16
@@ -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: