diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2006-10-08 17:29:02 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2006-10-08 17:29:02 +0000 |
| commit | 2cb9f94f22fbec1969c91f9d5d394d19f1936b84 (patch) | |
| tree | 0f49565c2bd92f73c4daaec4f90995a2c48f6267 /mail/vpopmail | |
| parent | 9094908182c9e6c23f0346b1dada2ac0f41e9a3b (diff) | |
Make the PostgreSQL backend actually compile with the new
WITH_SQL_LOG_REMOVE_DELETED knob - fix the name of a variable and
a standard PostgreSQL routine.
Pointy hat to: roam (myself), in addition to the upstream developers
Notes
Notes:
svn path=/head/; revision=174978
Diffstat (limited to 'mail/vpopmail')
| -rw-r--r-- | mail/vpopmail/files/patch-vpgsql.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mail/vpopmail/files/patch-vpgsql.c b/mail/vpopmail/files/patch-vpgsql.c index 2069f1e4c8de..a1325d9a6bf5 100644 --- a/mail/vpopmail/files/patch-vpgsql.c +++ b/mail/vpopmail/files/patch-vpgsql.c @@ -1,6 +1,6 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c --- ../../vendor/vpopmail/vpgsql.c Wed Oct 4 13:19:16 2006 -+++ ./vpgsql.c Wed Oct 4 21:26:53 2006 ++++ ./vpgsql.c Sun Oct 8 17:20:54 2006 @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @@ -9,15 +9,17 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c #include <pwd.h> #include <unistd.h> #include <stdio.h> -@@ -389,6 +390,7 @@ +@@ -389,13 +390,15 @@ #endif #ifdef ENABLE_SQL_LOGGING +- qnprintf( sqlBufUpdate, SQL_BUF_SIZE, +#ifdef ENABLE_SQL_REMOVE_DELETED - qnprintf( sqlBufUpdate, SQL_BUF_SIZE, ++ qnprintf( SqlBufUpdate, SQL_BUF_SIZE, "delete from vlog where domain = '%s'", domain ); pgres=PQexec(pgc, SqlBufUpdate); -@@ -396,6 +398,7 @@ +- if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) { ++ if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) { return(-1); } #endif @@ -25,16 +27,18 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c return(0); } -@@ -442,6 +445,7 @@ +@@ -442,13 +445,15 @@ #endif #ifdef ENABLE_SQL_LOGGING +- qnprintf( sqlBufUpdate, SQL_BUF_SIZE, +#ifdef ENABLE_SQL_REMOVE_DELETED - qnprintf( sqlBufUpdate, SQL_BUF_SIZE, ++ qnprintf( SqlBufUpdate, SQL_BUF_SIZE, "delete from vlog where domain = '%s' and user='%s'", domain, user ); -@@ -449,6 +453,7 @@ - if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) { + pgres=PQexec(pgc, SqlBufUpdate); +- if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) { ++ if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) { err = -1; } +#endif |