Switch debian build system to dh

[onak.git] / keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 88bb6803bad50907ceeee29b80d9dcb6d8afaacb..65e71f559d409b28bb7a9d341f398412788f6eef 100644 (file)
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines to store and fetch keys.
  *
 /*
  * keydb.c - Routines to store and fetch keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * 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.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -83,7 +94,7 @@ static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        char keyfile[1024];
        int fd = -1;
 
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,

                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 


@@ -117,9 +128,11 @@ static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
        struct openpgp_publickey *next = NULL;
        char keyfile[1024];
        int fd = -1;
        struct openpgp_publickey *next = NULL;
        char keyfile[1024];
        int fd = -1;

+       uint64_t keyid;

 
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
-                       get_keyid(publickey) & 0xFFFFFFFF);
+       get_keyid(publickey, &keyid);
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,
+                       keyid & 0xFFFFFFFF);

        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
        if (fd > -1) {
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
        if (fd > -1) {


@@ -149,7 +162,7 @@ static int file_delete_key(uint64_t keyid, bool intrans)
 {
        char keyfile[1024];
 
 {
        char keyfile[1024];
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,

                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);