Remove "memory" from -d+all; it's voluminous and rarely useful.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4721829805f5f9f630829c555481ca25e64c881c..cd6c2f0e397ddce912e43bb2178c6875558531b4 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.170 2005/06/23 10:02:13 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.171 2005/06/27 10:21:38 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -194,6 +194,10 @@ PH/27 If a dnslookup or manualroute router is set with verify=only, it need not
       just assumes that the setting of that option is false. This bug was
       introduced by 4.51/PH/31.
 
+PH/28 Changed -d+all to exclude +memory, because that information is very
+      rarely of interest, but it makes the output a lot bigger. People tend to
+      do -d+all out of habit.
+
 
 Exim version 4.51
 -----------------

diff --git a/src/src/macros.h b/src/src/macros.h
index 55fdd846d5bf19ba6a583d1470f443d3c5b549e8..9290c0f32a0a3af130af107c5e20e4949f450971 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/macros.h,v 1.14 2005/05/31 10:58:18 ph10 Exp $ */
+/* $Cambridge: exim/src/src/macros.h,v 1.15 2005/06/27 10:21:38 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -318,14 +318,14 @@ for having to swallow the rest of an SMTP message is whether the value is
 #define D_uid                        0x20000000
 #define D_verify                     0x40000000
 
-#define D_all                        0xffffffff
+#define D_all                        (0xffffffff & ~D_memory)
 
 #define D_any                        (D_all & \
                                        ~(D_v           | \
                                          D_pid         | \
                                          D_timestamp)  )
 
-#define D_default                    (D_all & \
+#define D_default                    (0xffffffff & \
                                        ~(D_expand      | \
                                          D_filter      | \
                                          D_interface   | \