Date: Tue, 23 Sep 2003 18:57:26 +0200 From: =?iso-8859-1?Q?R=FCdiger?= Kuhlmann <micq-list-CKH1bDCG6x4V@ruediger-kuhlmann.de> To: micq-list@micq.org, feedback@pld.org.pl, lenny@mandrakesoft.com, twoerner@redhat.com, kad@asplinux.ru, ports@FreeBSD.org, shell@netbsd.org, micq@davidkrause.com Subject: Re: [mICQ] ANNOUNCEMENT: mICQ 0.4.10.4 released, fixes remote DoS Message-ID: <20030923165726.GC1795@o112.hadiko.de> In-Reply-To: <20030923164800.GB1795@o112.hadiko.de> References: <20030923164800.GB1795@o112.hadiko.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--gr/z0/N6AeWAPJVB
Content-Type: multipart/mixed; boundary="IrhDeMKUP4DT/M7F"
Content-Disposition: inline
--IrhDeMKUP4DT/M7F
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
>--[R=FCdiger Kuhlmann]--<micq-list-CKH1bDCG6x4V@ruediger-kuhlmann.de>
> For those buglets, a patch is appended.
> md5sum e01abb07198544e053e5c48a066e8468 source/fix-0.4.10.4.patch
> sha1sum b0bc33b3ab864829a3faaea656a98d3b3d95c910 source/fix-0.4.10.4.pat=
ch
Yeah and here's the attachment.
--=20
100 DM =3D 51 =A4 13 =A2.
100 =A4 =3D 195 DM 58 pf.
mailto:ruediger@ruediger-kuhlmann.de
http://www.ruediger-kuhlmann.de/
--IrhDeMKUP4DT/M7F
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename="fix-0.4.10.4.patch"
Content-Transfer-Encoding: quoted-printable
Index: ChangeLog
=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: /var/lib/cvs/micq/ChangeLog,v
retrieving revision 1.121.2.18
diff -u -r1.121.2.18 ChangeLog
--- ChangeLog 22 Sep 2003 17:43:35 -0000 1.121.2.18
+++ ChangeLog 23 Sep 2003 14:56:46 -0000
@@ -1,5 +1,10 @@
-*- coding: utf-8 -*-
=20
+2003-09-23 R=FCdiger Kuhlmann <info@ruediger-kuhlmann.de>(stable-0-4-10)
+ * fix Tcl (broken call backs)
+ * fix SSL (man page, no more connection failed on unanswered SSL request)
+ * fix alias expansion when no argument is given
+
2003-09-22 R=FCdiger Kuhlmann <info@ruediger-kuhlmann.de>(stable-0-4-10)
* apply Roman's patch to fix SSL
* rewrite SSL hand-shake to be non-blocking
Index: doc/micq.7
=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: /var/lib/cvs/micq/doc/micq.7,v
retrieving revision 1.36.2.9
retrieving revision 1.36.2.10
diff -u -r1.36.2.9 -r1.36.2.10
--- doc/micq.7 22 Sep 2003 03:00:16 -0000 1.36.2.9
+++ doc/micq.7 23 Sep 2003 12:14:21 -0000 1.36.2.10
@@ -1,5 +1,5 @@
-.\" $Id: micq.7,v 1.36.2.9 2003/09/22 03:00:16 kuhlmann Exp $ -*- nrof=
f -*-
-.\" EN: $Id: micq.7,v 1.36.2.9 2003/09/22 03:00:16 kuhlmann Exp $
+.\" $Id: micq.7,v 1.36.2.10 2003/09/23 12:14:21 kuhlmann Exp $ -*- nro=
ff -*-
+.\" EN: $Id: micq.7,v 1.36.2.10 2003/09/23 12:14:21 kuhlmann Exp $
.TH MICQ 7 mICQ
.SH NAME
mICQ - interactive commands
@@ -912,13 +912,13 @@
.TP
.BI handshake
SSL handshake failure.
-.RE
-.RE
.TP
-.BI ssl \ <uin>\ \fR{\fPcandidate\fR,\fPno_candidate\fR}\fP
+.RB { candidate , no_candidate }
Indicates whether
.I uin
-is a SSL capable candidate.
+is an SSL capable candidate.
+.RE
+.RE
.TP
.BI unevent
Uninstall event hook. Returns command of former hook.
Index: doc/de/micq.7
=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: /var/lib/cvs/micq/doc/de/micq.7,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- doc/de/micq.7 22 Sep 2003 03:00:27 -0000 1.13.2.2
+++ doc/de/micq.7 23 Sep 2003 12:17:33 -0000 1.13.2.3
@@ -1,5 +1,5 @@
-.\" $Id: micq.7,v 1.13.2.2 2003/09/22 03:00:27 kuhlmann Exp $ -*- nroff -*-
-.\" EN: micq.7,v 1.36.2.9
+.\" $Id: micq.7,v 1.13.2.3 2003/09/23 12:17:33 kuhlmann Exp $ -*- nroff -*-
+.\" EN: micq.7,v 1.36.2.10
.TH MICQ 7 mICQ DE
.SH NAME
.B mICQ
@@ -965,13 +965,13 @@
.TP
.BI handshake
Der SSL-Verbindungsaufbau ist fehlgeschlagen.
-.RE
-.RE
.TP
-.BI ssl \ <uin>\ \fR{\fPcandidate\fR,\fPno_candidate\fR}\fP
+.RB { candidate , no_candidate }
Gibt zu\(:uck, ob
.I uin
m\(:oglicherweise SSL unterst\(:utzt.
+.RE
+.RE
.TP
.BI unevent
Entfernt den Ereignis-R\(:uckruf. Falls es einen gegeben hat, gibt es
Index: src/cmd_user.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: /var/lib/cvs/micq/src/cmd_user.c,v
retrieving revision 1.216.2.30
retrieving revision 1.216.2.31
diff -u -r1.216.2.30 -r1.216.2.31
--- src/cmd_user.c 21 Sep 2003 23:20:16 -0000 1.216.2.30
+++ src/cmd_user.c 23 Sep 2003 14:24:42 -0000 1.216.2.31
@@ -5,7 +5,7 @@
*
* alias stuff GPL >=3D v2
*
- * $Id: cmd_user.c,v 1.216.2.30 2003/09/21 23:20:16 kuhlmann Exp $
+ * $Id: cmd_user.c,v 1.216.2.31 2003/09/23 14:24:42 kuhlmann Exp $
*/
=20
#include "micq.h"
@@ -4112,7 +4112,7 @@
=20
if (*cmd !=3D '\xb6')
{
- if (*argsd && CmdUserProcessAlias (cmd, argsd + 1, &id=
le_save, idle_flag))
+ if (CmdUserProcessAlias (cmd, *argsd ? argsd + 1 : "",=
&idle_save, idle_flag))
is_alias =3D TRUE;
else
j =3D CmdUserLookup (cmd, CU_USER);
Index: src/tcp.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: /var/lib/cvs/micq/src/tcp.c,v
retrieving revision 1.153.2.13
retrieving revision 1.153.2.14
diff -u -r1.153.2.13 -r1.153.2.14
--- src/tcp.c 21 Sep 2003 23:20:18 -0000 1.153.2.13
+++ src/tcp.c 23 Sep 2003 13:22:01 -0000 1.153.2.14
@@ -5,7 +5,7 @@
* Lots of changes from R=FCdiger Kuhlmann. File transfer by R=FCdiger Ku=
hlmann.
* This file may be distributed under version 2 of the GPL licence.
*
- * $Id: tcp.c,v 1.153.2.13 2003/09/21 23:20:18 kuhlmann Exp $
+ * $Id: tcp.c,v 1.153.2.14 2003/09/23 13:22:01 kuhlmann Exp $
*/
=20
#include "micq.h"
@@ -1528,7 +1528,8 @@
Connection *peer =3D event->conn;
Packet *pak =3D event->pak;
UWORD delta, e_trans;
- char isfile =3D ExtraGet (event->extra, EXTRA_MESSAGE) =3D=3D MSG_FILE;
+ int msgtype =3D ExtraGet (event->extra, EXTRA_MESSAGE);
+ char isfile =3D msgtype =3D=3D MSG_FILE || msgtype =3D=3D MSG_SSL_OPEN;
=20
if (!peer || !cont)
{
Index: src/util_tcl.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: /var/lib/cvs/micq/src/Attic/util_tcl.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- src/util_tcl.c 22 Sep 2003 16:47:06 -0000 1.1.2.3
+++ src/util_tcl.c 23 Sep 2003 12:14:34 -0000 1.1.2.4
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
- * $Id: util_tcl.c,v 1.1.2.3 2003/09/22 16:47:06 kuhlmann Exp $
+ * $Id: util_tcl.c,v 1.1.2.4 2003/09/23 12:14:34 kuhlmann Exp $
*/
=20
#include "micq.h"
@@ -94,7 +94,7 @@
=20
TCL_COMMAND (TCL_command_help)
{
- if (argc =3D=3D 1)
+ if (argc <=3D 2)
{
M_printf (i18n (2346, "The following Tcl commands are supported:\n=
"));
M_printf (COLMESSAGE "%s" COLNONE "\n\t" COLINDENT "%s\n%s" COLEXD=
ENT "\n",
@@ -286,24 +286,26 @@
{
const char *result;
=20
- if (tcl_events) {
- Tcl_Eval (tinterp, s_sprintf ("%s {%s} %s", tcl_events->cmd, type,=
data));
- result =3D Tcl_GetStringResult (tinterp); =20
+ if (tcl_events)
+ {
+ char *cdata =3D strdup (data);
+ Tcl_Eval (tinterp, s_sprintf ("%s {%s} %s", tcl_events->cmd, type,=
cdata));
+ result =3D Tcl_GetStringResult (tinterp);
if (strlen (result) > 0)
M_printf ("%s\n", Tcl_GetStringResult (tinterp));
+ s_free (cdata);
}
}
=20
-void TCLMessage (Contact *from, const char *text_)
+void TCLMessage (Contact *from, const char *text)
{
tcl_hook_p hook =3D tcl_msgs;
tcl_hook_p generic =3D NULL;
- const char *uin =3D "";
- char *text =3D strdup (text_);
+ char *uin =3D NULL;
const char *result;
=20
- if (from)=20
- uin =3D s_sprintf ("%lu", from->uin);
+ if (from)
+ uin =3D strdup (s_sprintf ("%lu", from->uin));
=20
while (hook)
{
@@ -312,19 +314,19 @@
else if (from && (!strcmp (hook->filter, from->nick) ||=20
!strcmp (hook->filter, uin)))
{
- Tcl_Eval (tinterp, s_sprintf ("%s {%s}", hook->cmd, text));
+ Tcl_Eval (tinterp, s_sprintf ("%s %s {%s}", hook->cmd, uin, te=
xt));
generic =3D NULL;
break;
}
hook =3D hook->next;
} =20
if (generic)
- Tcl_Eval (tinterp, s_sprintf ("%s {%s}", generic->cmd, text));
+ Tcl_Eval (tinterp, s_sprintf ("%s %s {%s}", generic->cmd, uin, tex=
t));
=20
result =3D Tcl_GetStringResult (tinterp);
if (strlen (result) > 0)
M_printf ("%s\n", Tcl_GetStringResult (tinterp));
- free (text);
+ s_free (uin);
}
=20
void TCLInit ()
--IrhDeMKUP4DT/M7F--
--gr/z0/N6AeWAPJVB
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQE/cHt0T8xIvMKmwO4RAkXTAJ9SJp7gr/W2OvdYBMnEWtD6yhijpgCcDQZm
hOeMauDKHd624PPhE9tTFfY=
=dOok
-----END PGP SIGNATURE-----
--gr/z0/N6AeWAPJVB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030923165726.GC1795>