summaryrefslogtreecommitdiff
path: root/mail/vpopmail/files/patch-vpgsql.c
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2009-03-16 13:51:24 +0000
committerPeter Pentchev <roam@FreeBSD.org>2009-03-16 13:51:24 +0000
commitb060afc4069037288a3209537a6c521940116228 (patch)
treee23f81c66839a1dd998bda2c2e8a6098c1240e91 /mail/vpopmail/files/patch-vpgsql.c
parentMark BROKEN: checksum mismatch. (diff)
Update to vpopmail-5.4.27.
Internally, use quilt for patch management. Add two Makefile knobs for the locations of the Courier IMAP server's imaplogin and imapd binaries, just in case anyone would want to test the new authvchkpw utility :)
Notes
Notes: svn path=/head/; revision=230212
Diffstat (limited to 'mail/vpopmail/files/patch-vpgsql.c')
-rw-r--r--mail/vpopmail/files/patch-vpgsql.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/mail/vpopmail/files/patch-vpgsql.c b/mail/vpopmail/files/patch-vpgsql.c
index 4df66e130519..159d53d477c7 100644
--- a/mail/vpopmail/files/patch-vpgsql.c
+++ b/mail/vpopmail/files/patch-vpgsql.c
@@ -1,6 +1,8 @@
-diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c
---- ../../vendor/vpopmail/vpgsql.c 2007-10-07 23:44:14.000000000 +0300
-+++ vpgsql.c 2007-12-25 03:47:54.000000000 +0200
+Implement valias support.
+Implement SQL_REMOVE_DELETED.
+
+--- a/vpgsql.c
++++ b/vpgsql.c
@@ -390,13 +390,15 @@
#endif
@@ -62,7 +64,7 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c
+
+ if ( (err=vauth_open(0)) != 0 ) return(NULL);
+
-+ qnprintf( SqlBufRead, SQL_BUF_SIZE,
++ qnprintf( SqlBufRead, SQL_BUF_SIZE,
+ "select distinct alias from valias where domain = '%s' order by alias", domain );
+
+ if ( ! (pgres=PQexec(pgc, SqlBufRead))
@@ -84,7 +86,7 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c
+ if (valias_current == NULL) valias_current = temp_entry;
+ }
+ PQclear (pgres);
-+ pgres = NULL;
++ pgres = NULL;
+
+ if (valias_current == NULL) return NULL; /* no results */
+ else return(valias_current->data);
@@ -99,7 +101,7 @@ diff -urN -x .svn ../../vendor/vpopmail/vpgsql.c ./vpgsql.c
+{
+ if (valias_current == NULL) return NULL;
+ valias_current = linklist_del (valias_current);
-+
++
+ if (valias_current == NULL) return NULL; /* no results */
+ else return(valias_current->data);
+}