projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make keyd command handling more consistent
[onak.git]
/
keyd.c
diff --git
a/keyd.c
b/keyd.c
index 987724db53320bae70f708bf7f68d2a438eddd35..919b61b899a886609f29caebf86e841b725c9fce 100644
(file)
--- a/
keyd.c
+++ b/
keyd.c
@@
-152,6
+152,8
@@
int sock_do(int fd)
case KEYD_CMD_VERSION:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
case KEYD_CMD_VERSION:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
+ cmd = sizeof(keyd_version);
+ write(fd, &cmd, sizeof(cmd));
write(fd, &keyd_version, sizeof(keyd_version));
break;
case KEYD_CMD_GET:
write(fd, &keyd_version, sizeof(keyd_version));
break;
case KEYD_CMD_GET:
@@
-311,6
+313,8
@@
int sock_do(int fd)
}
if (ret == 0) {
keyid = config.dbbackend->getfullkeyid(keyid);
}
if (ret == 0) {
keyid = config.dbbackend->getfullkeyid(keyid);
+ cmd = sizeof(keyid);
+ write(fd, &cmd, sizeof(cmd));
write(fd, &keyid, sizeof(keyid));
}
break;
write(fd, &keyid, sizeof(keyid));
}
break;
@@
-323,9
+327,14
@@
int sock_do(int fd)
write(fd, &bytes, sizeof(bytes));
break;
case KEYD_CMD_CLOSE:
write(fd, &bytes, sizeof(bytes));
break;
case KEYD_CMD_CLOSE:
+ cmd = KEYD_REPLY_OK;
+ write(fd, &cmd, sizeof(cmd));
ret = 1;
break;
case KEYD_CMD_QUIT:
ret = 1;
break;
case KEYD_CMD_QUIT:
+ cmd = KEYD_REPLY_OK;
+ write(fd, &cmd, sizeof(cmd));
+ ret = 1;
trytocleanup();
break;
default:
trytocleanup();
break;
default: