* Ported [2450] to 1.2.9

svn: 2599

doc/UPDATES

@@ -28,6 +28,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Took out all punish/revenge code, it's been disabled since 1.2.7 anyway.
 * Fixed bots giving up on joining juped channels (may be due to split) (#168)
 * Fixed cmdpass list getting desynced during userfile transfer. (#143)
+* Removed old compatability code for converting CONFIG->SET during userfile loading.
 
 1.2.8
 * Fixed [bot]* cmds depending on case of botnicks.

src/userent.c

@@ -1025,8 +1025,7 @@ struct user_entry_type *find_entry_type(char *name)
   struct user_entry_type *p = NULL;
 
   for (p = entry_type_list; p; p = p->next) {
-/* FIXME: remove after 1.2.3 */
-    if (!egg_strcasecmp(name, p->name) || (!egg_strcasecmp(name, "CONFIG") && !egg_strcasecmp(p->name, "SET")))
+    if (!egg_strcasecmp(name, p->name))
       return p;
   }
   return NULL;
@@ -1037,10 +1036,7 @@ struct user_entry *find_user_entry(struct user_entry_type *et, struct userrec *u
   struct user_entry **e = NULL, *t = NULL;
 
   for (e = &(u->entries); *e; e = &((*e)->next)) {
-/* FIXME: remove after 1.2.3 */
-    if (((*e)->type == et) ||
-	((*e)->name && (!egg_strcasecmp((*e)->name, et->name) ||
-        ((*e)->name && et->name && !egg_strcasecmp((*e)->name, "CONFIG") && !egg_strcasecmp(et->name, "SET"))))) {
+    if (((*e)->type == et) || ((*e)->name && !egg_strcasecmp((*e)->name, et->name))) {
       t = *e;
       *e = t->next;
       t->next = u->entries;

src/users.c

@@ -628,8 +628,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	    else if (lasthand[0] == '*') {
 	      if (lasthand[1] == IGNORE_NAME[1])
 		restore_ignore(s);
-/* FIXME: remove after 1.2.3 */
-              else if (lasthand[1] == SET_NAME[1] || lasthand[1] == 'C') {
+              else if (lasthand[1] == SET_NAME[1]) {
                 set_cmd_pass(s, 0);		/* no need to share here, if we have a new userfile
 						 * then leaf bots under us also get the new userfile */
               }
@@ -657,8 +656,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	    } else if (lasthand[0] == '*') {
 	      if (lasthand[1] == INVITE_NAME[1]) {
                 restore_chanmask('I', NULL, s);
-/* FIXME: Remove after 1.2.3 */
-              } else if (lasthand[1] == SET_NAME[1] || lasthand[1] == 'C') {
+              } else if (lasthand[1] == SET_NAME[1]) {
                 var_userfile_share_line(s, -1, 0);
               }
             }
@@ -781,9 +779,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	    int ok = 0;
 
 	    for (ue = u->entries; ue && !ok; ue = ue->next)
-/* FIXME: remove after 1.2.3 */
-	      if (ue->name && (!egg_strcasecmp(code + 2, ue->name) ||
-                (!egg_strcasecmp(code + 2, "CONFIG") && !egg_strcasecmp(ue->name, "SET")))) {
+	      if (ue->name && !egg_strcasecmp(code + 2, ue->name)) {
 		struct list_type *list = NULL;
 
 		list = (struct list_type *) my_calloc(1, sizeof(struct list_type));
@@ -823,8 +819,7 @@ int readuserfile(const char *file, struct userrec **ret)
         } else if (!rfc_casecmp(code, CHANS_NAME)) {
           strcpy(lasthand, code);
           u = NULL;
-/* FIXME: remove after 1.2.3 */
-        } else if (!rfc_casecmp(code, SET_NAME) || !rfc_casecmp(code, "*Config")) {
+        } else if (!rfc_casecmp(code, SET_NAME)) {
           strcpy(lasthand, code);
           u = NULL;  
 	} else if (code[0] == '*') {