summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-08-07 14:52:04 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-08-07 14:52:04 +0000
commit866d7cc99bb78ae069987e2894580d8ed15c83f0 (patch)
treee54c500892be5acc40ea090965195c164bc58227 /src
parent9937d542252776221f018478c142face3e1ba1a1 (diff)
BUILD : 1.7.10 (850) BUGS : NOTES : Fixed NS SET sometimes using the option as nick if it existed and updated docs/NEWS for 1.7
git-svn-id: svn://svn.anope.org/anope/trunk@850 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@603 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/core/ns_set.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 091a7fe42..a766fb8fd 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -119,6 +119,7 @@ int do_set(User * u)
{
char *cmd = strtok(NULL, " ");
char *param = strtok(NULL, " ");
+ char *tmp = NULL;
NickAlias *na;
int is_servadmin = is_services_admin(u);
@@ -130,9 +131,15 @@ int do_set(User * u)
}
if (is_servadmin && cmd && (na = findnick(cmd))) {
- cmd = param;
- param = strtok(NULL, " ");
- set_nick = 1;
+ tmp = strtok(NULL, " ");
+ /* If there is no param left, don't treat the cmd as a
+ * nick. We have more chance of success that way. -GD
+ */
+ if (tmp) {
+ cmd = param;
+ param = strtok(NULL, " ");
+ set_nick = 1;
+ }
} else {
na = u->na;
}