From eff37e472369435d294c297f2a4aabb8de151554 Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Thu, 15 Dec 2005 11:18:21 +0000
Subject: [PATCH] Debug output from dbfn_open() uses names instead of numbers
 for O_xxx flag values because the are different on different OS.

---
 doc/doc-txt/ChangeLog |  5 ++++-
 src/src/dbfn.c        | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 37693d078..27c74dabb 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.275 2005/12/14 10:00:05 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.276 2005/12/15 11:18:21 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -40,6 +40,9 @@ PH/07 Two small changes when running in the test harness: increase delay when
       process has to generate a bounce, and remove special handling of
       127.0.0.2 (sic), which is no longer necessary.
 
+PH/08 Changed debug output of dbfn_open() flags from numbers to names, so as to
+      be the same on different OS.
+
 
 Exim version 4.60
 -----------------
diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index d46ad247a..8efdc2ed9 100644
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dbfn.c,v 1.6 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/src/src/dbfn.c,v 1.7 2005/12/15 11:18:21 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -80,6 +80,10 @@ Returns:   NULL if the open failed, or the locking failed. After locking
 
            On success, dbblock is returned. This contains the dbm pointer and
            the fd of the locked lock file.
+
+There are some calls that use O_RDWR|O_CREAT for the flags. Having discovered
+this in December 2005, I'm not sure if this is correct or not, but for the
+moment I haven't changed them.
 */
 
 open_db *
@@ -235,7 +239,9 @@ if (dbblock->dbptr == NULL)
   }
 
 DEBUG(D_hints_lookup)
-  debug_printf("opened hints database %s: flags=%x\n", buffer, flags);
+  debug_printf("opened hints database %s: flags=%s\n", buffer,
+    (flags == O_RDONLY)? "O_RDONLY" : (flags == O_RDWR)? "O_RDWR" :
+    (flags == (O_RDWR|O_CREAT))? "O_RDWR|O_CREAT" : "??");
 
 /* Pass back the block containing the opened database handle and the open fd
 for the lock. */
-- 
2.25.1