diff -uNr ircservices-5.0.35/Changes ircservices-5.0.36/Changes --- ircservices-5.0.35/Changes 2004-07-08 16:48:26 +0900 +++ ircservices-5.0.36/Changes 2004-07-12 17:43:49 +0900 @@ -1,5 +1,8 @@ Version 5.0 ----------- +2004/07/09 .36 Removed log message on socket buffer size misbehavior. +2004/07/09 Fixed potential crash on SQUIT. Reported by Tom McIntyre + 2004/07/08 .35 Fixed memory leak in httpd/auth-password module when reconfiguring. 2004/07/08 Fixed bug causing HTTP password authorization to fail. diff -uNr ircservices-5.0.35/servers.c ircservices-5.0.36/servers.c --- ircservices-5.0.35/servers.c 2004-07-08 17:34:00 +0900 +++ ircservices-5.0.36/servers.c 2004-07-12 18:10:52 +0900 @@ -172,16 +172,16 @@ void do_squit(const char *source, int ac, char **av) { - Server *server, *tmpserver; + Server *server; server = get_server(av[0]); if (server) { - squit_server(server, av[1]); if (server->hub) { if (server->hub->child == server) { server->hub->child = server->sibling; } else { + Server *tmpserver; for (tmpserver = server->hub->child; tmpserver->sibling; tmpserver = tmpserver->sibling) { if (tmpserver->sibling == server) { @@ -191,6 +191,7 @@ } } } + squit_server(server, av[1]); } else { wallops(ServerName, diff -uNr ircservices-5.0.35/sockets.c ircservices-5.0.36/sockets.c --- ircservices-5.0.35/sockets.c 2004-07-08 17:34:00 +0900 +++ ircservices-5.0.36/sockets.c 2004-07-12 18:10:52 +0900 @@ -1188,9 +1188,9 @@ static void resize_rbuf(Socket *s, uint32 size) { if (size <= read_buffer_len(s)) { - log("sockets: BUG: resize_rbuf(%d): size (%d) <= rlen (%d)", +/* log("sockets: BUG: resize_rbuf(%d): size (%d) <= rlen (%d)", s->fd, size, read_buffer_len(s)); - return; +*/ return; } resize_buf(&s->rbuf, &s->rptr, &s->rend, &s->rtop, size); s->rbufsize = size; @@ -1200,9 +1200,9 @@ static void resize_wbuf(Socket *s, uint32 size) { if (size <= write_buffer_len(s)) { - log("sockets: BUG: resize_wbuf(%d): size (%d) <= wlen (%d)", +/* log("sockets: BUG: resize_wbuf(%d): size (%d) <= wlen (%d)", s->fd, size, write_buffer_len(s)); - return; +*/ return; } resize_buf(&s->wbuf, &s->wptr, &s->wend, &s->wtop, size); s->wbufsize = size; diff -uNr ircservices-5.0.35/version.sh ircservices-5.0.36/version.sh --- ircservices-5.0.35/version.sh 2004-07-08 16:47:16 +0900 +++ ircservices-5.0.36/version.sh 2004-07-12 17:43:53 +0900 @@ -6,7 +6,7 @@ # $PROGRAM is the string returned as the first part of a /VERSION reply, # and must not contain spaces. It is not used anywhere else. PROGRAM=ircservices -VERSION=5.0.35 +VERSION=5.0.36 # Increment Services build number if [ -f version.c ] ; then