diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/mysql.c | 7 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,6 @@ Anope Version S V N -------------------- +12/30 F Grouped root nicks could result in loss of power when using MySQL.[#812] Anope Version 1.7.20 diff --git a/src/mysql.c b/src/mysql.c index 434caa981..568dc7a99 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1742,6 +1742,10 @@ int db_mysql_load_ns_dbase(void) if (nc->flags & NI_SERVICES_OPER) slist_add(&servopers, nc); + /* Unset the SERVICES_ROOT flag; we will set it again later if this + * user is really a services root (checked per NickAlias) -GD + */ + nc->flags &= ~NI_SERVICES_ROOT; /* Get info from other tables; we'll need the display */ q_display = db_mysql_quote(nc->display); @@ -1847,8 +1851,7 @@ int db_mysql_load_ns_dbase(void) /* Assign to the nickcore aliases */ slist_add(&na->nc->aliases, na); - /* Make sure the SERVICES_ROOT flag is only set for services roots */ - na->nc->flags &= ~NI_SERVICES_ROOT; + /* Check if this user is a services root */ for (i = 0; i < RootNumber; i++) { if (stricmp(ServicesRoots[i], na->nick) == 0) na->nc->flags |= NI_SERVICES_ROOT; diff --git a/version.log b/version.log index f75576844..bd5161441 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="20" VERSION_EXTRA="-svn" -VERSION_BUILD="1325" +VERSION_BUILD="1328" # $Log$ # +# BUILD : 1.7.20 (1328) +# BUGS : 812 +# NOTES : Fixed a bug where multiple grouped nicks and not all of them listed in ServicesRoot could result in services roots not becoming services root when using MySQL +# # BUILD : 1.7.20 (1325) # BUGS : # NOTES : Development Framework |