uschar *pgsql_servers = NULL;
#endif
+#ifdef EXPERIMENTAL_REDIS
+uschar *redis_servers = NULL;
+#endif
+
#ifdef LOOKUP_SQLITE
int sqlite_lock_timeout = 5;
#endif
#ifdef SUPPORT_TLS
BOOL gnutls_compat_mode = FALSE;
-BOOL gnutls_enable_pkcs11 = FALSE;
+BOOL gnutls_allow_auto_pkcs11 = FALSE;
uschar *gnutls_require_mac = NULL;
uschar *gnutls_require_kx = NULL;
uschar *gnutls_require_proto = NULL;
{ US"lost_incoming_connection", L_lost_incoming_connection },
{ US"outgoing_port", LX_outgoing_port },
{ US"pid", LX_pid },
+#ifdef EXPERIMENTAL_PROXY
+ { US"proxy", LX_proxy },
+#endif
{ US"queue_run", L_queue_run },
{ US"queue_time", LX_queue_time },
{ US"queue_time_overall", LX_queue_time_overall },
int process_info_len = 0;
uschar *process_log_path = NULL;
BOOL prod_requires_admin = TRUE;
+
+#ifdef EXPERIMENTAL_PROXY
+uschar *proxy_host = US"";
+int proxy_port = 0;
+uschar *proxy_required_hosts = US"";
+BOOL proxy_session = FALSE;
+BOOL proxy_session_failed = FALSE;
+#endif
+
uschar *prvscheck_address = NULL;
uschar *prvscheck_keynum = NULL;
uschar *prvscheck_result = NULL;
BOOL write_rejectlog = TRUE;
uschar *version_copyright =
- US"Copyright (c) University of Cambridge, 1995 - 2012\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2012";
+ US"Copyright (c) University of Cambridge, 1995 - 2013\n"
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2013";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";