projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an element to the keyd command enum for the last supported command
[onak.git]
/
keyd.c
diff --git
a/keyd.c
b/keyd.c
index 18d09bf515fd5533c74a52e9f59e62042d45a094..987724db53320bae70f708bf7f68d2a438eddd35 100644
(file)
--- a/
keyd.c
+++ b/
keyd.c
@@
-69,7
+69,7
@@
void iteratefunc(void *ctx, struct openpgp_publickey *key)
storebuf.buffer = malloc(8192);
logthing(LOGTHING_TRACE,
storebuf.buffer = malloc(8192);
logthing(LOGTHING_TRACE,
- "Iterating over 0x%016
llX
.",
+ "Iterating over 0x%016
" PRIX64 "
.",
get_keyid(key));
flatten_publickey(key,
get_keyid(key));
flatten_publickey(key,
@@
-125,7
+125,7
@@
int sock_init(const char *sockname)
int sock_do(int fd)
{
int sock_do(int fd)
{
-
int
cmd = KEYD_CMD_UNKNOWN;
+
uint32_t
cmd = KEYD_CMD_UNKNOWN;
ssize_t bytes = 0;
ssize_t count = 0;
int ret = 0;
ssize_t bytes = 0;
ssize_t count = 0;
int ret = 0;
@@
-164,7
+164,8
@@
int sock_do(int fd)
storebuf.offset = 0;
if (ret == 0) {
logthing(LOGTHING_INFO,
storebuf.offset = 0;
if (ret == 0) {
logthing(LOGTHING_INFO,
- "Fetching 0x%llX, result: %d",
+ "Fetching 0x%" PRIX64
+ ", result: %d",
keyid,
config.dbbackend->
fetch_key(keyid, &key, false));
keyid,
config.dbbackend->
fetch_key(keyid, &key, false));
@@
-294,7
+295,8
@@
int sock_do(int fd)
}
if (ret == 0) {
logthing(LOGTHING_INFO,
}
if (ret == 0) {
logthing(LOGTHING_INFO,
- "Deleting 0x%llX, result: %d",
+ "Deleting 0x%" PRIX64
+ ", result: %d",
keyid,
config.dbbackend->delete_key(
keyid, false));
keyid,
config.dbbackend->delete_key(
keyid, false));
@@
-388,6
+390,7
@@
int main(int argc, char *argv[])
free(configfile);
configfile = NULL;
initlogthing("keyd", config.logfile);
free(configfile);
configfile = NULL;
initlogthing("keyd", config.logfile);
+ config.use_keyd = false;
if (!foreground) {
daemonize();
if (!foreground) {
daemonize();