* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2017 */
/* See the file NOTICE for conditions of use and distribution. */
* Show supported features *
*************************************************/
-/* This function is called for -bV/--version and for -d to output the optional
-features of the current Exim binary.
-
-Arguments: a FILE for printing
-Returns: nothing
-*/
-
static void
-show_whats_supported(FILE *f)
+show_db_version(FILE * f)
{
- auth_info *authi;
-
#ifdef DB_VERSION_STRING
-fprintf(f, "Berkeley DB: %s\n", DB_VERSION_STRING);
+DEBUG(D_any)
+ {
+ fprintf(f, "Library version: BDB: Compile: %s\n", DB_VERSION_STRING);
+ fprintf(f, " Runtime: %s\n",
+ db_version(NULL, NULL, NULL));
+ }
+else
+ fprintf(f, "Berkeley DB: %s\n", DB_VERSION_STRING);
+
#elif defined(BTREEVERSION) && defined(HASHVERSION)
#ifdef USE_DB
fprintf(f, "Probably Berkeley DB version 1.8x (native mode)\n");
#else
fprintf(f, "Probably Berkeley DB version 1.8x (compatibility mode)\n");
#endif
+
#elif defined(_DBM_RDONLY) || defined(dbm_dirfno)
fprintf(f, "Probably ndbm\n");
#elif defined(USE_TDB)
fprintf(f, "Probably GDBM (compatibility mode)\n");
#endif
#endif
+}
+
+
+/* This function is called for -bV/--version and for -d to output the optional
+features of the current Exim binary.
+
+Arguments: a FILE for printing
+Returns: nothing
+*/
+
+static void
+show_whats_supported(FILE * f)
+{
+auth_info * authi;
+
+DEBUG(D_any) {} else show_db_version(f);
fprintf(f, "Support for:");
#ifdef SUPPORT_CRYPTEQ
fprintf(f, " TCPwrappers");
#endif
#ifdef SUPPORT_TLS
- #ifdef USE_GNUTLS
+# ifdef USE_GNUTLS
fprintf(f, " GnuTLS");
- #else
+# else
fprintf(f, " OpenSSL");
- #endif
+# endif
#endif
#ifdef SUPPORT_TRANSLATE_IP_ADDRESS
fprintf(f, " translate_ip_address");
#ifdef SUPPORT_SOCKS
fprintf(f, " SOCKS");
#endif
+#ifdef SUPPORT_SPF
+ fprintf(f, " SPF");
+#endif
#ifdef TCP_FASTOPEN
deliver_init();
if (tcp_fastopen_ok) fprintf(f, " TCP_Fast_Open");
#ifdef EXPERIMENTAL_QUEUEFILE
fprintf(f, " Experimental_QUEUEFILE");
#endif
-#ifdef EXPERIMENTAL_SPF
- fprintf(f, " Experimental_SPF");
-#endif
#ifdef EXPERIMENTAL_SRS
fprintf(f, " Experimental_SRS");
#endif
#endif
fprintf(f, "\n");
-fprintf(f, "Authenticators:");
-#ifdef AUTH_CRAM_MD5
- fprintf(f, " cram_md5");
-#endif
-#ifdef AUTH_CYRUS_SASL
- fprintf(f, " cyrus_sasl");
-#endif
-#ifdef AUTH_DOVECOT
- fprintf(f, " dovecot");
-#endif
-#ifdef AUTH_GSASL
- fprintf(f, " gsasl");
-#endif
-#ifdef AUTH_HEIMDAL_GSSAPI
- fprintf(f, " heimdal_gssapi");
-#endif
-#ifdef AUTH_PLAINTEXT
- fprintf(f, " plaintext");
-#endif
-#ifdef AUTH_SPA
- fprintf(f, " spa");
-#endif
-#ifdef AUTH_TLS
- fprintf(f, " tls");
-#endif
-fprintf(f, "\n");
-
-fprintf(f, "Routers:");
-#ifdef ROUTER_ACCEPT
- fprintf(f, " accept");
-#endif
-#ifdef ROUTER_DNSLOOKUP
- fprintf(f, " dnslookup");
-#endif
-#ifdef ROUTER_IPLITERAL
- fprintf(f, " ipliteral");
-#endif
-#ifdef ROUTER_IPLOOKUP
- fprintf(f, " iplookup");
-#endif
-#ifdef ROUTER_MANUALROUTE
- fprintf(f, " manualroute");
-#endif
-#ifdef ROUTER_QUERYPROGRAM
- fprintf(f, " queryprogram");
-#endif
-#ifdef ROUTER_REDIRECT
- fprintf(f, " redirect");
-#endif
-fprintf(f, "\n");
+auth_show_supported(f);
+route_show_supported(f);
+transport_show_supported(f);
-fprintf(f, "Transports:");
-#ifdef TRANSPORT_APPENDFILE
- fprintf(f, " appendfile");
- #ifdef SUPPORT_MAILDIR
- fprintf(f, "/maildir");
- #endif
- #ifdef SUPPORT_MAILSTORE
- fprintf(f, "/mailstore");
- #endif
- #ifdef SUPPORT_MBX
- fprintf(f, "/mbx");
- #endif
-#endif
-#ifdef TRANSPORT_AUTOREPLY
- fprintf(f, " autoreply");
-#endif
-#ifdef TRANSPORT_LMTP
- fprintf(f, " lmtp");
-#endif
-#ifdef TRANSPORT_PIPE
- fprintf(f, " pipe");
-#endif
-#ifdef EXPERIMENTAL_QUEUEFILE
- fprintf(f, " queuefile");
-#endif
-#ifdef TRANSPORT_SMTP
- fprintf(f, " smtp");
+#ifdef WITH_CONTENT_SCAN
+malware_show_supported(f);
#endif
-fprintf(f, "\n");
if (fixed_never_users[0] > 0)
{
gnu_get_libc_version());
#endif
+show_db_version(f);
+
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
"If the string is not recognised, you'll get this help (on stderr).\n"
"\n"
" exim -bI:help this information\n"
-" exim -bI:dscp dscp value keywords known\n"
-" exim -bI:sieve list of supported sieve extensions, one per line.\n"
+" exim -bI:dscp list of known dscp value keywords\n"
+" exim -bI:sieve list of supported sieve extensions\n"
);
return;
case CMDINFO_SIEVE:
* Validate that the macros given are okay *
*************************************************/
+#ifdef WHITELIST_D_MACROS
+static void
+wlist_check(uschar * name, uschar * val, void * ctx)
+{
+uschar ** w, ** whites = ctx;
+unsigned len;
+int n;
+
+for (w = whites; *w; ++w)
+ if (Ustrcmp(*w, name) == 0) break;
+if (*w)
+ {
+ if (!val || !*val) return;
+ len = Ustrlen(val);
+ if ((n = pcre_exec(regex_whitelisted_macro, NULL, CS val, len,
+ 0, PCRE_EOPT, NULL, 0)) >= 0)
+ return;
+ if (n != PCRE_ERROR_NOMATCH)
+ debug_printf("macros_trusted checking %s returned %d\n", name, n);
+ }
+*whites = NULL;
+return;
+}
+#endif
+
+
/* Typically, Exim will drop privileges if macros are supplied. In some
cases, we want to not do so.
{
#ifdef WHITELIST_D_MACROS
macro_item *m;
-uschar *whitelisted, *end, *p, **whites, **w;
+uschar *whitelisted, *end, *p, **whites;
int white_count, i, n;
size_t len;
BOOL prev_char_item, found;
}
whites[i] = NULL;
-/* The list of commandline macros should be very short.
-Accept the N*M complexity. */
-for (m = macros; m; m = m->next) if (m->command_line)
+tree_walk(tree_macros, wlist_check, whites);
+if (!*whites) return FALSE;
+
+DEBUG(D_any) debug_printf("macros_trusted overridden to true by whitelisting\n");
+return TRUE;
+#endif
+}
+
+
+/*************************************************
+* Expansion testing *
+*************************************************/
+
+/* Expand and print one item, doing macro-processing.
+
+Arguments:
+ item line for expansion
+*/
+
+static void
+expansion_test_line(uschar * line)
+{
+int len;
+BOOL dummy_macexp;
+
+Ustrncpy(big_buffer, line, big_buffer_size);
+big_buffer[big_buffer_size-1] = '\0';
+len = Ustrlen(big_buffer);
+
+(void) macros_expand(0, &len, &dummy_macexp);
+
+if (isupper(big_buffer[0]))
{
- found = FALSE;
- for (w = whites; *w; ++w)
- if (Ustrcmp(*w, m->name) == 0)
- {
- found = TRUE;
- break;
- }
- if (!found)
- return FALSE;
- if (!m->replacement)
- continue;
- if ((len = m->replen) == 0)
- continue;
- n = pcre_exec(regex_whitelisted_macro, NULL, CS m->replacement, len,
- 0, PCRE_EOPT, NULL, 0);
- if (n < 0)
+ if (macro_read_assignment(big_buffer))
{
- if (n != PCRE_ERROR_NOMATCH)
- debug_printf("macros_trusted checking %s returned %d\n", m->name, n);
- return FALSE;
+ uschar * s = Ustrchr(big_buffer, '=');
+ printf("Defined macro '%.*s'\n", s - big_buffer, big_buffer);
}
}
-DEBUG(D_any) debug_printf("macros_trusted overridden to true by whitelisting\n");
-return TRUE;
-#endif
+else
+ if ((line = expand_string(big_buffer))) printf("%s\n", CS line);
+ else printf("Failed: %s\n", expand_string_message);
}
while (isspace(*s)) s++;
}
- for (m = macros; m; m = m->next)
- if (Ustrcmp(m->name, name) == 0)
- {
- fprintf(stderr, "exim: duplicated -D in command line\n");
- exit(EXIT_FAILURE);
- }
+ if (macro_search(name))
+ {
+ fprintf(stderr, "exim: duplicated -D in command line\n");
+ exit(EXIT_FAILURE);
+ }
- m = macro_create(string_copy(name), string_copy(s), TRUE);
+ m = macro_create(name, s, TRUE);
if (clmacro_count >= MAX_CLMACROS)
{
fprintf(stderr, "exim: too many -D options on command line\n");
exit(EXIT_FAILURE);
}
- clmacros[clmacro_count++] = string_sprintf("-D%s=%s", m->name,
- m->replacement);
+ clmacros[clmacro_count++] = string_sprintf("-D%s=%s",
+ m->tnode.name, m->tnode.data.ptr);
}
#endif
break;
directory to "/"! Later we change to $spool_directory. We do it there, because
during readconf_main() some expansion takes place already. */
-/* Store the initial cwd before we change directories */
-if ((initial_cwd = os_getcwd(NULL, 0)) == NULL)
- {
- perror("exim: can't get the current working directory");
- exit(EXIT_FAILURE);
- }
+/* Store the initial cwd before we change directories. Can be NULL if the
+dir has already been unlinked. */
+initial_cwd = os_getcwd(NULL, 0);
/* checking:
-be[m] expansion test -
readconf_main(checking || list_options);
-if (builtin_macros_create_trigger) DEBUG(D_any)
- debug_printf("Builtin macros created (expensive) due to config line '%.*s'\n",
- Ustrlen(builtin_macros_create_trigger)-1, builtin_macros_create_trigger);
/* Now in directory "/" */
}
/* At this point, we know if the user is privileged and some command-line
-options become possibly imperssible, depending upon the configuration file. */
+options become possibly impermissible, depending upon the configuration file. */
if (checking && commandline_checks_require_admin && !admin_user) {
fprintf(stderr, "exim: those command-line flags are set to require admin\n");
/* Read a test message from a file. We fudge it up to be on stdin, saving
stdin itself for later reading of expansion strings. */
- else if (expansion_test_message != NULL)
+ else if (expansion_test_message)
{
int save_stdin = dup(0);
int fd = Uopen(expansion_test_message, O_RDONLY, 0);
clearerr(stdin); /* Required by Darwin */
}
+ /* Only admin users may see config-file macros this way */
+
+ if (!admin_user) tree_macros = NULL;
+
/* Allow $recipients for this testing */
enable_dollar_recipients = TRUE;
/* Expand command line items */
if (recipients_arg < argc)
- {
while (recipients_arg < argc)
- {
- uschar *s = argv[recipients_arg++];
- uschar *ss = expand_string(s);
- if (ss == NULL) printf ("Failed: %s\n", expand_string_message);
- else printf("%s\n", CS ss);
- }
- }
+ expansion_test_line(argv[recipients_arg++]);
/* Read stdin */
{
char *(*fn_readline)(const char *) = NULL;
void (*fn_addhist)(const char *) = NULL;
+ uschar * s;
- #ifdef USE_READLINE
+#ifdef USE_READLINE
void *dlhandle = set_readline(&fn_readline, &fn_addhist);
- #endif
+#endif
- for (;;)
- {
- uschar *ss;
- uschar *source = get_stdinput(fn_readline, fn_addhist);
- if (source == NULL) break;
- ss = expand_string(source);
- if (ss == NULL)
- printf ("Failed: %s\n", expand_string_message);
- else printf("%s\n", CS ss);
- }
+ while (s = get_stdinput(fn_readline, fn_addhist))
+ expansion_test_line(s);
- #ifdef USE_READLINE
- if (dlhandle != NULL) dlclose(dlhandle);
- #endif
+#ifdef USE_READLINE
+ if (dlhandle) dlclose(dlhandle);
+#endif
}
/* The data file will be open after -Mset */
deliver_datafile = -1;
}
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS, US"main: expansion test");
}
git://git.exim.org / exim.git / blobdiff