diff options
| author | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
|---|---|---|
| committer | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
| commit | 5933a5e9b1ade9f926145b67e557b87ae6dd6e8f (patch) | |
| tree | 41c9c8b4c1818531251c292ce184601a8721aed4 /modules/database/db_old.cpp | |
| parent | f1c5c27f3fda90265d5da8205db1bdd4d12c9851 (diff) | |
| parent | 109d8f431f3d25d56570a6aaa1af957867bbb80e (diff) | |
Merge remote branch 'upstream/2.0' into 2.0
Diffstat (limited to 'modules/database/db_old.cpp')
| -rw-r--r-- | modules/database/db_old.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 8c322d02e..8fe57cfdd 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -620,9 +620,18 @@ static void LoadNicks() if (tmpu16 & OLD_NS_VERBOTEN) { if (!forbid) + { + delete nc; + continue; + } + + if (nc->display.find_first_of("?*") != Anope::string::npos) + { + delete nc; continue; + } - ForbidData *d = new ForbidData(); + ForbidData *d = forbid->CreateForbid(); d->mask = nc->display; d->creator = last_usermask; d->reason = last_realname; @@ -783,7 +792,7 @@ static void LoadChannels() if (tmpu32 & OLD_CI_SECURE) ci->Extend<bool>("CS_SECURE"); if (tmpu32 & OLD_CI_NO_EXPIRE) - ci->Extend<bool>("CI_NO_EXPIRE"); + ci->Extend<bool>("CS_NO_EXPIRE"); if (tmpu32 & OLD_CI_MEMO_HARDMAX) ci->Extend<bool>("MEMO_HARDMAX"); if (tmpu32 & OLD_CI_SECUREFOUNDER) @@ -1029,9 +1038,18 @@ static void LoadChannels() if (forbid_chan) { if (!forbid) + { + delete ci; + continue; + } + + if (ci->name.find_first_of("?*") != Anope::string::npos) + { + delete ci; continue; + } - ForbidData *d = new ForbidData(); + ForbidData *d = forbid->CreateForbid(); d->mask = ci->name; d->creator = forbidby; d->reason = forbidreason; |