kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index fd71b8694916ea3fd1545771cdc2a6d0e8fcba2e..f695c44f858b6fdc4b468d5f4a6b012e63f982fc 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -66,11 +66,13 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
        char TypeName[MAXBUF];
        char HostName[MAXBUF];
        char TheHost[MAXBUF];
+       char TheIP[MAXBUF];
        int j;
        bool found = false;
        bool fail2 = false;
 
        snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
+       snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
 
        for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
        {
@@ -79,7 +81,7 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
                Config->ConfValue(Config->config_data, "oper", "type", i, OperType, MAXBUF);
                Config->ConfValue(Config->config_data, "oper", "host", i, HostName, MAXBUF);
 
-               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,user->GetIPString(),HostName)))
+               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,TheIP,HostName)))
                {
                        fail2 = true;
                        for (j =0; j < Config->ConfValueEnum(Config->config_data, "type"); j++)