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
Give error if overflow in quota setting in appendfile on a 32-bit
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 8ed39d654c9e8d4797fbffd9b7f48ffdbaa91533..5b0eb0335c0868d4058d526a5f15a7f7f222ca2f 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.
25 2005/08/23 10:29:1
0 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.
32 2006/02/10 16:29:2
0 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. */
@@
-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
@@
-1003,6
+1012,8
@@
if (fixed_never_users[0] > 0)
fprintf(f, "%d:", (unsigned int)fixed_never_users[i]);
fprintf(f, "%d\n", (unsigned int)fixed_never_users[i]);
}
fprintf(f, "%d:", (unsigned int)fixed_never_users[i]);
fprintf(f, "%d\n", (unsigned int)fixed_never_users[i]);
}
+
+fprintf(f, "Size of off_t: %d\n", sizeof(off_t));
}
}
@@
-1990,6
+2001,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;
@@
-3909,7
+3921,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)
{