ph10 2005/12/15 11:18:21 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dbfn.c
Log:
Debug output from dbfn_open() uses names instead of numbers for O_xxx
flag values because the are different on different OS.
Revision Changes Path
1.276 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.7 +7 -1 exim/exim-src/src/dbfn.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- ChangeLog 14 Dec 2005 10:00:05 -0000 1.275
+++ ChangeLog 15 Dec 2005 11:18:21 -0000 1.276
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.275 2005/12/14 10:00:05 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -39,6 +39,9 @@
passing a TCP/IP connection to a new process, in case the original
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
Index: dbfn.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dbfn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dbfn.c 27 Jun 2005 14:29:43 -0000 1.6
+++ dbfn.c 15 Dec 2005 11:18:21 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.6 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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 @@
}
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. */
