diff options
| author | Adam <Adam@anope.org> | 2011-01-18 18:47:08 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-01-18 19:28:34 -0500 |
| commit | 0db220812fbeb318778a99357c70403c9d00721a (patch) | |
| tree | 928ccc5812bfcc477ce9dd30c62ef1e8d74387e5 | |
| parent | a2f5edf97722a6b5eaa9f7241f1bc6c041964d3e (diff) | |
Bug #1232 - Fixed db-convert to properly convert mode lock parameters
(cherry picked from commit e7a8bcc30ba5bef41b7f59386856b813b7979532)
| -rw-r--r-- | src/tools/db-convert.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/tools/db-convert.cpp b/src/tools/db-convert.cpp index 714881e17..256b36579 100644 --- a/src/tools/db-convert.cpp +++ b/src/tools/db-convert.cpp @@ -859,19 +859,14 @@ int main(int argc, char *argv[]) process_mlock_modes(fs, ci->mlock_off, ircd); fs << std::endl; } - if (ci->mlock_limit || (ci->mlock_key && *ci->mlock_key) || (ci->mlock_flood && *ci->mlock_flood) || (ci->mlock_redirect && *ci->mlock_redirect)) - { - fs << "MD MLP"; - if (ci->mlock_limit) - fs << " CMODE_LIMIT " << ci->mlock_limit; - if (ci->mlock_key && *ci->mlock_key) - fs << " CMODE_KEY " << ci->mlock_key; - if (ci->mlock_flood && *ci->mlock_flood) - fs << " CMODE_FLOOD " << ci->mlock_flood; - if (ci->mlock_redirect && *ci->mlock_redirect) - fs << " CMODE_REDIRECT " << ci->mlock_redirect; - fs << std::endl; - } + if (ci->mlock_limit) + fs << "MD MLP CMODE_LIMIT " << ci->mlock_limit << std::endl; + if (ci->mlock_key && *ci->mlock_key) + fs << "MD MLP CMODE_KEY " << ci->mlock_key << std::endl; + if (ci->mlock_flood && *ci->mlock_flood) + fs << "MD MLP CMODE_FLOOD " << ci->mlock_flood << std::endl; + if (ci->mlock_redirect && *ci->mlock_redirect) + fs << "MD MLP CMODE_REDIRECT " << ci->mlock_redirect << std::endl; if (ci->memos.memocount) { Memo *memos = ci->memos.memos; |