* Fixed |d bug

svn: 1090

doc/UPDATES

@@ -37,6 +37,7 @@ This is a summary of ChangeLog basically.
 33.Possibly fixed a bug with bots dying on link.
 34.Bots no longer have userflag +b, they are distinguished in whois by BOTNICK instead of HANDLE.
 35.Added cmd_matchbot for matching bots, cmd_match now only does users.
+36.Fixed +d|d bots still being opped.
 
 1.1.7
 

src/mod/irc.mod/irc.c

@@ -153,7 +153,7 @@ void getin_request(char *botnick, char *code, char *par)
   struct maskrec **mr = NULL,
    *tmr = NULL;
   struct maskstruct *b = NULL;
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0 };
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN , 0, 0, 0 };
 
   if (!server_online) 
     return;
@@ -244,7 +244,7 @@ void getin_request(char *botnick, char *code, char *par)
     }
     get_user_flagrec(u, &fr, chan->dname);
 
-    if ((!chan_op(fr) && !glob_op(fr)) || (glob_deop(fr) && !chan_op(fr))) {
+    if (!chk_op(fr, chan)) {
       putlog(LOG_GETIN, "*", "opreq from %s/%s on %s - %s doesnt have +o for chan.", botnick, nick, chan->dname, botnick);
       return;
     }
@@ -300,7 +300,7 @@ void getin_request(char *botnick, char *code, char *par)
       return;
     }
     get_user_flagrec(u, &fr, chan->dname);
-    if ((!chan_op(fr) && !glob_op(fr)) || (glob_deop(fr) && !chan_op(fr))) {
+    if (!chk_op(fr, chan)) {
       putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - %s doesn't have acces for chan.", botnick, nick, chan->dname, botnick);
       return;
     }