diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.c | 2 | ||||
| -rw-r--r-- | src/config.c | 4 | ||||
| -rw-r--r-- | src/core/ns_info.c | 2 | ||||
| -rw-r--r-- | src/core/ns_set.c | 4 | ||||
| -rw-r--r-- | src/tools/db-convert.c | 3 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/channels.c b/src/channels.c index 62dfc797b..87527fcb7 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1499,7 +1499,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes) Alog(LOG_DEBUG) << "Setting correct user modes for " << user->nick << " on " << c->name << " (" << (give_modes ? "" : "not ") << "giving modes)"; - if (give_modes && !get_ignore(user->nick.c_str()) && (!user->Account() || !user->Account()->HasFlag(NI_AUTOOP))) + if (give_modes && !get_ignore(user->nick.c_str()) && (!user->Account() || user->Account()->HasFlag(NI_AUTOOP))) { if (owner && check_access(user, ci, CA_AUTOOWNER)) c->SetMode(NULL, CMODE_OWNER, user->nick); diff --git a/src/config.c b/src/config.c index f023d07c2..6216a6afc 100644 --- a/src/config.c +++ b/src/config.c @@ -1550,7 +1550,6 @@ int read_config(int reload) Config.NSDefFlags.SetFlag(NI_MEMO_RECEIVE); } else if (NSDefaults != "none") { - bool hadAutoop = false; spacesepstream options(NSDefaults); std::string option; while (options.GetToken(option)) @@ -1568,9 +1567,8 @@ int read_config(int reload) else if (option == "hidequit") Config.NSDefFlags.SetFlag(NI_HIDE_QUIT); else if (option == "memosignon") Config.NSDefFlags.SetFlag(NI_MEMO_SIGNON); else if (option == "memoreceive") Config.NSDefFlags.SetFlag(NI_MEMO_RECEIVE); - else if (option == "autoop") hadAutoop = true; + else if (option == "autoop") Config.NSDefFlags.SetFlag(NI_AUTOOP); } - if (!hadAutoop) Config.NSDefFlags.SetFlag(NI_AUTOOP); } if (reload) { diff --git a/src/core/ns_info.c b/src/core/ns_info.c index d40b07506..beb61905a 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -156,7 +156,7 @@ class CommandNSInfo : public Command CheckOptStr(optbuf, NI_SECURE, getstring(u, NICK_INFO_OPT_SECURE), na->nc); CheckOptStr(optbuf, NI_PRIVATE, getstring(u, NICK_INFO_OPT_PRIVATE), na->nc); CheckOptStr(optbuf, NI_MSG, getstring(u, NICK_INFO_OPT_MSG), na->nc); - CheckOptStr(optbuf, NI_AUTOOP, getstring(u, NICK_INFO_OPT_AUTOOP), na->nc, true); + CheckOptStr(optbuf, NI_AUTOOP, getstring(u, NICK_INFO_OPT_AUTOOP), na->nc); notice_lang(Config.s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str()); diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 58e2ae4e1..6bbe5c2e4 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -431,12 +431,12 @@ class CommandNSSet : public Command **/ if (param == "ON") { - nc->UnsetFlag(NI_AUTOOP); + nc->SetFlag(NI_AUTOOP); notice_lang(Config.s_NickServ, u, NICK_SET_AUTOOP_ON); } else if (param == "OFF") { - nc->SetFlag(NI_AUTOOP); + nc->UnsetFlag(NI_AUTOOP); notice_lang(Config.s_NickServ, u, NICK_SET_AUTOOP_OFF); } else diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c index 9133799a4..a94077291 100644 --- a/src/tools/db-convert.c +++ b/src/tools/db-convert.c @@ -418,7 +418,8 @@ int main(int argc, char *argv[]) << ((nc->flags & NI_MEMO_MAIL ) ? "MEMO_MAIL " : "") << ((nc->flags & NI_HIDE_STATUS ) ? "HIDE_STATUS " : "") << ((nc->flags & NI_SUSPENDED ) ? "SUSPENDED " : "") - << ((nc->flags & NI_AUTOOP ) ? "AUTOOP " : "") + // in 1.8, the AUTOOP flag was set to disable AUTOOP. Now we enable it. --DP + << (!(nc->flags & NI_AUTOOP ) ? "AUTOOP " : "") << ((nc->flags & NI_FORBIDDEN ) ? "FORBIDDEN " : "") << std::endl; if (nc->memos.memocount) { |