BUILD : 1.7.8 (753) BUGS : N/a NOTES : Merged anope-dev with trunk

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


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

1 files changed, 3 insertions, 4 deletions

diff --git a/src/messages.c b/src/messages.c
index 695acbd8b..119200d98 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -163,16 +163,15 @@ int m_privmsg(char *source, char *receiver, char *msg)
         if ((stricmp(receiver, s_OperServ) == 0)
             || (s_OperServAlias
                 && (stricmp(receiver, s_OperServAlias) == 0))) {
-            if (is_oper(u)) {
-                operserv(u, msg);
-            } else {
+            if (!is_oper(u) && OSOpersOnly) {
                 notice_lang(s_OperServ, u, ACCESS_DENIED);
-
                 if (WallBadOS)
                     anope_cmd_global(s_OperServ,
                                      "Denied access to %s from %s!%s@%s (non-oper)",
                                      s_OperServ, u->nick, u->username,
                                      u->host);
+            } else {
+                operserv(u, msg);
             }
         } else if ((stricmp(receiver, s_NickServ) == 0)
                    || (s_NickServAlias