PAM: fix crash in the pam expansion condition. Bug 2489

[exim.git] / src / exim_monitor / em_version.c

diff --git a/src/exim_monitor/em_version.c b/src/exim_monitor/em_version.c
index 8228f946791b4eb17b953471915350594c2e7c7b..52c55a4a3593b4b2438f768d2e6d9957c4f19013 100644 (file)
--- a/src/exim_monitor/em_version.c
+++ b/src/exim_monitor/em_version.c
@@ -2,10 +2,11 @@
 *                  Exim Monitor                  *
 *************************************************/
 
 *                  Exim Monitor                  *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2017 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "mytypes.h"
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "mytypes.h"

+#include "store.h"

 #include "macros.h"
 #include <string.h>
 #include <stdlib.h>
 #include "macros.h"
 #include <string.h>
 #include <stdlib.h>


@@ -33,7 +34,7 @@ version_date[0] = 0;
 Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, 31);
 
 #else
 Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, 31);
 
 #else

-Ustrcpy(today, __DATE__);
+Ustrcpy(today, US __DATE__);

 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 
 if (today[4] == ' ') i = 1;
 today[3] = today[6] = '-';
 


@@ -42,8 +43,8 @@ version_date[0] = 0;
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);
 Ustrncat(version_date, today+4+i, 3-i);
 Ustrncat(version_date, today, 4);
 Ustrncat(version_date, today+7, 4);

-Ustrcat(version_date, " ");
-Ustrcat(version_date, __TIME__);
+Ustrcat(version_date, US" ");
+Ustrcat(version_date, US __TIME__);

 #endif
 }
 
 #endif
 }