* +O now implies +o

svn: 2004

doc/UPDATES

@@ -72,6 +72,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Fixed some excess newlines when a user is booted for losing hub/leaf access.
 * cmd_find now optional takes a username instead of a nick!user@host to search for.
 * Fixed unsetting a global ban when the same ban is local to a chan causes the bots to unban it. (#24)
+* +O now implies +o
 
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.

src/flags.c

@@ -45,13 +45,14 @@ sanity_check(flag_t atr, int bot)
 /* only bots should be there: */
   if (!bot && (atr & (USER_DOLIMIT | USER_DOVOICE | USER_UPDATEHUB | USER_CHANHUB)))
     atr &= ~(USER_DOLIMIT | USER_DOVOICE | USER_UPDATEHUB | USER_CHANHUB);
+  if (atr & USER_AUTOOP)
+    atr |= USER_OP;
   if ((atr & USER_OP) && (atr & USER_DEOP))
     atr &= ~(USER_OP | USER_DEOP);
   if ((atr & USER_AUTOOP) && (atr & USER_DEOP))
     atr &= ~(USER_AUTOOP | USER_DEOP);
   if ((atr & USER_VOICE) && (atr & USER_QUIET))
     atr &= ~(USER_VOICE | USER_QUIET);
-
   /* Can't be admin without also being owner and having hub access */
   if (atr & USER_ADMIN)
     atr |= USER_OWNER | USER_HUBA | USER_PARTY;