• Bug#265751: cyrus-sasl2: Candidate NMU patch for 2.1.19-1.1 - SARGE (7/

    From Henrique de Moraes Holschuh@1:229/2 to All on Sat Aug 14 21:20:06 2004
    [continued from previous message]

    ++ /* Save realms for later use */
    ++ text->realms = realms;
    ++ text->realm_cnt = nrealm;
    + }
    ++ } else {
    ++ /* Restore the list of realms */
    ++ realms = text->realms;
    ++ nrealm = text->realm_cnt;
    + }
    +
    + result = ask_user_info(ctext, params, realms, nrealm,
    +@@ -3761,16 +3804,6 @@
    + result = SASL_CONTINUE;
    +
    + FreeAllocatedMem:
    +- if (realms) {
    +- int lup;
    +-
    +- /* need to free all the realms */
    +- for (lup = 0;lup < nrealm; lup++)
    +- params->utils->free(realms[lup]);
    +-
    +- params->utils->free(realms);
    +- }
    +-
    + return result;
    + }
    +
    diff -urN cyrus-sasl2-2.1.19/debian/patches/20_2373_sasl_upstream_cvs.diff nmu-work/debian/patches/20_2373_sasl_upstream_cvs.diff
    --- cyrus-sasl2-2.1.19/debian/patches/20_2373_sasl_upstream_cvs.diff 1969-12-31 21:00:00.000000000 -0300
    +++ nmu-work/debian/patches/20_2373_sasl_upstream_cvs.diff 2004-08-14 11:30:15.000000000 -0300
    @@ -0,0 +1,47 @@
    +---------------------
    +PatchSet 2373
    +Date: 2004/08/06 19:29:44
    +Author: shadow
    +Branch: HEAD
    +Tag: (none)
    +Log:
    +initialize authid to null so stack garbage is not pushed into _sasl_canon_user +
    +Members:
    + plugins/cram.c:1.83->1.84
    +
    +Index: cyrus-sasl-2.1.19/plugins/cram.c +===================================================================
    +RCS file: /cvs/src/sasl/plugins/cram.c,v
    +retrieving revision 1.83
    +retrieving revision 1.84
    +diff -u -r1.83 -r1.84
    +--- cyrus-sasl-2.1.19/plugins/cram.c 15 Dec 2003 20:04:22 -0000 1.83 ++++ cyrus-sasl-2.1.19/plugins/cram.c 6 Aug 2004 20:29:44 -0000 1.84 +@@ -1,7 +1,7 @@
    + /* CRAM-MD5 SASL plugin
    + * Rob Siemborski
    + * Tim Martin
    +- * $Id: cram.c,v 1.83 2003/12/15 20:04:22 rjs3 Exp $
    ++ * $Id: cram.c,v 1.84 2004/08/06 20:29:44