Handle Proxy Protocol v2 safely as well.

[exim.git] / src / exim_monitor / em_hdr.h

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index a6a642f628b3532e1aa3ac5651e63143fca4815e..a7e874a8731848725cb586da359610f10c732894 100644 (file)
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.6 2007/01/08 10:50:17 ph10 Exp $ */
-

 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 
 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -87,13 +85,14 @@ anything. */
 
 /* Regular expression include */
 
 
 /* Regular expression include */
 

-#include "pcre/pcre.h"
+#include <pcre.h>

 
 /* Includes from the main source of Exim. We need to have MAXPACKET defined for
 the benefit of structs.h. One of these days I should tidy up this interface so
 that this kind of kludge isn't needed. */
 
 #define MAXPACKET 1024
 
 /* Includes from the main source of Exim. We need to have MAXPACKET defined for
 the benefit of structs.h. One of these days I should tidy up this interface so
 that this kind of kludge isn't needed. */
 
 #define MAXPACKET 1024

+typedef void hctx;

 
 #include "config.h"
 #include "mytypes.h"
 
 #include "config.h"
 #include "mytypes.h"


@@ -102,6 +101,7 @@ that this kind of kludge isn't needed. */
 #include "local_scan.h"
 #include "structs.h"
 #include "globals.h"
 #include "local_scan.h"
 #include "structs.h"
 #include "globals.h"

+#include "dbstuff.h"

 #include "functions.h"
 #include "osfunctions.h"
 #include "store.h"
 #include "functions.h"
 #include "osfunctions.h"
 #include "store.h"