diff options
author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 04:57:15 +0000 |
---|---|---|
committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 04:57:15 +0000 |
commit | 57fb28e70a2096fcf7cb1ab5838de3ac19e4b56b (patch) | |
tree | 84b6827e839930350c570478042b4ac594dce0e1 | |
parent | 1ba8e796c7fb72ff8d0b5a9b0eb3ddb7a89326a0 (diff) |
Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2196 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r-- | src/core/cs_set.c | 5 | ||||
-rw-r--r-- | version.log | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 43a191236..63d99b34e 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -185,7 +185,8 @@ int do_set(User * u) if (!param && (!cmd || (stricmp(cmd, "SUCCESSOR") != 0 && stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0 && - stricmp(cmd, "ENTRYMSG") != 0))) { + stricmp(cmd, "ENTRYMSG") != 0 && + stricmp(cmd, "MLOCK") != 0))) { syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX); } else if (!(ci = cs_findchan(chan))) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); @@ -492,7 +493,7 @@ int do_set_mlock(User * u, ChannelInfo * ci, char *param) ci->mlock_redirect = NULL; } - while ((mode = *param++)) { + while (param && (mode = *param++)) { switch (mode) { case '+': add = 1; diff --git a/version.log b/version.log index c694279c0..55f88dcbc 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="0" VERSION_EXTRA="-svn" -VERSION_BUILD="2193" +VERSION_BUILD="2196" # $Log$ # Changes since 1.8.0 Release +#Revision 2196 - Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be. #Revision 2193 - Backport of bugfix for bug #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended. #Revision 2189 - Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places. #Revision 2187 - Backport of bugfix for bug #1062 from SVN r2185 and 2186, patch from Adam, BS ASSIGN, BS ACT, and BS SAY should no longer send revealing error messages to users without access. |