MAXMODES wasn't being enforced

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

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 435e37e5920046a2718dca25d2c0d55471fb9ebf..15e0df3c4de4799fdc1af9c19c011b380f8f1d3c 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -110,6 +110,13 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                                        Config->ConfValue("type","host",j,HostName,&Config->config_f);
                                        if (*HostName)
                                                ChangeDisplayedHost(user,HostName);
+                                       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);
                                        found = true;
                                        fail2 = false;
@@ -125,7 +132,7 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                 /* correct oper credentials */
                 WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
                 WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s",user->nick,OperType);
-               if (!*user->oper)
+               if (!strchr(user->modes,'o'))
                {
                        strcat(user->modes,"o");
                        WriteServ(user->fd,"MODE %s :+o",user->nick);