Author: David Woodhouse, Derrick 'dman' Hudson, Marc MERLIN
Origin: other, http://marc.merlins.org/linux/exim/files/sa-exim-current/
Forwarded: no
-Last-Update: 2013-09-28
+Last-Update: 2014-12-01
--- a/src/EDITME
+++ b/src/EDITME
-@@ -783,6 +783,21 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -785,6 +785,21 @@ HEADERS_CHARSET="ISO-8859-1"
#------------------------------------------------------------------------------
# the documentation in "info" format, first fetch the Texinfo documentation
--- a/src/config.h.defaults
+++ b/src/config.h.defaults
-@@ -27,6 +27,8 @@ it's a default value. */
+@@ -28,6 +28,8 @@ it's a default value. */
#define AUTH_VARS 3
#define CONFIGURE_FILE
--- a/src/globals.c
+++ b/src/globals.c
-@@ -134,6 +134,10 @@ BOOL smtp_use_dsn = FALSE;
+@@ -140,6 +140,10 @@ int dsn_ret = 0;
+ const pcre *regex_DSN = NULL;
uschar *dsn_advertise_hosts = NULL;
- #endif
+#ifdef DLOPEN_LOCAL_SCAN
+uschar *local_scan_path = NULL;
BOOL gnutls_allow_auto_pkcs11 = FALSE;
--- a/src/globals.h
+++ b/src/globals.h
-@@ -134,6 +134,9 @@ extern BOOL smtp_use_dsn; /
+@@ -133,6 +133,9 @@ extern int dsn_ret; /
+ extern const pcre *regex_DSN; /* For recognizing DSN settings */
extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */
- #endif
+#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path; /* Path to local_scan() library */
#include "config.h"
#include "mytypes.h"
#include "store.h"
-@@ -194,4 +195,6 @@ extern uschar *string_copy(const uschar
- extern uschar *string_copyn(uschar *, int);
+@@ -192,4 +193,6 @@ extern uschar *string_copy(const uschar
+ extern uschar *string_copyn(const uschar *, int);
extern uschar *string_sprintf(const char *, ...) ALMOST_PRINTF(1,2);
+#pragma GCC visibility pop
/* End of local_scan.h */
--- a/src/readconf.c
+++ b/src/readconf.c
-@@ -289,6 +289,9 @@ static optionlist optionlist_config[] =
+@@ -313,6 +313,9 @@ static optionlist optionlist_config[] =
{ "local_from_prefix", opt_stringptr, &local_from_prefix },
{ "local_from_suffix", opt_stringptr, &local_from_suffix },
{ "local_interfaces", opt_stringptr, &local_interfaces },