Decide that it wasn't quite appropriate :(

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

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 20a4b5ba8aed987adba592790052b81809eccb99..7cbf4b79f62d10318dc3f18f975ada330072171f 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -62,7 +62,7 @@ extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-bool OneOfMatches(char* host, char* hostlist)
+bool OneOfMatches(const char* host, const char* hostlist)
 {
        std::stringstream hl(hostlist);
        std::string xhost;
@@ -110,7 +110,14 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                                        Config->ConfValue("type","host",j,HostName,&Config->config_f);
                                        if (*HostName)
                                                ChangeDisplayedHost(user,HostName);
-                                       strlcpy(user->oper,TypeName,NICKMAX);
+                                       if (!isnick(TypeName))
+                                       {
+                                               WriteServ(user->fd,"491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
+                                               WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType);
+                                               log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host);
+                                               return;
+                                       }
+                                       strlcpy(user->oper,TypeName,NICKMAX-1);
                                        found = true;
                                        fail2 = false;
                                        break;