X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/1921fa44cfae203ae40e853ee9ecedb206fa9413..b3fb0618da777d1ce58418ab36bc4321f5cf77ef:/gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index 10b3806..f087123 100644
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -14,7 +14,6 @@
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleanup.h"
-#include "config.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
@@ -23,6 +22,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"
+#include "version.h"
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
@@ -154,14 +154,14 @@ int main(int argc, char *argv[])
 	}
 
 	if (op != OP_GET) {
-		printf("<P>Looking for path from 0x%" PRIx64" to 0x%" PRIx64
-				".\n",
+		printf("<P>Looking for path from 0x%016" PRIX64" to 0x%016"
+				PRIX64 ".\n",
 				from, to);
-		printf("<A HREF=\"gpgwww?from=0x%08" PRIx64 "&to=0x%08" PRIx64
+		printf("<A HREF=\"gpgwww?from=0x%016" PRIX64 "&to=0x%016" PRIX64
 				"\">Find reverse path</A>\n",
 				to,
 				from);
-		printf("<A HREF=\"gpgwww?from=0x%08" PRIx64 "&to=0x%08" PRIx64
+		printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
 				"&op=get\">"
 				"Get all keys listed</A></P>\n",
 				from,
@@ -173,8 +173,9 @@ int main(int argc, char *argv[])
 	catchsignals();
 	config.dbbackend->initdb(true);
 	inithash();
-	logthing(LOGTHING_NOTICE, "Looking for path from 0x%" PRIx64 " to 0x%"
-			PRIx64,
+	logthing(LOGTHING_NOTICE, "Looking for path from 0x%016" PRIX64
+			" to 0x%016"
+			PRIX64,
 			from,
 			to);
 	if (op == OP_GET) {
@@ -189,7 +190,7 @@ int main(int argc, char *argv[])
 
 	if (op != OP_GET) {
 		puts("<HR>");
-		puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "
+		puts("Produced by gpgwww " ONAK_VERSION ", part of onak. "
 			"<A HREF=\"mailto:noodles-onak@earth.li\">"
 			"Jonathan McDowell</A>");
 		end_html();