From 2a83fd35990abafdeebc0a2f5adb2c5cf959a2e3 Mon Sep 17 00:00:00 2001
From: "geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Thu, 7 Feb 2008 10:50:04 +0000
Subject: [PATCH] BUILD : 1.7.21 (1375) BUGS : 858 NOTES : do_sjoin() called
 finduser(NULL)

git-svn-id: svn://svn.anope.org/anope/trunk@1375 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1090 5417fbe8-f217-4b02-8779-1006273d7864
---
 Changes        | 13 +++++++------
 src/channels.c |  2 +-
 version.log    |  6 +++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Changes b/Changes
index 5e209b985..052e7fde6 100644
--- a/Changes
+++ b/Changes
@@ -22,12 +22,13 @@ Anope Version  S V N
 02/04 F Memleak in bs_fantasy_unban.c                                     [#852]
 02/04 F No variable for NSReleaseTimeout in NICK_RECOVERED message.       [#848]
 02/04 F Added missed NickServ HELP for RESEND command.                    [#847]
-02/08 F Updated config.guess and config.sub from upstream.                [#853]
-02/08 F Various small compiler warnings.                                  [#685]
-02/08 F Updated docs/WIN32.txt.                                           [#846]
-02/08 F Removed bs_fantasy_unban from core modules.                       [#854]
-02/08 F Defcon mode parsing breaking when fed with modes with parameters. [#855]
-02/08 F do_cmode() called without passing TS.                             [#820]
+02/05 F Updated config.guess and config.sub from upstream.                [#853]
+02/05 F Various small compiler warnings.                                  [#685]
+02/05 F Updated docs/WIN32.txt.                                           [#846]
+02/05 F Removed bs_fantasy_unban from core modules.                       [#854]
+02/05 F Defcon mode parsing breaking when fed with modes with parameters. [#855]
+02/05 F do_cmode() called without passing TS.                             [#820]
+02/07 F do_sjoin() looking for NULL-nick sometimes with TS6.              [#858]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2008
 01/16 F Server traversion with next_server() failed to list all servers.  [#831]
diff --git a/src/channels.c b/src/channels.c
index c10096e96..9fddb1610 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1070,7 +1070,7 @@ void do_sjoin(const char *source, int ac, char **av)
         if (UseTS6 && ircd->ts6) {
             user = find_byuid(source);
             if (!user)
-                user = finduser(s);
+                user = finduser(source);
         } else {
             user = finduser(source);
         }
diff --git a/version.log b/version.log
index bd6fc704d..fdaaccabb 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1374"
+VERSION_BUILD="1375"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1375)
+# BUGS  : 858
+# NOTES : do_sjoin() called finduser(NULL)
+#
 # BUILD : 1.7.21 (1374)
 # BUGS  : 820
 # NOTES : do_cmode() called without passing TS