Fix for bug #435 and fix return codes (these cannot be localonly for add/remove as...

[user/henk/code/inspircd.git] / src / cmd_oper.cpp

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 686182876beda77953873396b9c7977ada21e193..4d70f29ebb5ae103676a1811dd0e075a550a7032 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "typedefs.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_oper.h"
 #include "hashcomp.h"
@@ -46,6 +42,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
        char OperType[MAXBUF];
        char TypeName[MAXBUF];
        char HostName[MAXBUF];
+       char ClassName[MAXBUF];
        char TheHost[MAXBUF];
        char TheIP[MAXBUF];
        int j;
@@ -75,7 +72,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                        type_invalid = true;
                        for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
                        {
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "name", j, TypeName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "class", j, ClassName, MAXBUF);
 
                                if (!strcmp(TypeName,OperType))
                                {
@@ -90,6 +88,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                                        ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
                                        if (*HostName)
                                                user->ChangeDisplayedHost(HostName);
+                                       if (*ClassName)
+                                               user->CheckClass(ClassName);
                                        found = true;
                                        type_invalid = false;
                                        break;
@@ -103,8 +103,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
        {
                /* correct oper credentials */
                ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,irc::Spacify(OperType),parameters[0]);
-               user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,irc::Spacify(OperType));
-               if (!user->modes[UM_OPERATOR])
+               user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType));
+               if (!user->IsModeSet('o'))
                        user->Oper(OperType);
        }
        else
@@ -118,10 +118,13 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                        std::string fields;
                        if (!match_login)
                                fields.append("login ");
-                       if (!match_pass)
-                               fields.append("password ");
-                       if (!match_hosts)
-                               fields.append("hosts");
+                       else
+                       {
+                               if (!match_pass)
+                                       fields.append("password ");
+                               if (!match_hosts)
+                                       fields.append("hosts");
+                       }
                        user->WriteServ("491 %s :Invalid oper credentials",user->nick);
                        
                        snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str());