[no subject]

BZgsuv|}X3Z~(_at_)g"Rn')V<7mG\?E,ejoiLT)$(pFml1'g+(_at_)Ov#~kk"B&n`('jHOpTl7618jRM'plV%e
 Sl6q
Date: Mon, 21 Jul 2003 11:27:05 +0200
Message-ID: <87znj8w7py(_dot_)fsf(_at_)hebus(_dot_)dyndns(_dot_)org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Sender: Benjamin Drieu <benj(_at_)hebus(_dot_)dyndns(_dot_)org>
Subject: [fetchmail] [PATCH] Debian bug #156592 again + update
X-BeenThere: fetchmail-friends(_at_)lists(_dot_)ccil(_dot_)org
X-Mailman-Version: 2.1b2+
Precedence: list
List-Id: Fetchmail open-source POP and IMAP client daemon
        <fetchmail-friends.lists.ccil.org>
List-Post: <mailto:fetchmail-friends(_at_)lists(_dot_)ccil(_dot_)org>
List-Subscribe: <http://lists.ccil.org/mailman/listinfo/fetchmail-friends>,
        
<mailto:fetchmail-friends-request(_at_)lists(_dot_)ccil(_dot_)org?subject=subscribe>
List-Unsubscribe: <http://lists.ccil.org/mailman/listinfo/fetchmail-friends>,
        
<mailto:fetchmail-friends-request(_at_)lists(_dot_)ccil(_dot_)org?subject=unsubscribe>
List-Archive: <http://lists.ccil.org/pipermail/fetchmail-friends>
List-Help: 
<mailto:fetchmail-friends-request(_at_)lists(_dot_)ccil(_dot_)org?subject=help>
X-List-Received-Date: Mon, 21 Jul 2003 09:29:06 -0000

--=-=-=


Hi friends,

I submitted a patch some time ago [1] to fix a small problem with
fetchmail.  Although this patch has not been integrated in fetchmail,
here is an updated patch which fixes an issue that would make
fetchmail segfaults with my patch.

[1] http://lists.ccil.org/pipermail/fetchmail-friends/2002-September/002585.html

-- 
  .''`.
 ; ;' ;      Debian GNU/Linux     |   Benjamin Drieu
 `. `'    http://www.debian.org/  |  <benj(_at_)debian(_dot_)org>
   `-    

--=-=-=
Content-Type: multipart/signed; boundary="==-=-=";
        micalg=pgp-sha1; protocol="application/pgp-signature"

--==-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=156592.patch
Content-Transfer-Encoding: quoted-printable

Index: sink.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /import/cvsroot/fetchmail/sink.c,v
retrieving revision 1.1.1.32
diff -u -r1.1.1.32 sink.c
=2D-- sink.c    17 Jul 2003 15:19:56 -0000      1.1.1.32
+++ sink.c      21 Jul 2003 09:17:06 -0000
@@ -206,15 +206,35 @@
                ctl->destaddr =3D (ctl->smtphost && ctl->smtphost[0] !=3D '/') 
? ctl->sm=
tphost : "localhost";
     }=20
     else=20
=2D     ctl->destaddr =3D ctl->smtpaddress ? ctl->smtpaddress : ( ctl->smtphost=
 && ctl->smtphost[0] !=3D '/' ? ctl->smtphost : "localhost");
+      {
+       if (ctl->smtpaddress)
+         ctl->destaddr =3D ctl->smtpaddress;
+       else if (ctl->smtphost && ctl->smtphost[0] !=3D '/')
+         {
+           char * cp;
+           if (cp =3D strchr (ctl->smtphost, '/'))
+           {
+             char *smtpname;
+             xalloca(smtpname, char *, cp - ctl->smtphost + 1);
+             strncpy(smtpname, ctl->smtphost, cp - ctl->smtphost);
+             *(smtpname + cp - ctl->smtphost) =3D 0;
+             ctl->destaddr =3D smtpname;
+           }
+           else
+             ctl->destaddr =3D ctl->smtphost;
+         }
+       else
+         ctl->destaddr =3D "localhost";
+      }
=20
     if (outlevel >=3D O_DEBUG && ctl->smtp_socket !=3D -1)
        report(stdout, GT_("forwarding to %s\n"), ctl->smtphost);

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQE/G7HrnDLqtZBL50ERAj09AJ41Wtpc4a+QEVTf3Cq3u1clCsiP2wCg8hpK
bgx35Qv+4SN8EnyK2FERHqA=
=PI0s
-----END PGP SIGNATURE-----
--==-=-=--

--=-=-=--