git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: move to mainline
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 327a8ecfe096af4c6ab3e37c0a2265049975b48f..f95c107478041761fa5dc3fe4a8b9700dc6fb8f3 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-832,6
+832,9
@@
fprintf(f, "Support for:");
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
+#ifdef SUPPORT_DANE
+ fprintf(f, " DANE");
+#endif
#ifndef DISABLE_DKIM
fprintf(f, " DKIM");
#endif
#ifndef DISABLE_DKIM
fprintf(f, " DKIM");
#endif
@@
-875,9
+878,6
@@
fprintf(f, "Support for:");
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
-#ifdef EXPERIMENTAL_DANE
- fprintf(f, " Experimental_DANE");
-#endif
#ifdef EXPERIMENTAL_DCC
fprintf(f, " Experimental_DCC");
#endif
#ifdef EXPERIMENTAL_DCC
fprintf(f, " Experimental_DCC");
#endif
@@
-1372,7
+1372,7
@@
whites[i] = NULL;
/* The list of commandline macros should be very short.
Accept the N*M complexity. */
/* 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)
+for (m = macros
_user
; m; m = m->next) if (m->command_line)
{
found = FALSE;
for (w = whites; *w; ++w)
{
found = FALSE;
for (w = whites; *w; ++w)
@@
-2422,14
+2422,14
@@
for (i = 1; i < argc; i++)
while (isspace(*s)) s++;
}
while (isspace(*s)) s++;
}
- for (m = macros; m; m = m->next)
+ for (m = macros
_user
; m; m = m->next)
if (Ustrcmp(m->name, name) == 0)
{
fprintf(stderr, "exim: duplicated -D in command line\n");
exit(EXIT_FAILURE);
}
if (Ustrcmp(m->name, name) == 0)
{
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)
{
if (clmacro_count >= MAX_CLMACROS)
{
@@
-4988,7
+4988,7
@@
if (expansion_test)
/* Only admin users may see config-file macros this way */
/* Only admin users may see config-file macros this way */
- if (!admin_user) macros = mlast = NULL;
+ if (!admin_user) macros
_user = macros
= mlast = NULL;
/* Allow $recipients for this testing */
/* Allow $recipients for this testing */