[svn] Merge old trunk r2294:

Zero out the varlist passed to substitution_* when rejecting DNSBL clients.
This commit is contained in:
jilles 2007-03-28 07:33:50 -07:00
parent 9c2f9ec9a2
commit c83cbedc0e
3 changed files with 17 additions and 3 deletions

View file

@ -1,3 +1,17 @@
jilles 2007/03/28 14:30:10 UTC (20070328-3291)
Log:
Merge old trunk r2226:
If we are connecting outward to a server, check if the
server name they sent is the same as what we tried to
connect to. Previously such a connection could succeed
if there existed connect blocks with the same IP and
passwords for the other server name.
Changes: Modified:
+11 -0 trunk/modules/core/m_server.c (File Modified)
jilles 2007/03/28 14:21:37 UTC (20070328-3289) jilles 2007/03/28 14:21:37 UTC (20070328-3289)
Log: Log:
Merge old trunk r2212: Merge old trunk r2212:

View file

@ -1 +1 @@
#define SERNO "20070328-3289" #define SERNO "20070328-3291"

View file

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: s_user.c 3255 2007-03-06 14:07:11Z jilles $ * $Id: s_user.c 3293 2007-03-28 14:33:50Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -433,7 +433,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
source_p->sockhost, source_p->preClient->dnsbl_listed->host); source_p->sockhost, source_p->preClient->dnsbl_listed->host);
else else
{ {
dlink_list varlist; dlink_list varlist = { NULL, NULL, 0 };
substitution_append_var(&varlist, "nick", source_p->name); substitution_append_var(&varlist, "nick", source_p->name);
substitution_append_var(&varlist, "ip", source_p->sockhost); substitution_append_var(&varlist, "ip", source_p->sockhost);