From 68b54f3fb540ab16294fbc5ed49705a44743f829 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 19 Jun 2010 13:39:12 -0400 Subject: Made db-converter only write mlock params if there really is one, fixes some problems with converting mlock for certain databases --- src/tools/db-convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools') diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c index 4e3d01034..2866079b3 100644 --- a/src/tools/db-convert.c +++ b/src/tools/db-convert.c @@ -854,16 +854,16 @@ 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_flood || ci->mlock_redirect) + 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) + if (ci->mlock_key && *ci->mlock_key) fs << " CMODE_KEY " << ci->mlock_key; - if (ci->mlock_flood) + if (ci->mlock_flood && *ci->mlock_flood) fs << " CMODE_FLOOD " << ci->mlock_flood; - if (ci->mlock_redirect) + if (ci->mlock_redirect && *ci->mlock_redirect) fs << " CMODE_REDIRECT " << ci->mlock_redirect; fs << std::endl; } -- cgit From 448eadd74709ac46181b0c79ca65b6b1b14c9555 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 19 Jun 2010 20:53:53 -0400 Subject: Made db-converter add all of the core clients when converting a 1.8 database --- src/tools/db-convert.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/tools') diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c index 2866079b3..0b1a49c1e 100644 --- a/src/tools/db-convert.c +++ b/src/tools/db-convert.c @@ -497,6 +497,37 @@ int main(int argc, char *argv[]) } if (input == "y") broken = 1; + input = ""; + while (input != "y" && input != "n") + { + std::cout << std::endl << "Are you converting a 1.8.x database? (y/n) " << std::endl << "? "; + std::cin >> input; + } + /* 1.8 doesn't have nickserv etc in bot.db, create them */ + if (input == "y") + { + time_t now = time(NULL); + fs << "BI NickServ NickServ services.anope.org " << now << " 0 :NickServ" << std::endl; + fs << "MD FLAGS NICKSERV" << std::endl; + + fs << "BI ChanServ ChanServ services.anope.org " << now << " 0 :ChanServ" << std::endl; + fs << "MD FLAGS CHANSERV" << std::endl; + + fs << "BI BotServ BotServ services.anope.org " << now << " 0 :BotServ" << std::endl; + fs << "MD FLAGS BOTSERV" << std::endl; + + fs << "BI HostServ HostServ services.anope.org " << now << " 0 :HostServ" << std::endl; + fs << "MD FLAGS HOSTSERV" << std::endl; + + fs << "BI OperServ OperServ services.anope.org " << now << " 0 :OperServ" << std::endl; + fs << "MD FLAGS OPERSERV" << std::endl; + + fs << "BI MemoServ MemoServ services.anope.org " << now << " 0 :MemoServ" << std::endl; + fs << "MD FLAGS MEMOSERV" << std::endl; + + fs << "BI Global Global services.anope.org " << now << " 0: Global" << std::endl; + fs << "MD FLAGS GLOBAL" << std::endl; + } while ((c = getc_db(f)) == 1) { READ(read_string(&nick, f)); -- cgit