Fix onak.c to include version.h not config.h

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 3431690bde0e6afdc39a548ba49464cfa3d733cd..9bafcc8950258932830d1ed436e01711f56650a1 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -17,7 +17,6 @@
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "cleanup.h"
-#include "config.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -26,6 +25,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
+#include "version.h"
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
@@ -160,12 +160,12 @@ int main(int argc, char *argv[])
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
                catchsignals();
-               config.dbbackend->initdb(true);
+               config.dbbackend->initdb(false);
                switch (op) {
                case OP_GET:
                        if (ishex) {
                                logthing(LOGTHING_NOTICE, 
-                                       "Getting keyid 0x%llX",
+                                       "Getting keyid 0x%" PRIX64,
                                        keyid);
                                result = config.dbbackend->fetch_key(keyid,
                                        &publickey, false);
@@ -207,7 +207,8 @@ int main(int argc, char *argv[])
                                unsigned char *photo = NULL;
                                size_t         length = 0;
 
-                               if (getphoto(publickey, 0, &photo, &length)) {
+                               if (getphoto(publickey, indx, &photo,
+                                               &length)) {
                                        fwrite(photo,
                                                        1,
                                                        length,
@@ -226,7 +227,7 @@ int main(int argc, char *argv[])
        }
        if (!mrhkp) {
                puts("<hr>");
-               puts("Produced by onak " PACKAGE_VERSION 
+               puts("Produced by onak " ONAK_VERSION 
                                " by Jonathan McDowell");
                end_html();
        }