X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_keyd.c;h=cd1a2819d98eefc04b53a060d718e7c1fc58ab19;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=6836e9a2db02cbbe28d22b1a123a2103ee56da05;hpb=2458360e75aa46091f60c16e041c07bffe2edefb;p=onak.git diff --git a/keydb_keyd.c b/keydb_keyd.c index 6836e9a..cd1a281 100644 --- a/keydb_keyd.c +++ b/keydb_keyd.c @@ -13,12 +13,13 @@ * 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 @@ -34,6 +35,7 @@ #include "keystructs.h" #include "log.h" #include "mem.h" +#include "onak.h" #include "onak-conf.h" #include "parsekey.h" @@ -227,6 +229,7 @@ static int keyd_store_key(struct onak_dbctx *dbctx, struct openpgp_packet_list *list_end = NULL; struct openpgp_publickey *next = NULL; uint64_t keyid; + enum keyd_ops cmd = KEYD_CMD_STORE; if (get_keyid(publickey, &keyid) != ONAK_E_OK) { logthing(LOGTHING_ERROR, "Couldn't find key ID for key."); @@ -234,10 +237,10 @@ static int keyd_store_key(struct onak_dbctx *dbctx, } if (update) { - keyd_delete_key(dbctx, keyid, false); + cmd = KEYD_CMD_UPDATE; } - if (keyd_send_cmd(keyd_fd, KEYD_CMD_STORE)) { + if (keyd_send_cmd(keyd_fd, cmd)) { keybuf.offset = 0; keybuf.size = 8192; keybuf.buffer = malloc(keybuf.size);