#! /bin/sh /usr/share/dpatch/dpatch-run ## 0026-upstream-fix-verify_user-paramtypes.dpatch by Duncan Gibb ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Upstream: fix parameter-typing bug which can break IGNOREQUOTA ## DP: and lead to lmtpd segfaulting on 32-bit systems. ## DP: This is almost verbatim ## DP: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/lmtpengine.c.diff?r1=1.130;r2=1.131 @DPATCH@ --- cyrus/imap/lmtpengine.c 2009/03/31 04:11:18 1.130 +++ cyrus/imap/lmtpengine.c 2009/04/23 01:30:32 1.131 @@ -39,7 +39,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: lmtpengine.c,v 1.129 2008/10/08 15:47:08 murch Exp $ + * $Id: lmtpengine.c,v 1.131 2009/04/23 01:30:32 murch Exp $ */ #include @@ -809,7 +809,7 @@ static int savemsg(struct clientdata *cd static int process_recipient(char *addr, struct namespace *namespace, int ignorequota, int (*verify_user)(const char *, const char *, - char *, long, + char *, quota_t, struct auth_state *), message_data_t *msg) { @@ -898,7 +898,7 @@ static int process_recipient(char *addr, ret->user = NULL; r = verify_user(ret->user, ret->domain, ret->mailbox, - ignorequota ? -1 : msg->size, msg->authstate); + (quota_t) (ignorequota ? -1 : msg->size), msg->authstate); if (r) { /* we lost */ free(ret->all);