BUILD : 1.7.5 (348) BUGS : NOTES : /os MODE was not functioning, by joining 2 seperate if statements into one the problem was solved. Many Thanks to DrStein for the patch.

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


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@224 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 10 insertions, 6 deletions

diff --git a/Changes b/Changes
index b4114f5bb..efe12c735 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
 Provided by Anope Dev. <dev@anope.org> - 2004
 08/24 A New -l option for am script to list possible selectors.           [ #00]
 09/08 A Removed rand() and ported bsd's arc4random() to fit our needs.    [ #00]
+09/14 F Fixed /os MODE by joining nested ifs into one.                    [ #00]
 09/14 F Protection unsetting now does -a instead of +a.                   [ #00]
 09/12 F Updated Dutch language file.                                      [ #00]
 09/10 F Typo in anope_cmd_relase_svshold function name.                   [ #00]
diff --git a/src/operserv.c b/src/operserv.c
index adc0ce115..2d643aa01 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -1442,11 +1442,10 @@ static int do_os_mode(User * u)
     } else if (c->bouncy_modes) {
         notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
         return MOD_CONT;
-    } else if (ircd->adminmode) {
-        if ((!is_services_admin(u)) && (c->mode & ircd->adminmode)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
+    } else if ((ircd->adminmode) && (!is_services_admin(u))
+               && (c->mode & ircd->adminmode)) {
+        notice_lang(s_OperServ, u, PERMISSION_DENIED);
+        return MOD_CONT;
     } else {
         anope_cmd_mode(s_OperServ, chan, "%s", modes);
 
diff --git a/version.log b/version.log
index 0dee22616..4381da217 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="5"
-VERSION_BUILD="347"
+VERSION_BUILD="348"
 
 # $Log$
 #
+# BUILD : 1.7.5 (348)
+# BUGS  : 
+# NOTES : /os MODE was not functioning, by joining 2 seperate if statements into one the problem was solved. Many Thanks to DrStein for the patch. 
+#
 # BUILD : 1.7.5 (347)
 # BUGS  : 
 # NOTES : Fixed PROTECT_UNSET_MODE from +a to -a -- Certus was too lazy to do it so he asked if i could :\