head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.1.0.30
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.28
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.26
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.24
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.22
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.20
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.18
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.16
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.14
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.12
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.10
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.8
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.6
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.4
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.2
	pkgsrc-2009Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.12.06.10.48.51;	author roy;	state dead;
branches;
next	1.1;

1.1
date	2009.03.13.10.11.15;	author roy;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove stale patches
@
text
@$NetBSD: patch-ae,v 1.1 2009/03/13 10:11:15 roy Exp $

Report the correct driver on error.
Escape the binary string correctly using the thread safe PQescapeByteaConn.
Declare the string as being escaped.
Use strlcpy instead of strcpy.

--- src/pgsql_drv.c	2006-07-29 14:38:48.000000000 +0100
+++ src/pgsql_drv.c	2009-03-12 23:19:50.000000000 +0000
@@@@ -1146,7 +1146,7 @@@@
 
     p = _pgsql_drv_getpwuid (CTX, uid);
     if (!p) {
-      LOG(LOG_CRIT, "_ds_get_signature(): _mysql_drv_getpwuid(%d) failed: aborting", uid);
+      LOG(LOG_CRIT, "_ds_get_signature(): _pgsql_drv_getpwuid(%d) failed: aborting", uid);
       return EFAILURE;
     }
     username = strdup(p->pw_name);
@@@@ -1238,10 +1238,10 @@@@
     return EUNKNOWN;
   }
 
-  mem = PQescapeBytea(SIG->data, SIG->length, &length);
+  mem = PQescapeByteaConn(s->dbh, SIG->data, SIG->length, &length);
 
   snprintf (scratch, sizeof (scratch),
-            "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, '",
+            "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, E'",
             (int)p->pw_uid, signature, SIG->length);
   buffer_cat (query, scratch);
   buffer_cat (query, (const char *) mem);
@@@@ -1405,7 +1405,7 @@@@
         virtual_username,
         virtual_table);
 #else
-    strcpy (query, "DECLARE dscursor CURSOR FOR SELECT DISTINCT uid FROM dspam_stats");
+    strlcpy (query, "DECLARE dscursor CURSOR FOR SELECT DISTINCT uid FROM dspam_stats", sizeof(query));
 #endif
 
     result = PQexec(s->dbh, query);
@


1.1
log
@Fix postgresql driver to escape strings properly.
Fix a tiny pkglint warning.
Bump revision.
@
text
@d1 1
a1 1
$NetBSD$
@