* Removed all the udef crap

svn: 911

src/cmds.c

@@ -2473,16 +2473,10 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
     if (user.match & FR_GLOBAL) {
       of = user.global;
       user.global = sanity_check((user.global |pls.global) &~mns.global);
-
-      user.udef_global = (user.udef_global | pls.udef_global)
-	& ~mns.udef_global;
     }
     if (chan) {
       ocf = user.chan;
-      user.chan = chan_sanity_check((user.chan | pls.chan) & ~mns.chan,
-				    user.global);
-
-      user.udef_chan = (user.udef_chan | pls.udef_chan) & ~mns.udef_chan;
+      user.chan = chan_sanity_check((user.chan | pls.chan) & ~mns.chan, user.global);
     }
     set_user_flagrec(u2, &user, par);
   }

src/flags.c

@@ -158,7 +158,9 @@ void break_down_flags(const char *string, struct flag_record *plus,
 	case 2:
 	  which->bot |= 1 << (*string - 'a');
 	}
-      } else if ((*string >= 'A') && (*string <= 'Z')) {
+      } 
+/* udef
+      else if ((*string >= 'A') && (*string <= 'Z')) {
 	switch (mode) {
 	case 0:
 	  which->udef_global |= 1 << (*string - 'A');
@@ -167,9 +169,10 @@ void break_down_flags(const char *string, struct flag_record *plus,
 	  which->udef_chan |= 1 << (*string - 'A');
 	  break;
 	}
-      } else if ((*string >= '0') && (*string <= '9')) {
+      } 
+      else if ((*string >= '0') && (*string <= '9')) {
 	switch (mode) {
-	  /* Map 0->9 to A->K for glob/chan so they are not lost */
+	  // Map 0->9 to A->K for glob/chan so they are not lost
 	case 0:
 	  which->udef_global |= 1 << (*string - '0');
 	  break;
@@ -181,15 +184,14 @@ void break_down_flags(const char *string, struct flag_record *plus,
 	  break;
 	}
       }
+*/
     }
     string++;
   }
   for (which = plus; which; which = (which == plus ? minus : 0)) {
     which->global &=USER_VALID;
 
-    which->udef_global &= 0x03ffffff;
     which->chan &= CHAN_VALID;
-    which->udef_chan &= 0x03ffffff;
     which->bot &= BOT_VALID;
   }
   plus->match |= flags;
@@ -200,7 +202,7 @@ void break_down_flags(const char *string, struct flag_record *plus,
   }
 }
 
-static int flag2str(char *string, int bot, int udef)
+static int flag2str(char *string, int bot)
 {
   char x = 'a', *old = string;
 
@@ -210,6 +212,7 @@ static int flag2str(char *string, int bot, int udef)
     x++;
     bot = bot >> 1;
   }
+/* udef
   x = 'A';
   while (udef && (x <= 'Z')) {
     if (udef & 1)
@@ -217,6 +220,7 @@ static int flag2str(char *string, int bot, int udef)
     udef = udef >> 1;
     x++;
   }
+*/
   if (string == old)
     *string++ = '-';
   return string - old;
@@ -247,13 +251,13 @@ int build_flags(char *string, struct flag_record *plus, struct flag_record *minu
   char *old = string;
 
   if (plus->match & FR_GLOBAL) {
-    if (minus && (plus->global || plus->udef_global))
+    if (minus && plus->global)
       *string++ = '+';
-    string += flag2str(string, plus->global, plus->udef_global);
+    string += flag2str(string, plus->global);
 
-    if (minus && (minus->global || minus->udef_global)) {
+    if (minus && minus->global) {
       *string++ = '-';
-      string += flag2str(string, minus->global, minus->udef_global);
+      string += flag2str(string, minus->global);
     }
   } else if (plus->match & FR_BOT) {
     if (minus && plus->bot)
@@ -267,12 +271,12 @@ 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))
       *string++ = (plus->match & FR_AND) ? '&' : '|';
-    if (minus && (plus->chan || plus->udef_chan))
+    if (minus && plus->chan)
       *string++ = '+';
-    string += flag2str(string, plus->chan, plus->udef_chan);
-    if (minus && (minus->chan || minus->udef_chan)) {
+    string += flag2str(string, plus->chan);
+    if (minus && minus->chan) {
       *string++ = '-';
-      string += flag2str(string, minus->global, minus->udef_chan);
+      string += flag2str(string, minus->global);
     }
   }
   if ((plus->match & (FR_BOT | FR_CHAN)) == (FR_BOT | FR_CHAN)) {
@@ -303,8 +307,7 @@ int flagrec_ok(struct flag_record *req, struct flag_record *have)
     int hav = have->global;
 
     /* Exception 1 - global +d/+k cant use -|-, unless they are +p */
-    if (!req->chan && !req->global && !req->udef_global &&
-	!req->udef_chan) {
+    if (!req->chan && !req->global) {
       if (!allow_dk_cmds) {
 	if (glob_party(*have))
 	  return 1;
@@ -324,10 +327,6 @@ int flagrec_ok(struct flag_record *req, struct flag_record *have)
       return 1;
     if (have->chan & req->chan)
       return 1;
-    if (have->udef_global & req->udef_global)
-      return 1;
-    if (have->udef_chan & req->udef_chan)
-      return 1;
     return 0;
   }
   return 0;			/* fr0k3 binding, dont pass it */
@@ -340,8 +339,6 @@ int flagrec_eq(struct flag_record *req, struct flag_record *have)
     if (req->match & FR_GLOBAL) {
       if ((req->global &have->global) !=req->global)
 	return 0;
-      if ((req->udef_global & have->udef_global) != req->udef_global)
-	return 0;
     }
     if (req->match & FR_BOT)
       if ((req->bot & have->bot) != req->bot)
@@ -349,19 +346,14 @@ int flagrec_eq(struct flag_record *req, struct flag_record *have)
     if (req->match & FR_CHAN) {
       if ((req->chan & have->chan) != req->chan)
 	return 0;
-      if ((req->udef_chan & have->udef_chan) != req->udef_chan)
-	return 0;
     }
     return 1;
   } else if (req->match & FR_OR) {
-    if (!req->chan && !req->global && !req->udef_chan &&
-	!req->udef_global && !req->bot)
+    if (!req->chan && !req->global && !req->bot)
       return 1;
     if (req->match & FR_GLOBAL) {
       if (have->global &req->global)
 	return 1;
-      if (have->udef_global & req->udef_global)
-	return 1;
     }
     if (req->match & FR_BOT)
       if (have->bot & req->bot)
@@ -369,8 +361,6 @@ int flagrec_eq(struct flag_record *req, struct flag_record *have)
     if (req->match & FR_CHAN) {
       if (have->chan & req->chan)
 	return 1;
-      if (have->udef_chan & req->udef_chan)
-	return 1;
     }
     return 0;
   }
@@ -389,7 +379,6 @@ void set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
   if (oldflags & FR_GLOBAL) {
     u->flags = fr->global;
 
-    u->flags_udef = fr->udef_global;
     if (!noshare && !(u->flags & USER_UNSHARED)) {
       fr->match = FR_GLOBAL;
       build_flags(buffer, fr, NULL);
@@ -413,7 +402,6 @@ void set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
     }
     if (cr && ch) {
       cr->flags = fr->chan;
-      cr->flags_udef = fr->udef_chan;
       if (!noshare && !(u->flags & USER_UNSHARED) && channel_shared(ch)) {
 	fr->match = FR_CHAN;
 	build_flags(buffer, fr, NULL);
@@ -431,15 +419,13 @@ void get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
   struct chanuserrec *cr = NULL;
 
   if (!u) {
-    fr->global = fr->udef_global = fr->chan = fr->udef_chan = fr->bot = 0;
+    fr->global = fr->chan = fr->bot = 0;
     return;
   }
   if (fr->match & FR_GLOBAL) {
     fr->global = u->flags;
-    fr->udef_global = u->flags_udef;
   } else {
     fr->global = 0;
-    fr->udef_global = 0;
   }
   if (fr->match & FR_BOT) {
     fr->bot = (long) get_user(&USERENTRY_BOTFL, u);
@@ -448,11 +434,9 @@ void get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
   if (fr->match & FR_CHAN) {
     if (fr->match & FR_ANYWH) {
       fr->chan = u->flags;
-      fr->udef_chan = u->flags_udef;
       for (cr = u->chanrec; cr; cr = cr->next)
 	if (findchan_by_dname(cr->channel)) {
 	  fr->chan |= cr->flags;
-	  fr->udef_chan |= cr->flags_udef;
 	}
     } else {
       if (chname)
@@ -461,10 +445,8 @@ void get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
 	    break;
       if (cr) {
 	fr->chan = cr->flags;
-	fr->udef_chan = cr->flags_udef;
       } else {
 	fr->chan = 0;
-	fr->udef_chan = 0;
       }
     }
   }

src/flags.h

@@ -16,6 +16,8 @@
 struct flag_record {
   int match;
   int global;
+/* FIXME: STRIP OUT UDEF FROM ALL FLAG_RECORD STRUCTS */
+/* FIXME: ALSO MAKE THESE LONG */
   int udef_global;
   int bot;
   int chan;

src/mod/channels.mod/channels.c

@@ -34,7 +34,6 @@
 
 static int 			use_info;
 static char 			glob_chanmode[64];		/* Default chanmode (drummer,990731) */
-static struct udef_struct 	*udef = NULL;
 static int 			global_stopnethack_mode;
 static int 			global_revenge_mode;
 static int 			global_idle_kick;		/* Default idle-kick setting. */
@@ -68,7 +67,6 @@ int 				killed_bots = 0;
 #include "cmdschan.c"
 #include "tclchan.c"
 #include "userchan.c"
-#include "udefchan.c"
 
 #ifdef S_AUTOLOCK
 #define kill_threshold (CFG_KILLTHRESHOLD.gdata ? atoi(CFG_KILLTHRESHOLD.gdata) : 0)
@@ -915,7 +913,6 @@ void channels_init()
   lastdeletedmask = 0;
   use_info = 1;
   strcpy(glob_chanmode, "nt");
-  udef = NULL;
   global_stopnethack_mode = 0;
   global_revenge_mode = 3;
   global_ban_time = 0;

src/mod/channels.mod/channels.h

@@ -6,10 +6,6 @@
 #ifndef _EGG_MOD_CHANNELS_CHANNELS_H
 #define _EGG_MOD_CHANNELS_CHANNELS_H
 
-/* User defined chanmodes/settings */
-#define UDEF_FLAG 1
-#define UDEF_INT 2
-
 #define MASKREASON_MAX	307	/* Max length of ban/invite/exempt/etc.
 				   reasons.				*/
 #define MASKREASON_LEN	(MASKREASON_MAX + 1)
@@ -17,28 +13,6 @@
 
 #ifdef MAKING_CHANNELS
 
-/* Structure for udef channel values. Udef setting have one such
- * structure for each channel where they have a defined value.
- */
-struct udef_chans {
-  struct udef_chans *next;	/* Ptr to next value.			*/
-  char *chan;			/* Dname of channel name.		*/
-  int value;			/* Actual value.			*/
-};
-
-/* Structure for user defined channel settings.
- */
-struct udef_struct {
-  struct udef_struct *next;	/* Ptr to next setting.			*/
-  char *name;			/* Name of setting.			*/
-  int defined;			/* Boolean that specifies whether this
-				   flag was defined by, e.g. a Tcl
-				   script yet.				*/
-  int type;			/* Type of setting: UDEF_FLAG, UDEF_INT	*/
-  struct udef_chans *values;	/* Ptr to linked list of udef channel
-				   structures.				*/
-};
-
 #define PLSMNS(x) (x ? '+' : '-')
 
 static void tell_bans(int idx, int show_inact, char *match);
@@ -50,14 +24,10 @@ static void tell_exempts (int idx, int show_inact, char * match);
 static void tell_invites (int idx, int show_inact, char * match);
 static void get_mode_protect(struct chanset_t *chan, char *s);
 static void set_mode_protect(struct chanset_t *chan, char *set);
-static int getudef(struct udef_chans *, char *);
-static void setudef(struct udef_struct *, char *, int);
 inline static int chanset_unlink(struct chanset_t *chan);
 
 #endif				/* MAKING_CHANNELS */
 
-int ngetudef(char *, char *);
-void initudef(int type, char *, int);
 void remove_channel(struct chanset_t *);
 void add_chanrec_by_handle(struct userrec *, char *, char *);
 void get_handle_chaninfo(char *, char *, char *);

src/mod/channels.mod/cmdschan.c

@@ -1114,8 +1114,7 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
 {
   char *chname = NULL, work[512] = "";
   struct chanset_t *chan = NULL;
-  int ii, tmp, cnt = 0;
-  struct udef_struct *ul = NULL;
+  int cnt = 0;
 
   if (!par[0]) {
     chname = dcc[idx].u.chat->con_chan;
@@ -1191,54 +1190,6 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
  * also include %ctemp in dprintf.
  */
 
-    ii = 1;
-    tmp = 0;
-    for (ul = udef; ul; ul = ul->next)
-      if (ul->defined && ul->type == UDEF_FLAG) {
-	int	work_len;
-
-        if (!tmp) {
-          dprintf(idx, "User defined channel flags:\n");
-          tmp = 1;
-        }
-	if (ii == 1)
-	  egg_snprintf(work, sizeof work, "    ");
-	work_len = strlen(work);
-        egg_snprintf(work + work_len, sizeof(work) - work_len, " %c%s",
-		     getudef(ul->values, chan->dname) ? '+' : '-', ul->name);
-        ii++;
-        if (ii > 4) {
-          dprintf(idx, "%s\n", work);
-          ii = 1;
-        }
-      }
-    if (ii > 1)
-      dprintf(idx, "%s\n", work);
-
-    work[0] = 0;
-    ii = 1;
-    tmp = 0;
-    for (ul = udef; ul; ul = ul->next)
-      if (ul->defined && ul->type == UDEF_INT) {
-	int	work_len = strlen(work);
-
-        if (!tmp) {
-          dprintf(idx, "User defined channel settings:\n");
-          tmp = 1;
-        }
-        egg_snprintf(work + work_len, sizeof(work) - work_len, "%s: %d   ",
-		     ul->name, getudef(ul->values, chan->dname));
-        ii++;
-        if (ii > 4) {
-          dprintf(idx, "%s\n", work);
-	  work[0] = 0;
-          ii = 1;
-        }
-      }
-    if (ii > 1)
-      dprintf(idx, "%s\n", work);
-
-
     work[0] = cnt = 0;
 /* Chanint template
  * SHOW_INT("Desc: ", integer, "YES", "NO");

src/mod/channels.mod/tclchan.c

@@ -285,13 +285,12 @@ int SplitList(char *resultBuf, const char *list, int *argcPtr, const char ***arg
  */
 int channel_modify(char *result, struct chanset_t *chan, int items, char **item)
 {
-  int i, x = 0, found;
+  int i, x = 0;
 #ifdef LEAF
   int old_status = chan->status,
       old_mode_mns_prot = chan->mode_mns_prot,
       old_mode_pls_prot = chan->mode_pls_prot;
 #endif /* LEAF */
-  struct udef_struct *ul = udef;
   char s[121] = "";
 
   for (i = 0; i < items; i++) {
@@ -589,46 +588,9 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item)
 	*ptime = 1;
       }
     } else {
-      if (!strncmp(item[i] + 1, "udef-flag-", 10))
-        initudef(UDEF_FLAG, item[i] + 11, 0);
-      else if (!strncmp(item[i], "udef-int-", 9))
-        initudef(UDEF_INT, item[i] + 9, 0);
-      found = 0;
-      for (ul = udef; ul; ul = ul->next) {
-        if (ul->type == UDEF_FLAG &&
-	     /* Direct match when set during .chanset ... */
-	    (!egg_strcasecmp(item[i] + 1, ul->name) ||
-	     /* ... or with prefix when set during chanfile load. */
-	     (!strncmp(item[i] + 1, "udef-flag-", 10) &&
-	      !egg_strcasecmp(item[i] + 11, ul->name)))) {
-          if (item[i][0] == '+')
-            setudef(ul, chan->dname, 1);
-          else
-            setudef(ul, chan->dname, 0);
-          found = 1;
-	  break;
-        } else if (ul->type == UDEF_INT &&
-		    /* Direct match when set during .chanset ... */
-		   (!egg_strcasecmp(item[i], ul->name) ||
-		    /* ... or with prefix when set during chanfile load. */
-		    (!strncmp(item[i], "udef-int-", 9) &&
-		     !egg_strcasecmp(item[i] + 9, ul->name)))) {
-          i++;
-          if (i >= items) {
-            if (result)
-              sprintf(result, "this setting needs an argument");
-            return ERROR;
-          }
-          setudef(ul, chan->dname, atoi(item[i]));
-          found = 1;
-	  break;
-        }
-      }
-      if (!found) {
-        if (result && item[i][0]) /* ignore "" */
-      	  sprintf(result, "illegal channel option: %s", item[i]);
-      	x++;
-      }
+      if (result && item[i][0]) /* ignore "" */
+        sprintf(result, "illegal channel option: %s", item[i]);
+      x++;
     }
   }
 #ifdef LEAF

src/mod/channels.mod/udefchan.c

@@ -1,84 +0,0 @@
-/*
- * udefchan.c -- part of channels.mod
- *   user definable channel flags/settings
- *
- */
-
-static int getudef(struct udef_chans *ul, char *name)
-{
-  int val = 0;
-
-  for (; ul; ul = ul->next)
-    if (!egg_strcasecmp(ul->chan, name)) {
-      val = ul->value;
-      break;
-    }
-  return val;
-}
-
-int ngetudef(char *name, char *chan)
-{
-  struct udef_struct *l = NULL;
-  struct udef_chans *ll = NULL;
-
-  for (l = udef; l; l = l->next)
-    if (!egg_strcasecmp(l->name, name)) {
-      for (ll = l->values; ll; ll = ll->next)
-        if (!egg_strcasecmp(ll->chan, chan))
-          return ll->value;
-      break;
-    }
-  return 0;
-}
-
-static void setudef(struct udef_struct *us, char *name, int value)
-{
-  struct udef_chans *ul = NULL, *ul_last = NULL;
-
-  for (ul = us->values; ul; ul_last = ul, ul = ul->next)
-    if (!egg_strcasecmp(ul->chan, name)) {
-      ul->value = value;
-      return;
-    }
-
-  ul = calloc(1, sizeof(struct udef_chans));
-  ul->chan = strdup(name);
-  ul->value = value;
-  ul->next = NULL;
-  if (ul_last)
-    ul_last->next = ul;
-  else
-    us->values = ul;
-}
-
-void initudef(int type, char *name, int defined)
-{
-  struct udef_struct *ul = NULL, *ul_last = NULL;
-
-  if (strlen(name) < 1)
-    return;
-  for (ul = udef; ul; ul_last = ul, ul = ul->next)
-    if (ul->name && !egg_strcasecmp(ul->name, name)) {
-      if (defined) {
-        debug1("UDEF: %s defined", ul->name);
-        ul->defined = 1;
-      }
-      return;
-    }
-
-  debug2("Creating %s (type %d)", name, type);
-  ul = calloc(1, sizeof(struct udef_struct));
-  ul->name = strdup(name);
-  if (defined)
-    ul->defined = 1;
-  else
-    ul->defined = 0;
-  ul->type = type;
-  ul->values = NULL;
-  ul->next = NULL;
-  if (ul_last)
-    ul_last->next = ul;
-  else
-    udef = ul;
-}
-

src/mod/channels.mod/userchan.c

@@ -30,7 +30,6 @@ struct chanuserrec *add_chanrec(struct userrec *u, char *chname)
     u->chanrec = ch;
     ch->info = NULL;
     ch->flags = 0;
-    ch->flags_udef = 0;
     ch->laston = 0;
     strncpy(ch->channel, chname, 81);
     ch->channel[80] = 0;

src/mod/irc.mod/irc.c

@@ -757,7 +757,6 @@ static void punish_badguy(struct chanset_t *chan, char *whobad,
       userlist = adduser(userlist, s1, s, "-", 0);
       fr.match = FR_CHAN;
       fr.chan = USER_DEOP;
-      fr.udef_chan = 0;
       u = get_user_by_handle(userlist, s1);
       if ((mx = ismember(chan, badnick)))
         mx->user = u;

src/mod/share.mod/share.c

@@ -1657,7 +1657,6 @@ static struct userrec *dup_userlist(int t)
 	(t == 2)) {
       p = get_user(&USERENTRY_PASS, u);
       u1 = adduser(NULL, u->handle, 0, p, u->flags);
-      u1->flags_udef = u->flags_udef;
       if (!nu)
 	nu = retu = u1;
       else {
@@ -1669,7 +1668,6 @@ static struct userrec *dup_userlist(int t)
 
 	if (z) {
 	  z->flags = ch->flags;
-	  z->flags_udef = ch->flags_udef;
 	  z->laston = ch->laston;
 	  set_handle_chaninfo(nu, nu->handle, ch->channel, ch->info);
 	}
@@ -1857,7 +1855,6 @@ Context;
 
       if (private_global) {
 	u->flags = u2->flags;
-	u->flags_udef = u2->flags_udef;
       } else {
 	int pgbm = private_globals_bitmask();
 
@@ -1904,7 +1901,6 @@ Context;
 	  ue->type->dup_user(u, u2, ue);
     } else if (!u2 && private_global) {
       u->flags = 0;
-      u->flags_udef = 0;
     } else
       u->flags = (u->flags & ~private_globals_bitmask());
   }
@@ -1992,7 +1988,6 @@ static void start_sending_users(int idx)
 	  fr.match = FR_GLOBAL;
 	  fr.global = u->flags;
 
-	  fr.udef_global = u->flags_udef;
 	  build_flags(s1, &fr, NULL);
 	  egg_snprintf(s2, sizeof s2, "s a %s %s\n", u->handle, s1);
 	  q_tbuf(dcc[idx].nick, s2, NULL);
@@ -2005,7 +2000,6 @@ static void start_sending_users(int idx)
 	      if (bot_chan(fr) || bot_global(fr)) {
 	        fr.match = FR_CHAN;
 	        fr.chan = ch->flags & ~BOT_SHARE;
-	        fr.udef_chan = ch->flags_udef;
 	        build_flags(s1, &fr, NULL);
 	        egg_snprintf(s2, sizeof s2, "s a %s %s %s\n", u->handle, s1,
 			     ch->channel);

src/userrec.c

@@ -292,7 +292,6 @@ int write_user(struct userrec *u, FILE * f, int idx)
   struct flag_record fr = {FR_GLOBAL, 0, 0, 0, 0, 0};
 
   fr.global = u->flags;
-  fr.udef_global = u->flags_udef;
   build_flags(s, &fr, NULL);
   if (lfprintf(f, "%-10s - %-24s\n", u->handle, s) == EOF)
     return 0;
@@ -307,7 +306,6 @@ int write_user(struct userrec *u, FILE * f, int idx)
       if ((fr.chan & BOT_SHARE) || (1)) {
 	fr.match = FR_CHAN;
 	fr.chan = ch->flags;
-	fr.udef_chan = ch->flags_udef;
 	build_flags(s, &fr, NULL);
 	if (lfprintf(f, "! %-20s %lu %-10s %s\n", ch->channel, ch->laston, s, ch->info ? ch->info : "") == EOF)
 	  return 0;
@@ -495,10 +493,8 @@ struct userrec *adduser(struct userrec *bu, char *handle, char *host, char *pass
   u->entries = NULL;
   if (flags != USER_DEFAULT) { /* drummer */
     u->flags = flags;
-    u->flags_udef = 0;
   } else {
     u->flags = default_flags;
-    u->flags_udef = default_uflags;
   }
   set_user(&USERENTRY_PASS, u, pass);
   /* Strip out commas -- they're illegal */
@@ -528,7 +524,6 @@ struct userrec *adduser(struct userrec *bu, char *handle, char *host, char *pass
     char x[100] = "";
 
     fr.global = u->flags;
-    fr.udef_global = u->flags_udef;
     build_flags(x, &fr, 0);
     shareout(NULL, "n %s %s %s %s\n", handle, host && host[0] ? host : "none", pass, x);
   }

src/users.c

@@ -458,7 +458,6 @@ void tell_user(int idx, struct userrec *u, int master)
   n = num_notes(u->handle);
 
   fr.global = u->flags;
-  fr.udef_global = u->flags_udef;
   build_flags(s, &fr, NULL);
   li = get_user(&USERENTRY_LASTON, u);
   if (!li || !li->laston)
@@ -507,7 +506,6 @@ void tell_user(int idx, struct userrec *u, int master)
         }
         fr.match = FR_CHAN;
         fr.chan = ch->flags;
-        fr.udef_chan = ch->flags_udef;
         build_flags(s, &fr, NULL);
         egg_snprintf(format, sizeof format, "%%%us  %%-18s %%-15s %%s\n", HANDLEN-9);
         dprintf(idx, format, " ", ch->channel, s, s1);
@@ -565,11 +563,9 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
     user.match = pls.match = FR_GLOBAL | FR_BOT | FR_CHAN;
     break_down_flags(mtch, &pls, &mns);
     mns.match = pls.match ^ (FR_AND | FR_OR);
-    if (!mns.global && !mns.udef_global && !mns.chan && !mns.udef_chan &&
-	!mns.bot) {
+    if (!mns.global && !mns.chan && !mns.bot) {
       nomns = 1;
-      if (!pls.global && !pls.udef_global && !pls.chan && !pls.udef_chan &&
-	  !pls.bot) {
+      if (!pls.global && !pls.chan && !pls.bot) {
 	/* happy now BB you weenie :P */
 	dprintf(idx, "Unknown flag specified for matching!!\n");
 	return;
@@ -788,7 +784,6 @@ int readuserfile(char *file, struct userrec **ret)
 		strncpyz(cr->channel, chname, 80);
 		cr->laston = atoi(st);
 		cr->flags = fr.chan;
-		cr->flags_udef = fr.udef_chan;
 		if (s[0]) {
                   cr->info = strdup(s);
 		} else
@@ -985,7 +980,6 @@ int readuserfile(char *file, struct userrec **ret)
               if (!egg_strcasecmp(code, conf.bot->nick))
                 conf.bot->u = u;
 
-	      u->flags_udef = fr.udef_global;
 	      /* if s starts with '/' it's got file info */
 	    }
 	  }

src/users.h

@@ -121,7 +121,7 @@ struct chanuserrec {
   char channel[81];
   time_t laston;
   unsigned long flags;
-  unsigned long flags_udef;
+  /* FIXME:rem unsigned long flags_udef; */
   char *info;
 };
 
@@ -131,7 +131,7 @@ struct userrec {
   struct userrec *next;
   char handle[HANDLEN + 1];
   unsigned long flags;
-  unsigned long flags_udef;
+  /* FIXME: rem unsigned long flags_udef; */
   struct chanuserrec *chanrec;
   struct user_entry *entries;
 };