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
Updated versions to 4.69, moved changebars appropriately, added everything target...
[exim.git]
/
src
/
src
/
macros.h
diff --git
a/src/src/macros.h
b/src/src/macros.h
index 00f9f8eb275701b796983cc0014abd835a055a63..161a6a181399ddf9b2fd81baf5c28b666236201d 100644
(file)
--- a/
src/src/macros.h
+++ b/
src/src/macros.h
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/macros.h,v 1.3
4 2007/06/19 14:41:31
ph10 Exp $ */
+/* $Cambridge: exim/src/src/macros.h,v 1.3
6 2007/08/22 10:10:23
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-15,6
+15,12
@@
a string as a text string. This is sometimes useful for debugging output. */
#define mac_expanded_string(s) mac_string(s)
#define mac_expanded_string(s) mac_string(s)
+/* When running in the test harness, the load average is fudged. */
+
+#define OS_GETLOADAVG() \
+ (running_in_test_harness? (test_harness_load_avg += 10) : os_getloadavg())
+
+
/* The address_item structure has a word full of 1-bit flags. These macros
manipulate them. */
/* The address_item structure has a word full of 1-bit flags. These macros
manipulate them. */
@@
-803,6
+809,7
@@
enum { ACL_WHERE_RCPT, /* Some controls are for RCPT only */
ACL_WHERE_HELO,
ACL_WHERE_MAILAUTH,
ACL_WHERE_NOTSMTP_START,
ACL_WHERE_HELO,
ACL_WHERE_MAILAUTH,
ACL_WHERE_NOTSMTP_START,
+ ACL_WHERE_NOTQUIT,
ACL_WHERE_QUIT,
ACL_WHERE_STARTTLS,
ACL_WHERE_VRFY
ACL_WHERE_QUIT,
ACL_WHERE_STARTTLS,
ACL_WHERE_VRFY