ph10 2006/07/14 15:21:28 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/lookups pgsql.c
exim-test/stderr 9200
Log:
Add PQsetClientEncoding(conn, "SQL_ASCII") to the pgsql module.
Revision Changes Path
1.376 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.6 +6 -0 exim/exim-src/src/lookups/pgsql.c
1.4 +6 -0 exim/exim-test/stderr/9200
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- ChangeLog 14 Jul 2006 14:00:16 -0000 1.375
+++ ChangeLog 14 Jul 2006 14:21:27 -0000 1.376
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.375 2006/07/14 14:00:16 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.376 2006/07/14 14:21:27 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -106,6 +106,10 @@
PH/18 Refactored debugging code in route_finduser() to show more information,
in particular, the error code if getpwnam() issues one.
+
+PH/19 Added PQsetClientEncoding(conn, "SQL_ASCII") to the pgsql code module.
+ This is apparently needed in addition to the PH/07 change above to avoid
+ any possible encoding problems.
Exim version 4.62
Index: pgsql.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/lookups/pgsql.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgsql.c 30 Jun 2006 13:57:46 -0000 1.5
+++ pgsql.c 14 Jul 2006 14:21:27 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/lookups/pgsql.c,v 1.5 2006/06/30 13:57:46 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/lookups/pgsql.c,v 1.6 2006/07/14 14:21:27 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -246,6 +246,12 @@
*defer_break = FALSE;
goto PGSQL_EXIT;
}
+
+ /* Set the client encoding to SQL_ASCII, which means that the server will
+ not try to interpret the query as being in any fancy encoding such as UTF-8
+ or other multibyte code that might cause problems with escaping. */
+
+ PQsetClientEncoding(pg_conn, "SQL_ASCII");
/* Add the connection to the cache */
Index: 9200
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9200,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 9200 30 Jun 2006 13:57:46 -0000 1.3
+++ 9200 14 Jul 2006 14:21:28 -0000 1.4
@@ -122,6 +122,8 @@
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
sender_fullhost = [10.0.0.0]
@@ -209,6 +211,8 @@
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
@@ -248,6 +252,8 @@
trusted user
admin user
skipping ACL configuration - not needed
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
reading spool file 10HmaX-0005vi-00-H
