Move sessid definition to keynote-verify.c to avoid issues with -fno-common

ok deraadt@

diff --git a/lib/libkeynote/header.h b/lib/libkeynote/header.h
index 04dc1ad..3d72629 100644 (file)
--- a/lib/libkeynote/header.h
+++ b/lib/libkeynote/header.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: header.h,v 1.10 2004/06/29 11:35:56 msf Exp $ */
+/* $OpenBSD: header.h,v 1.11 2021/01/18 00:53:20 mortimer Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -33,7 +33,7 @@ extern int kvparse(void), kvlex(void);
 extern void kverror(char *);
 
 /* Variables */
-int sessid;
+extern int sessid;
 
 /* Defines */
 #define SEED_LEN        40

diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index d6f13f1..37cc2af 100644 (file)
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.18 2019/06/28 13:32:42 deraadt Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.19 2021/01/18 00:53:20 mortimer Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
  *
@@ -34,6 +34,8 @@
 #include "header.h"
 #include "keynote.h"
 
+int sessid;
+
 void   verifyusage(void);
 
 void