* Removed flag_record.bot

svn: 961

src/cfg.c

@@ -211,7 +211,7 @@ void deflag_user(struct userrec *u, int why, char *msg, struct chanset_t *chan)
 {
   char tmp[256] = "", tmp2[1024] = "";
   struct cfg_entry *ent = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0 };
 
   if (!u)
     return;

src/chanprog.c

@@ -346,7 +346,7 @@ void tell_verbose_status(int idx)
 void tell_settings(int idx)
 {
   char s[1024] = "";
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   dprintf(idx, "Botnet Nickname: %s\n", conf.bot->nick);
   if (firewall[0])
@@ -647,7 +647,7 @@ int shouldjoin(struct chanset_t *chan)
   else if (!strncmp(conf.bot->nick, "wtest", 4)) /* use 5 for all */
     return 0; 
 #ifdef G_BACKUP
-  struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0};
  
   if (!chan || (chan && !chan->name || (chan->name && !chan->name[0])))
     return 0;

src/cmds.c

@@ -780,7 +780,7 @@ static void cmd_help(struct userrec *u, int idx, char *par)
 {
   char flg[100] = "", *fcats = NULL, temp[100] = "", buf[2046] = "", match[20] = "";
   int fnd = 0, done = 0, nowild = 0;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   egg_snprintf(temp, sizeof temp, "a|- a|a n|- n|n m|- m|m mo|o m|o i|- o|o o|- p|- -|-");
   fcats = temp;
@@ -1229,7 +1229,7 @@ static void cmd_console(struct userrec *u, int idx, char *par)
 {
   char *nick = NULL, s[2] = "", s1[512] = "";
   int dest = 0, i, ok = 0, pls, md;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   struct chanset_t *chan = NULL;
 
   if (!par[0]) {
@@ -2197,7 +2197,7 @@ int check_dcc_attrs(struct userrec *u, flag_t oatr)
 	botnet_send_join_idx(i, -1);
       }
       if ((oatr & USER_MASTER) && !(u->flags & USER_MASTER)) {
-	struct flag_record fr = {FR_CHAN | FR_ANYWH, 0, 0, 0};
+	struct flag_record fr = {FR_CHAN | FR_ANYWH, 0, 0};
 
 	dcc[i].u.chat->con_flags &= ~(LOG_MISC | LOG_CMDS | LOG_RAW |
 				      LOG_FILES | LOG_WALL | LOG_DEBUG);
@@ -2323,7 +2323,7 @@ int check_dcc_chanattrs(struct userrec *u, char *chname, flag_t chflags, flag_t
 	   (!(chflags & (USER_OP | USER_MASTER | USER_OWNER)))) ||
 	  ((chflags & (USER_OP | USER_MASTER | USER_OWNER)) &&
 	   (!(ochatr & (USER_OP | USER_MASTER | USER_OWNER))))) {
-	struct flag_record fr = {FR_CHAN, 0, 0, 0};
+	struct flag_record fr = {FR_CHAN, 0, 0};
 
 	for (chan = chanset; chan && !found; chan = chan->next) {
 	  get_user_flagrec(u, &fr, chan->dname);
@@ -2347,10 +2347,10 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
   char *hand = NULL, *arg = NULL, *tmpchg = NULL, *chg = NULL, work[1024] = "";
   struct chanset_t *chan = NULL;
   struct userrec *u2 = NULL;
-  struct flag_record pls = {0, 0, 0, 0},
-  		     mns = {0, 0, 0, 0},
-		     user = {0, 0, 0, 0},
-		     ouser = {0, 0, 0, 0};
+  struct flag_record pls = {0, 0, 0},
+  		     mns = {0, 0, 0},
+		     user = {0, 0, 0},
+		     ouser = {0, 0, 0};
   /*int fl = -1, of = 0, ocf = 0;*/
 /* FIXME: fl WAS -1 */
   flag_t of = 0, ocf = 0;
@@ -2959,7 +2959,7 @@ static void cmd_strip(struct userrec *u, int idx, char *par)
 static void cmd_su(struct userrec *u, int idx, char *par)
 {
   int atr = u ? u->flags : 0, ok;
-  struct flag_record fr = {FR_ANYWH | FR_CHAN | FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_ANYWH | FR_CHAN | FR_GLOBAL, 0, 0};
 
   u = get_user_by_handle(userlist, par);
 
@@ -3374,8 +3374,8 @@ static void cmd_pls_host(struct userrec *u, int idx, char *par)
   char *handle = NULL, *host = NULL;
   struct userrec *u2 = NULL;
   struct list_type *q = NULL;
-  struct flag_record fr2 = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0},
-                     fr  = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr2 = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0},
+                     fr  = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   putlog(LOG_CMDS, "*", "#%s# +host %s", dcc[idx].nick, par);
 
@@ -3457,8 +3457,8 @@ static void cmd_mns_host(struct userrec *u, int idx, char *par)
 {
   char *handle = NULL, *host = NULL;
   struct userrec *u2 = NULL;
-  struct flag_record fr2 = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0},
-                     fr  = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr2 = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0},
+                     fr  = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   putlog(LOG_CMDS, "*", "#%s# -host %s", dcc[idx].nick, par);
   if (!par[0]) {

src/core_binds.c

@@ -46,7 +46,7 @@ void core_binds_init()
 
 void check_bind_dcc(const char *cmd, int idx, const char *text)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int x, hits;
 #ifdef S_DCCPASS
   bind_entry_t *entry = NULL;
@@ -116,7 +116,7 @@ void check_bind_bot(const char *nick, const char *code, const char *param)
 
 void check_bind_chon(char *hand, int idx)
 {
-  struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   struct userrec        *u = NULL;
 
   u = get_user_by_handle(userlist, hand);
@@ -127,7 +127,7 @@ void check_bind_chon(char *hand, int idx)
 
 void check_bind_chof(char *hand, int idx)
 {
-  struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   struct userrec        *u = NULL;
 
   u = get_user_by_handle(userlist, hand);
@@ -173,7 +173,7 @@ int check_bind_note(const char *from, const char *to, const char *text)
 
 void check_bind_chjn(const char *bot, const char *nick, int chan, const char type, int sock, const char *host)
 {
-  struct flag_record    fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record    fr = {FR_GLOBAL, 0, 0};
   char                  s[11] = "", t[2] = "";
 
   t[0] = type;

src/dcc.c

@@ -1215,7 +1215,7 @@ static time_t lasttelnettime;
  */
 static int detect_telnet_flood(char *floodhost)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   get_user_flagrec(get_user_by_host(floodhost), &fr, NULL);
   if (!flood_telnet_thr || glob_noflood(fr))
@@ -1497,7 +1497,7 @@ void dupwait_notify(char *who)
 static void dcc_telnet_id(int idx, char *buf, int atr)
 {
   int ok = 0;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   strip_telnet(dcc[idx].sock, buf, &atr);
   buf[HANDLEN] = 0;
@@ -1559,7 +1559,7 @@ static void dcc_telnet_id(int idx, char *buf, int atr)
 static void dcc_telnet_pass(int idx, int atr)
 {
   int ok = 0, i, ok2;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &fr, NULL);
   /* No password set? */

src/dccutil.c

@@ -226,7 +226,7 @@ void chanout_but (int x, ...)
 void dcc_chatter(int idx)
 {
   int i, j;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &fr, NULL);
   dprintf(idx, "Connected to %s, running %s\n", conf.bot->nick, version);

src/flags.c

@@ -30,16 +30,6 @@ void init_flags()
                FLAG[i] = (flag_t) 1 << (i - 'a');
        for (; i < 128; i++)
                FLAG[i] = 0;
-struct flag_record pls = { FR_GLOBAL, 0, 0, 0 }, mns = { FR_GLOBAL, 0, 0, 0 };
-char string[501] = "";
-pls.global = FLAG['a'] | FLAG['A'];
-mns.global = FLAG['a'];
-
-break_down_flags(string, &pls, NULL);
-printf("break_down_flags:  %s\n", string);
-
-//printf("a: %llX A: %llX\n",  FLAG['a'],  FLAG['Z']);
-//printf("0: %llX 26: %llX\n",  BIT0, BIT31);
 }
 
 /* Some flags are mutually exclusive -- this roots them out
@@ -108,7 +98,7 @@ int chan_sanity_check(int chatr, int atr)
  */
 char geticon(int idx)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   if (!dcc[idx].user)
     return '-';
@@ -160,13 +150,6 @@ void break_down_flags(const char *string, struct flag_record *plus, struct flag_
       }
       which = plus;
       chan++;
-/* FIXME: blah */
-/*
-      if ((chan == 2) && !(flags & (FR_CHAN | FR_BOT)) )
-	string = "";
-      else if (chan == 3)
-	chan = 1;
-*/
       if (chan == 2)
         string = "";
       else if (chan == 3)
@@ -231,8 +214,13 @@ int build_flags(char *string, struct flag_record *plus, struct flag_record *minu
     }
   }
   if (plus->match & FR_CHAN) {
-    if (plus->match & (FR_GLOBAL | FR_BOT))
+/* FIXME: BLAH */
+/*    if (plus->match & (FR_GLOBAL | FR_BOT))
+      *string++ = (plus->match & FR_AND) ? '&' : '|';
+*/
+    if (plus->match & FR_GLOBAL)
       *string++ = (plus->match & FR_AND) ? '&' : '|';
+    
     if (minus && plus->chan)
       *string++ = '+';
     string += flag2str(string, plus->chan);
@@ -461,7 +449,7 @@ int ischanhub()
 
 int dovoice(struct chanset_t *chan)
 {
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (!chan) return 0;
 
@@ -473,7 +461,7 @@ int dovoice(struct chanset_t *chan)
 
 int dolimit(struct chanset_t *chan)
 {
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (!chan) return 0;
 
@@ -485,7 +473,7 @@ int dolimit(struct chanset_t *chan)
 
 int whois_access(struct userrec *user, struct userrec *whois_user)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0}, whois = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0}, whois = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   get_user_flagrec(user, &fr, NULL);
   get_user_flagrec(whois_user, &whois, NULL);

src/flags.h

@@ -20,13 +20,11 @@ extern flag_t	FLAG[128];
 struct flag_record {
   flag_t match;
   flag_t global;
-  flag_t bot;
   flag_t chan;
 };
 
 #define FR_GLOBAL 0x00000001
-#define FR_BOT    0x00000002
-#define FR_CHAN   0x00000004
+#define FR_CHAN   0x00000002
 #define FR_ANYWH  0x10000000
 #define FR_AND    0x20000000
 #define FR_OR     0x40000000

src/misc.c

@@ -469,7 +469,7 @@ void show_motd(int idx)
 void show_channels(int idx, char *handle)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = { FR_CHAN | FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = { FR_CHAN | FR_GLOBAL, 0, 0};
   struct userrec *u = NULL;
   int first = 0, total = 0;
   size_t l = 0;
@@ -1112,7 +1112,7 @@ char *replace(const char *string, char *oldie, char *newbie)
 void showhelp (int idx, struct flag_record *flags, char *string)
 {
   static int help_flags;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   char helpstr[12288] = "", tmp[2] = "", flagstr[10] = "";
   int ok = 1;
 

src/mod/channels.mod/channels.c

@@ -632,7 +632,7 @@ void remove_channel(struct chanset_t *chan)
  */
 static int channels_chon(char *handle, int idx)
 {
-  struct flag_record fr = {FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0};
   int find, found = 0;
   struct chanset_t *chan = chanset;
 
@@ -679,7 +679,7 @@ void channels_report(int idx, int details)
   struct chanset_t *chan = NULL;
   int i;
   char s[1024] = "", s2[100] = "";
-  struct flag_record fr = {FR_CHAN | FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_CHAN | FR_GLOBAL, 0, 0};
 
   for (chan = chanset; chan; chan = chan->next) {
     if (idx != DP_STDOUT)

src/mod/channels.mod/cmdschan.c

@@ -6,8 +6,8 @@
 
 #include <ctype.h>
 
-static struct flag_record user	 = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
-static struct flag_record victim = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+static struct flag_record user	 = {FR_GLOBAL | FR_CHAN, 0, 0};
+static struct flag_record victim = {FR_GLOBAL | FR_CHAN, 0, 0};
 
 
 static void cmd_pls_mask(char type, struct userrec *u, int idx, char *par)

src/mod/irc.mod/chan.c

@@ -151,7 +151,7 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
         bpos = (ops - 1);
 
     } else if (!opsonly || chan_hasop(m)) {
-        struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+        struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
         if (m->user)
           get_user_flagrec(m->user, &fr, chan->dname);
 
@@ -176,7 +176,7 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
   sent = 0;
   for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
     if (!opsonly || chan_hasop(m)) {
-      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
       if (m->user)
         get_user_flagrec(m->user, &fr, chan->dname);
@@ -219,7 +219,7 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
   tpos = 0;
   for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
     if (!opsonly || chan_hasop(m)) {
-      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
       if (m->user)
         get_user_flagrec(m->user, &fr, chan->dname);
@@ -267,7 +267,7 @@ static int target_priority(struct chanset_t * chan, memberlist *target, int opso
       if (match_my_nick(m->nick))
         bpos = ops;
     } else if (!opsonly || chan_hasop(m)) {
-      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+      struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
       if (m->user)
         get_user_flagrec(m->user, &fr, chan->dname);
@@ -335,7 +335,7 @@ static int detect_chan_flood(char *floodnick, char *floodhost, char *from,
   struct userrec *u = NULL;
   memberlist *m = NULL;
   int thr = 0, lapse = 0;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (!chan || (which < 0) || (which >= FLOOD_CHAN_MAX))
     return 0;
@@ -554,7 +554,7 @@ static void kick_all(struct chanset_t *chan, char *hostmask, char *comment, int
 {
   memberlist *m = NULL;
   char kicknick[512] = "", s[UHOSTLEN] = "";
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int k, l, flushed;
 
   if (!me_op(chan))
@@ -611,7 +611,7 @@ static void refresh_ban_kick(struct chanset_t *chan, char *user, char *nick)
   for (cycle = 0; cycle < 2; cycle++) {
     for (b = cycle ? chan->bans : global_bans; b; b = b->next) {
       if (wild_match(b->mask, user)) {
-	struct flag_record	fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+	struct flag_record	fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 	char c[512] = "";		/* The ban comment.	*/
 	char s[UHOSTLEN] = "";
 
@@ -966,7 +966,7 @@ void check_this_user(char *hand, int delete, char *host)
   memberlist *m = NULL;
   struct userrec *u = NULL;
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   for (chan = chanset; chan; chan = chan->next)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
@@ -1117,7 +1117,7 @@ void recheck_channel(struct chanset_t *chan, int dobans)
 {
   memberlist *m = NULL;
   char s[UHOSTLEN] = "";
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   static int stacking = 0;
   int stop_reset = 0, botops = 0, nonbotops = 0, botnonops = 0;
 
@@ -1353,7 +1353,7 @@ static void memberlist_reposition(struct chanset_t * chan, memberlist * target)
 
 static int got352or4(struct chanset_t *chan, char *user, char *host, char *serv, char *nick, char *flags, int hops)
 {
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
   char userhost[UHOSTLEN] = "";
   memberlist *m = NULL;
   int waschanop;
@@ -1996,7 +1996,7 @@ static int gotjoin(char *from, char *chname)
   memberlist *m = NULL;
   masklist *b = NULL;
   struct userrec *u = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   fixcolon(chname);
   chan = findchan(chname);
@@ -2274,7 +2274,7 @@ static int gotkick(char *from, char *origmsg)
   memberlist *m = NULL;
   struct chanset_t *chan = NULL;
   struct userrec *u = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   strncpy(buf2, origmsg, 510);
   buf2[510] = 0;
@@ -2352,7 +2352,7 @@ static int gotnick(char *from, char *msg)
   memberlist *m = NULL, *mm = NULL;
   struct chanset_t *chan = NULL, *oldchan = NULL;
   struct userrec *u = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   strcpy(uhost, from);
   nick = splitnick(&uhost);
@@ -2557,7 +2557,7 @@ static int gotmsg(char *from, char *msg)
   int ignoring;
   struct userrec *u = NULL;
   memberlist *m = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (!strchr("&#!+@$", msg[0]))
     return 0;
@@ -2734,7 +2734,7 @@ static int gotnotice(char *from, char *msg)
   struct userrec *u = NULL;
   memberlist *m = NULL;
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int ignoring;
 
   if (!strchr(CHANMETA "@", *msg))

src/mod/irc.mod/irc.c

@@ -95,7 +95,7 @@ static int include_lk = 1;		/* For correct calculation
 
 static void detect_autokick(char *nick, char *uhost, struct chanset_t *chan, char *msg)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   struct userrec *u = NULL;
   int i = 0, tot = 0;
 
@@ -182,7 +182,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 | FR_ANYWH, 0, 0};
 
   if (!server_online) 
     return;
@@ -480,7 +480,7 @@ static void request_op(struct chanset_t *chan)
   memberlist *ml = NULL;
   memberlist *botops[MAX_BOTS];
   char s[100] = "", *l = NULL, myserv[SERVLEN] = "";
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   if (!chan || (chan && (channel_pending(chan) || !shouldjoin(chan) || !channel_active(chan) || me_op(chan))))
     return;
@@ -590,7 +590,7 @@ static void request_in(struct chanset_t *chan)
   int i = 0;
   int cnt, n;
   struct userrec *botops[MAX_BOTS], *u = NULL;
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   for (u = userlist; u && (i < MAX_BOTS); u = u->next) {
     get_user_flagrec(u, &fr, NULL);
@@ -640,7 +640,7 @@ static int want_to_revenge(struct chanset_t *chan, struct userrec *u,
 			   struct userrec *u2, char *badnick, char *victimstr,
 			   int mevictim)
 {
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
   /* Do not take revenge upon ourselves. */
   if (match_my_nick(badnick))
@@ -657,7 +657,7 @@ static int want_to_revenge(struct chanset_t *chan, struct userrec *u,
         return 1;
     /* Do we revenge for our users ... and do we actually know the victim? */
     } else if (channel_revenge(chan) && u2) {
-      struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+      struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0};
 
       get_user_flagrec(u2, &fr2, chan->dname);
       /* Protecting friends? */
@@ -679,7 +679,7 @@ static void punish_badguy(struct chanset_t *chan, char *whobad,
 {
   char reason[1024] = "", ct[81] = "", *kick_msg = NULL;
   memberlist *m = NULL;
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0};
 
   m = ismember(chan, badnick);
   if (!m)
@@ -1150,7 +1150,7 @@ static void check_expired_chanstuff()
   memberlist *m = NULL, *n = NULL;
   char s[UHOSTLEN] = "";
   struct chanset_t *chan;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (!server_online)
     return;
@@ -1246,7 +1246,7 @@ static void check_expired_chanstuff()
             m->user = get_user_by_host(s);
 
           if (m->user) {
-            struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0, 0};
+            struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0};
             get_user_flagrec(m->user, &fr2, chan->dname);
             if (!private(fr2, chan, PRIV_VOICE) && 
                ((channel_voice(chan) && !chk_devoice(fr2, chan)) ||
@@ -1279,7 +1279,7 @@ static void check_expired_chanstuff()
 #ifdef S_AUTHCMDS
 static int check_bind_pubc(char *cmd, char *nick, char *from, struct userrec *u, char *args, char *chan)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int x = check_bind(BT_msgc, cmd, &fr, nick, from, u, args, chan);
 
   if (x & BIND_RET_LOG)
@@ -1319,7 +1319,7 @@ void flush_modes()
 
 void irc_report(int idx, int details)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   char ch[1024] = "", q[160] = "", *p = NULL;
   int k;
   size_t len;

src/mod/irc.mod/mode.c

@@ -18,8 +18,8 @@ static int reversing = 0;
 #define EXEMPT  BIT5
 #define INVITE  BIT6
 
-static struct flag_record user   = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
-static struct flag_record victim = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+static struct flag_record user   = {FR_GLOBAL | FR_CHAN, 0, 0};
+static struct flag_record victim = {FR_GLOBAL | FR_CHAN, 0, 0};
 
 static int do_op(char *nick, struct chanset_t *chan, int force)
 {

src/mod/irc.mod/msgcmds.c

@@ -56,7 +56,7 @@ static int msg_op(char *nick, char *host, struct userrec *u, char *par)
 {
   struct chanset_t *chan = NULL;
   char *pass = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (match_my_nick(nick))
     return BIND_RET_BREAK;
@@ -153,7 +153,7 @@ static int msg_invite(char *nick, char *host, struct userrec *u, char *par)
 {
   char *pass = NULL;
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (match_my_nick(nick))
     return BIND_RET_BREAK;
@@ -445,7 +445,7 @@ static int msgc_test(char *nick, char *host, struct userrec *u, char *par, char
 {
   char *chn, *hand;
   struct chanset_t *chan;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   struct userrec *user;
   
   hand = newsplit(&par);
@@ -465,7 +465,7 @@ static int msgc_test(char *nick, char *host, struct userrec *u, char *par, char
 static int msgc_op(char *nick, char *host, struct userrec *u, char *par, char *chname)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int force = 0;
   memberlist *m = NULL;
 
@@ -515,7 +515,7 @@ static int msgc_op(char *nick, char *host, struct userrec *u, char *par, char *c
 static int msgc_voice(char *nick, char *host, struct userrec *u, char *par, char *chname)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int force = 0;
   memberlist *m = NULL;
 
@@ -563,7 +563,7 @@ static int msgc_voice(char *nick, char *host, struct userrec *u, char *par, char
 static int msgc_channels(char *nick, char *host, struct userrec *u, char *par, char *chname)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   char list[1024] = "";
 
   putlog(LOG_CMDS, "*", "(%s!%s) !%s! %s %sCHANNELS %s", nick, host, u->handle, chname ? chname : "", cmdprefix, par ? par : "");
@@ -588,7 +588,7 @@ static int msgc_channels(char *nick, char *host, struct userrec *u, char *par, c
 static int msgc_getkey(char *nick, char *host, struct userrec *u, char *par, char *chname)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   if (chname && chname[0]) 
     return 0;
@@ -616,7 +616,7 @@ static int msgc_help(char *nick, char *host, struct userrec *u, char *par, char
 {
   bind_entry_t *entry = NULL;
   bind_table_t *table = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   putlog(LOG_CMDS, "*", "(%s!%s) !%s! %sHELP %s", nick, host, u->handle, cmdprefix, par ? par : "");
 
@@ -662,7 +662,7 @@ static int msgc_sha1(char *nick, char *host, struct userrec *u, char *par, char
 static int msgc_invite(char *nick, char *host, struct userrec *u, char *par, char *chname)
 {
   struct chanset_t *chan = NULL;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int force = 0;
 
   if (chname && chname[0])

src/mod/server.mod/server.c

@@ -1217,7 +1217,7 @@ static int ctcp_DCC_CHAT(char *nick, char *from, struct userrec *u, char *object
 {
   char *action = NULL, *param = NULL, *ip = NULL, *prt = NULL;
   int i, ok;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
   
   if (!ischanhub())
     return BIND_RET_LOG;
@@ -1293,7 +1293,7 @@ static void dcc_chat_hostresolved(int i)
 {
   char buf[512] = "", ip[512] = "";
   int ok;
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
 
   egg_snprintf(buf, sizeof buf, "%d", dcc[i].port);
 #ifdef USE_IPV6

src/mod/server.mod/servmsg.c

@@ -104,7 +104,7 @@ static int gotfake433(char *from)
 
 static void check_bind_msg(char *cmd, char *nick, char *uhost, struct userrec *u, char *args)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
   int x;
 
   get_user_flagrec(u, &fr, NULL);
@@ -119,7 +119,7 @@ static void check_bind_msg(char *cmd, char *nick, char *uhost, struct userrec *u
 #ifdef S_AUTHCMDS
 static int check_bind_msgc(char *cmd, char *nick, char *from, struct userrec *u, char *args)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0};
   int x;
 
   x = check_bind(BT_msgc, cmd, &fr, nick, from, u, args, NULL);
@@ -153,7 +153,7 @@ int check_bind_ctcpr(char *nick, char *uhost, struct userrec *u,
                            char *dest, char *keyword, char *args,
                            bind_table_t *table)
 {
-  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0};
   get_user_flagrec(u, &fr, NULL);
   return check_bind(table, keyword, &fr, nick, uhost, u, dest, keyword, args);
 }

src/mod/share.mod/share.c

@@ -29,7 +29,7 @@
 #  include "src/mod/irc.mod/irc.h"
 #endif /* LEAF */
 
-static struct flag_record fr = { 0, 0, 0, 0 };
+static struct flag_record fr = { 0, 0, 0};
 
 #ifdef LEAF
 struct delay_mode {

src/shell.c

@@ -496,7 +496,7 @@ void detected(int code, char *msg)
 {
   char *p = NULL, tmp[512] = "";
   struct userrec *u = NULL;
-  struct flag_record fr = { FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = { FR_GLOBAL, 0, 0};
   int act;
 
   u = get_user_by_handle(userlist, conf.bot->nick);

src/userent.c

@@ -275,7 +275,7 @@ void config_display(int idx, struct user_entry *e, struct userrec *u)
 {
 #ifdef HUB
   struct xtra_key *xk = NULL;
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &fr, NULL);
   /* scan thru xtra field, searching for matches */
@@ -518,7 +518,7 @@ struct user_entry_type USERENTRY_PASS =
 
 void secpass_display(int idx, struct user_entry *e, struct userrec *u)
 {
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &fr, NULL);
 
@@ -719,7 +719,7 @@ static int botaddr_set(struct userrec *u, struct user_entry *e, void *buf)
 static void botaddr_display(int idx, struct user_entry *e, struct userrec *u)
 {
 #ifdef HUB
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &fr, NULL);
   if (glob_admin(fr)) {

src/userrec.c

@@ -289,7 +289,7 @@ int write_user(struct userrec *u, FILE * f, int idx)
   struct chanuserrec *ch = NULL;
   struct chanset_t *cst = NULL;
   struct user_entry *ue = NULL;
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   fr.global = u->flags;
   build_flags(s, &fr, NULL);
@@ -517,7 +517,7 @@ struct userrec *adduser(struct userrec *bu, char *handle, char *host, char *pass
     clear_chanlist();
   noshare = oldshare;
   if ((!noshare) && (handle[0] != '*') && (bu == userlist)) {
-    struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+    struct flag_record fr = {FR_GLOBAL, 0, 0};
     char x[100] = "";
 
     fr.global = u->flags;

src/users.c

@@ -453,7 +453,7 @@ void tell_user(int idx, struct userrec *u, int master)
   struct chanset_t *chan = NULL;
   struct user_entry *ue = NULL;
   struct laston_info *li = NULL;
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   n = num_notes(u->handle);
 
@@ -525,7 +525,7 @@ void tell_user_ident(int idx, char *id, int master)
 {
   char format[81] = "";
   struct userrec *u = NULL;
-  struct flag_record user = {FR_GLOBAL | FR_CHAN, 0, 0, 0};
+  struct flag_record user = {FR_GLOBAL | FR_CHAN, 0, 0};
 
   get_user_flagrec(dcc[idx].user, &user, NULL);
 
@@ -563,9 +563,9 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
     user.match = pls.match = FR_GLOBAL | FR_CHAN;
     break_down_flags(mtch, &pls, &mns);
     mns.match = pls.match ^ (FR_AND | FR_OR);
-    if (!mns.global && !mns.chan && !mns.bot) {
+    if (!mns.global && !mns.chan) {
       nomns = 1;
-      if (!pls.global && !pls.chan && !pls.bot) {
+      if (!pls.global && !pls.chan) {
 	/* happy now BB you weenie :P */
 	dprintf(idx, "Unknown flag specified for matching!!\n");
 	return;
@@ -1155,7 +1155,7 @@ void autolink_cycle(char *start)
   struct bot_addr *my_ba = NULL;
   char uplink[HANDLEN + 1] = "", avoidbot[HANDLEN + 1] = "", curhub[HANDLEN + 1] = "";
   int i, hlc;
-  struct flag_record fr = {FR_GLOBAL, 0, 0, 0};
+  struct flag_record fr = {FR_GLOBAL, 0, 0};
 
   /* Reset connection attempts if we ain't called due to a failed link */
   if (!start)