* Removed compatability support for <= 1.1.9 userfiles (bot records).

svn: 1606

doc/UPDATES

@@ -12,6 +12,7 @@ This is a summary of ChangeLog basically.
 * Bots now unban bans that match *linked* bots, +m bans besides this will not be unset auto.
 * Fixed typo in help file (botconfig)
 * Fixed a leaked socket on failed address bind.
+* Removed compatability support for <= 1.1.9 userfiles (bot records).
 
 1.2
 * No longer displaying SALTS on ./bin -v

src/flags.h

@@ -61,8 +61,6 @@ struct flag_record {
 #define CHAN_VALID (flag_t) 0xfffffffffffff
 
 #define USER_ADMIN	FLAG[(int) 'a']
-/* FIXME; REMOVE AFTER 1.2 */
-#define USER_BOT	FLAG[(int) 'b']
 #define USER_CHANHUB	FLAG[(int) 'c']
 #define USER_DEOP	FLAG[(int) 'd']
 #define USER_EXEMPT	FLAG[(int) 'e']

src/mod/share.mod/share.c

@@ -389,11 +389,6 @@ share_newuser(int idx, char *par)
 
       fr.match = FR_GLOBAL;
       build_flags(s, &fr, 0);
-/* FIXME: remove after 1.2 */
-      if (fr.global & USER_BOT) {
-        isbot = 1;
-        fr.global &= ~USER_BOT;
-      }
 
       userlist = adduser(userlist, nick, host, pass, 0, isbot);
 

src/users.c

@@ -926,7 +926,6 @@ int readuserfile(const char *file, struct userrec **ret)
             fclose(f);
             return 0;
 	  } else {
-/* FIXME: remove after 1.2 */
             int isbot = 0;
 
             if (code[0] == '-') {
@@ -944,11 +943,6 @@ int readuserfile(const char *file, struct userrec **ret)
 	      break_down_flags(attr, &fr, 0);
 	      strcpy(lasthand, code);
 	      cst = NULL;
-/* FIXME: remove after 1.2 */
-              if (fr.global & USER_BOT) {	/* this should pick up the old +b flag for now */
-                isbot++;
-                fr.global &= ~USER_BOT;
-              }
               
 	      if (strlen(code) > HANDLEN)
 		code[HANDLEN] = 0;
@@ -985,7 +979,6 @@ int readuserfile(const char *file, struct userrec **ret)
     if (!u->bot && !egg_strcasecmp (u->handle, conf.bot->nick)) {
       putlog(LOG_MISC, "*", "(!) I have a user record, but am not classified as a BOT!");
       u->bot = 1;
-      /* u->flags |= USER_BOT; */
     }
 
     for (e = u->entries; e; e = e->next)