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
Update copyright year in (most) files (those that my script finds).
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 98b01511d01c8da4c1a3ffb72c7fd2a962fd600d..87239c569aadaee16ca0711aa0c6cedb2e1b32bf 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.
23 2005/08/01 13:20:28
ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.
31 2006/02/07 11:19:00
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
6
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-599,7
+599,7
@@
Returns: the port, or zero if there isn't one
static int
check_port(uschar *address)
{
static int
check_port(uschar *address)
{
-int port = host_extract_port(address);
+int port = host_
address_
extract_port(address);
if (string_is_ip_address(address, NULL) == 0)
{
fprintf(stderr, "exim abandoned: \"%s\" is not an IP address\n", address);
if (string_is_ip_address(address, NULL) == 0)
{
fprintf(stderr, "exim abandoned: \"%s\" is not an IP address\n", address);
@@
-833,6
+833,9
@@
fprintf(f, "Using tdb\n");
#endif
fprintf(f, "Support for:");
#endif
fprintf(f, "Support for:");
+#ifdef SUPPORT_CRYPTEQ
+ fprintf(f, " crypteq");
+#endif
#if HAVE_ICONV
fprintf(f, " iconv()");
#endif
#if HAVE_ICONV
fprintf(f, " iconv()");
#endif
@@
-858,6
+861,12
@@
fprintf(f, "Support for:");
fprintf(f, " OpenSSL");
#endif
#endif
fprintf(f, " OpenSSL");
#endif
#endif
+#ifdef SUPPORT_TRANSLATE_IP_ADDRESS
+ fprintf(f, " translate_ip_address");
+#endif
+#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
+ fprintf(f, " move_frozen_messages");
+#endif
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
@@
-1990,6
+1999,7
@@
for (i = 1; i < argc; i++)
{ badarg = TRUE; break; }
}
originator_name = argrest;
{ badarg = TRUE; break; }
}
originator_name = argrest;
+ sender_name_forced = TRUE;
break;
break;
@@
-3300,11
+3310,12
@@
if (((debug_selector & D_any) != 0 || (log_extra_selector & LX_arguments) != 0)
on this in the code, which always uses fully qualified names, but it's useful
for core dumps etc. Don't complain if it fails - the spool directory might not
be generally accessible and calls with the -C option (and others) have lost
on this in the code, which always uses fully qualified names, but it's useful
for core dumps etc. Don't complain if it fails - the spool directory might not
be generally accessible and calls with the -C option (and others) have lost
-privilege by now. */
+privilege by now. Before the chdir, we try to ensure that the directory exists.
+*/
if (Uchdir(spool_directory) != 0)
{
if (Uchdir(spool_directory) != 0)
{
- (void)directory_make(spool_directory, US"", SPOOL_DIRECTORY_MODE,
TRU
E);
+ (void)directory_make(spool_directory, US"", SPOOL_DIRECTORY_MODE,
FALS
E);
(void)Uchdir(spool_directory);
}
(void)Uchdir(spool_directory);
}
@@
-3908,7
+3919,7
@@
for (i = 0;;)
/* If we cannot get a user login, log the incident and give up, unless the
configuration specifies something to use. When running in the test harness,
/* If we cannot get a user login, log the incident and give up, unless the
configuration specifies something to use. When running in the test harness,
-any setting of unknown_login overrides the actual
login
name. */
+any setting of unknown_login overrides the actual name. */
if (originator_login == NULL || running_in_test_harness)
{
if (originator_login == NULL || running_in_test_harness)
{