summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in6
-rwxr-xr-xconfigure20
-rw-r--r--configure.in6
-rw-r--r--data/example.conf57
-rw-r--r--include/extern.h55
-rw-r--r--include/services.h18
-rw-r--r--include/sysconf.h.in6
-rw-r--r--install.js6
-rw-r--r--makefile.inc.win327
-rw-r--r--src/Makefile16
-rw-r--r--src/botserv.c34
-rw-r--r--src/chanserv.c94
-rw-r--r--src/config.c2
-rw-r--r--src/core/ns_group.c10
-rw-r--r--src/hostserv.c48
-rw-r--r--src/init.c116
-rw-r--r--src/main.c59
-rw-r--r--src/makefile.win324
-rw-r--r--src/mypasql.c122
-rw-r--r--src/mysql.c1890
-rw-r--r--src/news.c31
-rw-r--r--src/nickserv.c164
-rw-r--r--src/operserv.c65
-rw-r--r--src/rdb.c496
-rw-r--r--src/sessions.c29
25 files changed, 53 insertions, 3308 deletions
diff --git a/Makefile.in b/Makefile.in
index f30f5695e..54b4de65e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,8 +12,6 @@ RM=@RM@
CP=@CP@
TOUCH=@TOUCH@
MODULE_PATH=@MODULE_PATH@
-MYSQL=@MYSQL@
-RDB=@RDB@
LDFLAGS=@LDFLAGS@
RUNGROUP=@RUNGROUP@
SHARED=@SHARED@
@@ -26,8 +24,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
- 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' 'RDB=${RDB}'\
- 'MYSQL=${MYSQL}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}'
+ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
build: language headers
@${MAKE} -C src ${MAKEARGS} all
diff --git a/configure b/configure
index 5090a5a78..86160fb7d 100755
--- a/configure
+++ b/configure
@@ -662,8 +662,6 @@ CP
TOUCH
INSTALL
MYSQLCONF
-MYSQL
-RDB
ANOPELIBS
CPP
GREP
@@ -3321,20 +3319,6 @@ fi
echo $ac_cv_mysql_valid >&6
if test "$ac_cv_mysql_valid" = "yes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define USE_MYSQL 1
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define USE_RDB 1
-_ACEOF
-
- MYSQL=" mysql.c "
- RDB=" rdb.c "
-
-
DIS_MYSQL=" MySQL: Yes"
else
CFLAGS="$hold_cflags"
@@ -8473,8 +8457,6 @@ CP!$CP$ac_delim
TOUCH!$TOUCH$ac_delim
INSTALL!$INSTALL$ac_delim
MYSQLCONF!$MYSQLCONF$ac_delim
-MYSQL!$MYSQL$ac_delim
-RDB!$RDB$ac_delim
ANOPELIBS!$ANOPELIBS$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
@@ -8489,7 +8471,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 4a880af7d..37e618448 100644
--- a/configure.in
+++ b/configure.in
@@ -112,12 +112,6 @@ int main()
], ac_cv_mysql_valid=yes, ac_cv_mysql_valid=no)
echo $ac_cv_mysql_valid >&6
if test "$ac_cv_mysql_valid" = "yes"; then
- AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql")
- AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB")
- MYSQL=" mysql.c "
- RDB=" rdb.c "
- AC_SUBST(MYSQL)
- AC_SUBST(RDB)
DIS_MYSQL=" MySQL: Yes"
else
CFLAGS="$hold_cflags"
diff --git a/data/example.conf b/data/example.conf
index b6cd27bb9..0ef511d15 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1456,63 +1456,6 @@ OSOpersOnly
###########################################################################
#
-# MySQL configuration
-#
-###########################################################################
-#
-# Mysql [OPTIONAL]
-#
-# Your MySQL configuration for use with Anope.
-# To disable MySQL functionality, just comment out this block.
-# To make use of MySQL use these directives and change their
-# setting to the appropriate values.
-#
-# MysqlHost defines the Mysql server hostname.
-# MysqlUser defines the Mysql user to log in with.
-# MysqlPass defines the Mysql pass required for the specified user to log in.
-# MysqlName defines the Mysql database name Anope uses
-# MysqlSock defines the Mysql UNIX socket
-# MysqlPort defines the Mysql TCP port
-#
-#MysqlHost "localhost"
-#MysqlUser "Anonymous"
-#MysqlPass ""
-#MysqlName "anope"
-#MysqlSock "/tmp/mysql.sock"
-#MysqlPort 3306
-
-# MysqlSecure "<des>|<md5>|<sha>|<key>" [OPTIONAL]
-#
-# Method for storing passwords on MySQL. Available methods are:
-# Empty or not set will save your passwords as clear text.
-# des : Encrypt using a simple DES algorithm.
-# md5 : Produces the md5 hash for the password.
-# sha : Calculates the checksum using a Secure Hash Algorithm.
-# key : Encodes using "key" as password.
-# Please read docs/MYSQL file for more info and details.
-#
-#MysqlSecure ""
-
-
-# MysqlRetries <value> [OPTIONAL]
-# MysqlRetryGap <value> [OPTIONAL]
-#
-# These values let you define how often and with how much interruption Anope
-# shall retry to open a connection when losing the contact to the mysql db.
-# The product of these values must be between 1 and 60.
-#
-#MysqlRetries 10
-#MysqlRetryGap 1
-
-# UseRDB [OPTIONAL]
-#
-# Enable this if you want anope to load its data from a remote database.
-# (e.g. MySQL)
-#
-#UseRDB
-
-###########################################################################
-#
# Module configuration
#
###########################################################################
diff --git a/include/extern.h b/include/extern.h
index 0e605d7bb..7f58ce3c1 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -70,7 +70,6 @@ E void botmsgs(User *u, BotInfo *bi, char *buf);
E void botchanmsgs(User *u, ChannelInfo *ci, char *buf);
E void load_bs_dbase(void);
E void save_bs_dbase(void);
-E void save_bs_rdb_dbase(void);
E BotInfo *findbot(const char *nick);
E void bot_join(ChannelInfo *ci);
E char *normalizeBuffer(const char *);
@@ -168,7 +167,6 @@ E void cs_init(void);
E void chanserv(User * u, char *buf);
E void load_cs_dbase(void);
E void save_cs_dbase(void);
-E void save_cs_rdb_dbase(void);
E void expire_chans(void);
E void cs_remove_nick(const NickCore * nc);
@@ -265,7 +263,6 @@ E char *desc_HostServ;
E char *s_HostServ;
E void load_hs_dbase(void);
E void save_hs_dbase(void);
-E void save_hs_rdb_dbase(void);
E int do_on_id(User * u);
E void delHostCore(char *nick);
E void hostserv(User * u, char *buf);
@@ -456,49 +453,6 @@ E char *UlineServers;
E char **Ulines;
E int NumUlines;
-#ifdef USE_RDB
-E int rdb_init();
-E int rdb_open();
-E int rdb_close();
-E char *rdb_quote(char *str);
-E int rdb_tag_table(const char* table);
-E int rdb_tag_table_where(const char* table, const char* clause);
-E int rdb_empty_table(const char* table);
-E int rdb_clean_table(const char* table);
-E int rdb_clean_table_where(const char* table, const char* clause);
-E int rdb_scrub_table(const char* table, const char* clause);
-E int rdb_direct_query(char *query);
-E int rdb_ns_set_display(char *newnick, char *oldnick);
-E int rdb_save_ns_core(NickCore * nc);
-E int rdb_save_ns_alias(NickAlias * na);
-E int rdb_save_ns_req(NickRequest * nr);
-E int rdb_save_cs_info(ChannelInfo * ci);
-E int rdb_save_bs_core(BotInfo * bi);
-E int rdb_save_bs_rdb_core(BotInfo * bi);
-E int rdb_save_hs_core(HostCore * hc);
-E int rdb_save_os_db(unsigned int maxucnt, unsigned int maxutime,
- SList * ak, SList * sgl, SList * sql, SList * szl);
-E int rdb_save_news(NewsItem * ni);
-E int rdb_save_exceptions(Exception * e);
-E int rdb_load_bs_dbase(void);
-E int rdb_load_hs_dbase(void);
-E int rdb_load_ns_dbase(void);
-E int rdb_load_dbases(void);
-#endif
-
-#ifdef USE_MYSQL
-E char *MysqlHost;
-E char *MysqlUser;
-E char *MysqlPass;
-E char *MysqlName;
-E int MysqlPort;
-E char *MysqlSock;
-E char *MysqlSecure;
-E int MysqlRetries;
-E int MysqlRetryGap;
-E int UseRDB;
-#endif
-
E int read_config(int reload);
E int DefConLevel;
@@ -644,10 +598,6 @@ E int nothird;
E int noexpire;
E int protocoldebug;
-#ifdef USE_RDB
-E int do_mysql;
-#endif
-
E int is44;
E int quitting;
E int delayed_quit;
@@ -773,7 +723,6 @@ E NewsItem *news;
E void get_news_stats(long *nrec, long *memuse);
E void load_news(void);
E void save_news(void);
-E void save_rdb_news(void);
E void display_news(User * u, int16 type);
E int do_logonnews(User * u);
E int do_opernews(User * u);
@@ -805,8 +754,6 @@ E void load_ns_dbase(void);
E void load_ns_req_db(void);
E void save_ns_dbase(void);
E void save_ns_req_dbase(void);
-E void save_ns_rdb_dbase(void);
-E void save_ns_req_rdb_dbase(void);
E int validate_user(User * u);
E void cancel_user(User * u);
E int nick_identified(User * u);
@@ -841,7 +788,6 @@ E void operserv(User *u, char *buf);
E void os_init(void);
E void load_os_dbase(void);
E void save_os_dbase(void);
-E void save_os_rdb_dbase(void);
E void os_remove_nick(NickCore *nc);
E int is_services_root(User *u);
@@ -952,7 +898,6 @@ E void del_session(const char *host);
E void load_exceptions(void);
E void save_exceptions(void);
-E void save_rdb_exceptions(void);
E int do_exception(User *u);
E void expire_exceptions(void);
diff --git a/include/services.h b/include/services.h
index 5a6bcc8a2..67646ee90 100644
--- a/include/services.h
+++ b/include/services.h
@@ -108,24 +108,6 @@
#define vsnprintf _vsnprintf
#endif
-#ifdef USE_RDB
-# define MAX_SQL_BUF 4096
-#endif
-
-#ifdef USE_MYSQL
-# define MYSQL_WARNING 2
-# define MYSQL_ERROR 4
-# define MYSQL_DEFAULT_PORT 3306
-#ifdef MYSQL_HEADER_PREFIX
-# include <mysql/mysql.h>
-# include <mysql/errmsg.h>
-#else
-# define NO_CLIENT_LONG_LONG
-# include <mysql.h>
-# include <errmsg.h>
-#endif
-#endif
-
#if HAVE_STRINGS_H
# include <strings.h>
#endif
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index 8c0f63f56..f7de31677 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -120,12 +120,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* "Use Mysql" */
-#undef USE_MYSQL
-
-/* "Use RDB" */
-#undef USE_RDB
-
/* Define to `short' if <sys/types.h> does not define. */
#undef int16_t
diff --git a/install.js b/install.js
index e3f46a865..57e7cbdc2 100644
--- a/install.js
+++ b/install.js
@@ -54,11 +54,7 @@ var installerQuestions = [
f.WriteLine("MYSQL_LIB_PATH=/LIBPATH:$(MYSQL_LIB)");
f.WriteLine("BASE_CFLAGS=$(BASE_CFLAGS) /I $(MYSQL_INC)");
f.WriteLine("MYSQL_INC_PATH=/I $(MYSQL_INC)");
- f.WriteLine("RDB_C=rdb.c");
- f.WriteLine("RDB_O=rdb.obj");
- f.WriteLine("MYSQL_C=mysql.c");
- f.WriteLine("MYSQL_O=mysql.obj");
- f.WriteLine("BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H");
+ f.WriteLine("BASE_CFLAGS=/D $(BASE_CFLAGS)");
f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) /DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib");
f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib");
}
diff --git a/makefile.inc.win32 b/makefile.inc.win32
index aa81608ac..75567aa2a 100644
--- a/makefile.inc.win32
+++ b/makefile.inc.win32
@@ -64,12 +64,7 @@ MYSQL_LIB_PATH=/LIBPATH:$(MYSQL_LIB)
BASE_CFLAGS=$(BASE_CFLAGS) /I $(MYSQL_INC)
MYSQL_INC_PATH=/I $(MYSQL_INC)
!ENDIF
-RDB_C=rdb.c
-RDB_O=rdb.obj
-
-MYSQL_C=mysql.c
-MYSQL_O=mysql.obj
-BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H
+BASE_CFLAGS=$(BASE_CFLAGS)
MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) \
/DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib
diff --git a/src/Makefile b/src/Makefile
index 3d7122c5f..ccd6a3be2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,15 +1,11 @@
-MYSQL_OBJ = $(MYSQL:.c=.o)
-RDB_OBJ = $(RDB:.c=.o)
OBJS = actions.o base64.o bots.o botserv.o channels.o chanserv.o commands.o compat.o \
config.o datafiles.o encrypt.o events.o hashcomp.o helpserv.o hostserv.o init.o ircd.o language.o log.o mail.o main.o \
memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \
- process.o send.o servers.o sessions.o slist.o sockutil.o timeout.o users.o \
- $(RDB_OBJ) $(MYSQL_OBJ)
+ process.o send.o servers.o sessions.o slist.o sockutil.o timeout.o users.o
SRCS = actions.c base64.c bots.cpp botserv.c channels.c chanserv.c commands.c compat.c \
- config.c datafiles.c encrypt.c events.c hashcomp.c helpserv.c hostserv.c init.c ircd.c language.c log.c mail.c main.c \
+ config.c datafiles.c encrypt.c events.c hashcomp.cpp helpserv.c hostserv.c init.c ircd.c language.c log.c mail.c main.c \
memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \
- process.c send.c servers.c sessions.c s sockutil.c timeout.c users.c \
- $(RDB) $(MYSQL)
+ process.c send.c servers.c sessions.c s sockutil.c timeout.c users.c
INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \
../include/pseudo.h ../include/sysconf.h ../include/config.h \
@@ -21,8 +17,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
- 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' 'MYSQL=${MYSQL}'\
- 'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
.c.o:
@../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
@@ -76,8 +72,6 @@ sockutil.o: sockutil.c $(INCLUDES)
timeout.o: timeout.c $(INCLUDES)
users.o: users.c $(INCLUDES)
vsnprintf.o: vsnprintf.c $(INCLUDES)
-mysql.o: mysql.c $(INCLUDES)
-rdb.o: rdb.c $(INCLUDES)
mod_version: mod_version.c $(INCLUDES)
@../run-cc.pl $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
diff --git a/src/botserv.c b/src/botserv.c
index b1507b2e8..2aeca8249 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -531,40 +531,6 @@ void save_bs_dbase(void)
/*************************************************************************/
-void save_bs_rdb_dbase(void)
-{
-#ifdef USE_RDB
- int i;
- BotInfo *bi;
-
- if (!rdb_open())
- return;
-
- if (rdb_tag_table("anope_bs_core") == 0) {
- alog("Unable to tag table 'anope_bs_core' - BotServ RDB save failed.");
- rdb_close();
- return;
- }
-
- for (i = 0; i < 256; i++) {
- for (bi = botlists[i]; bi; bi = bi->next) {
- if (rdb_save_bs_core(bi) == 0) {
- alog("Unable to save BotInfo for %s - BotServ RDB save failed.", bi->nick);
- rdb_close();
- return;
- }
- }
- }
-
- if (rdb_clean_table("anope_bs_core") == 0)
- alog("Unable to clean table 'anope_bs_core' - BotServ RDB save failed.");
-
- rdb_close();
-#endif
-}
-
-/*************************************************************************/
-
/* Inserts a bot in the bot list. I can't be much explicit mh? */
void insert_bot(BotInfo * bi)
diff --git a/src/chanserv.c b/src/chanserv.c
index 598982cd9..c20c39265 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -756,100 +756,6 @@ void save_cs_dbase(void)
/*************************************************************************/
-void save_cs_rdb_dbase(void)
-{
-#ifdef USE_RDB
- int i;
- ChannelInfo *ci;
-
- if (!rdb_open())
- return;
-
- if (rdb_tag_table("anope_cs_info") == 0) {
- alog("Unable to tag table 'anope_cs_info' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table("anope_cs_access") == 0) {
- alog("Unable to tag table 'anope_cs_access' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table("anope_cs_levels") == 0) {
- alog("Unable to tag table 'anope_cs_levels' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table("anope_cs_akicks") == 0) {
- alog("Unable to tag table 'anope_cs_akicks' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table("anope_cs_badwords") == 0) {
- alog("Unable to tag table 'anope_cs_badwords' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table("anope_cs_ttb") == 0) {
- alog("Unable to tag table 'anope_cs_ttb' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_tag_table_where("anope_ms_info", "serv='CHAN'") == 0) {
- alog("Unable to tag table 'anope_ms_info' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
-
- for (i = 0; i < 256; i++) {
- for (ci = chanlists[i]; ci; ci = ci->next) {
- if (rdb_save_cs_info(ci) == 0) {
- alog("Unable to save ChanInfo for %s - ChanServ RDB save failed.", ci->name);
- rdb_close();
- return;
- }
- } /* for (chanlists[i]) */
- } /* for (i) */
-
- if (rdb_clean_table("anope_cs_info") == 0) {
- alog("Unable to clean table 'anope_cs_info' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table("anope_cs_access") == 0) {
- alog("Unable to clean table 'anope_cs_access' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table("anope_cs_levels") == 0) {
- alog("Unable to clean table 'anope_cs_levels' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table("anope_cs_akicks") == 0) {
- alog("Unable to clean table 'anope_cs_akicks' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table("anope_cs_badwords") == 0) {
- alog("Unable to clean table 'anope_cs_badwords' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table("anope_cs_ttb") == 0) {
- alog("Unable to clean table 'anope_cs_ttb' - ChanServ RDB save failed.");
- rdb_close();
- return;
- }
- if (rdb_clean_table_where("anope_ms_info", "serv='CHAN'") == 0)
- alog("Unable to clean table 'anope_ms_info' - ChanServ RDB save failed.");
-
- rdb_close();
-#endif
-}
-
-/*************************************************************************/
-
/* Check the current modes on a channel; if they conflict with a mode lock,
* fix them.
*
diff --git a/src/config.c b/src/config.c
index 73ac09cb3..bd76ffcb1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -277,7 +277,6 @@ char *MysqlSecure;
char *MysqlSock;
int MysqlRetries = 0;
int MysqlRetryGap = 0;
-int UseRDB = 0;
int DefConLevel;
static std::string DefCon1;
@@ -1316,7 +1315,6 @@ Directive directives[] = {
{"MysqlSock", {{PARAM_STRING, PARAM_RELOAD, &MysqlSock}}},
{"MysqlRetries", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetries}}},
{"MysqlRetryGap", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetryGap}}},
- {"UseRDB", {{PARAM_SET, PARAM_RELOAD, &UseRDB}}},
{"ModuleAutoload", {{PARAM_STRING, PARAM_RELOAD, &Modules}}},
{"ModuleDelayedAutoload",
{{PARAM_STRING, PARAM_RELOAD, &ModulesDelayed}}},
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 29e5d44f4..4a31eb988 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -213,16 +213,6 @@ int do_group(User * u)
u->na = na;
na->u = u;
-#ifdef USE_RDB
- /* Is this really needed? Since this is a new alias it will get
- * its unique id on the next update, since it was previously
- * deleted by delnick. Must observe...
- */
- if (rdb_open()) {
- rdb_save_ns_alias(na);
- rdb_close();
- }
-#endif
send_event(EVENT_GROUP, 1, u->nick);
alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none"));
notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick);
diff --git a/src/hostserv.c b/src/hostserv.c
index cdf43889c..52dfbc0d9 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -314,28 +314,11 @@ char *getvIdent(char *nick)
/*************************************************************************/
void delHostCore(char *nick)
{
-#ifdef USE_RDB
- static char clause[128];
- char *q_nick;
-#endif
HostCore *tmp;
bool found = false;
tmp = findHostCore(head, nick, &found);
if (found) {
head = deleteHostCore(head, tmp);
-
-#ifdef USE_RDB
- /* Reflect this change in the database right away. */
- if (rdb_open()) {
- q_nick = rdb_quote(nick);
- snprintf(clause, sizeof(clause), "nick='%s'", q_nick);
- if (rdb_scrub_table("anope_hs_core", clause) == 0)
- alog("Unable to scrub table 'anope_hs_core' - HostServ RDB update failed.");
- rdb_close();
- free(q_nick);
- }
-#endif
-
}
}
@@ -497,37 +480,6 @@ void save_hs_dbase(void)
#undef SAFE
-void save_hs_rdb_dbase(void)
-{
-#ifdef USE_RDB
- HostCore *current;
-
- if (!rdb_open())
- return;
-
- if (rdb_tag_table("anope_hs_core") == 0) {
- alog("Unable to tag table 'anope_hs_core' - HostServ RDB save failed.");
- rdb_close();
- return;
- }
-
- current = head;
- while (current != NULL) {
- if (rdb_save_hs_core(current) == 0) {
- alog("Unable to save HostCore for %s - HostServ RDB save failed.", current->nick);
- rdb_close();
- return;
- }
- current = current->next;
- }
-
- if (rdb_clean_table("anope_hs_core") == 0)
- alog("Unable to clean table 'anope_hs_core' - HostServ RDB save failed.");
-
- rdb_close();
-#endif
-}
-
/*************************************************************************/
/* End of Load/Save Functions */
/*************************************************************************/
diff --git a/src/init.c b/src/init.c
index 38f7b0c7d..6ba89f052 100644
--- a/src/init.c
+++ b/src/init.c
@@ -528,20 +528,6 @@ int init_secondary(int ac, char **av)
hostserv_init();
helpserv_init();
-#ifdef USE_RDB
- if (!rdb_init()) {
- if (UseRDB) {
- UseRDB = 0;
- alog("Error: Disabling UseRDB due to errors with SQL");
- }
- } else {
- if (MysqlSecure && UseRDB) {
- UseRDB = 0;
- alog("Error: MySQL password are encrypted using method in MysqlSecure disabling UseRDB");
- }
- }
-#endif
-
/* load any custom modules */
modules_init();
@@ -550,56 +536,47 @@ int init_secondary(int ac, char **av)
add_entropy_userkeys();
/* Load up databases */
-#ifdef USE_RDB
- if (UseRDB)
- rdb_load_dbases();
- /* Need a better way to handle this -dane */
- if (!UseRDB) {
-#endif
- load_ns_dbase();
- if (debug)
- alog("debug: Loaded %s database (1/%d)", s_NickServ,
- (PreNickDBName ? 8 : 7));
- if (s_HostServ) {
- load_hs_dbase();
- if (debug)
- alog("debug: Loaded %s database (2/%d)", s_HostServ,
- (PreNickDBName ? 8 : 7));
- } else if (debug) {
- alog("debug: HostServ database (2/%d) not loaded because HostServ is disabled", (PreNickDBName ? 8 : 7));
- }
- if (s_BotServ) {
- load_bs_dbase();
- if (debug)
- alog("debug: Loaded %s database (3/%d)", s_BotServ,
- (PreNickDBName ? 8 : 7));
- } else if (debug) {
- alog("debug: BotServ database (3/%d) not loaded because BotServ is disabled", (PreNickDBName ? 8 : 7));
- }
- load_cs_dbase();
- if (debug)
- alog("debug: Loaded %s database (4/%d)", s_ChanServ,
- (PreNickDBName ? 8 : 7));
- load_os_dbase();
- if (debug)
- alog("debug: Loaded %s database (5/%d)", s_OperServ,
- (PreNickDBName ? 8 : 7));
- load_news();
- if (debug)
- alog("debug: Loaded news database (6/%d)",
- (PreNickDBName ? 8 : 7));
- load_exceptions();
- if (debug)
- alog("debug: Loaded exception database (7/%d)",
- (PreNickDBName ? 8 : 7));
- if (PreNickDBName) {
- load_ns_req_db();
- if (debug)
- alog("debug: Loaded PreNick database (8/8)");
- }
-#ifdef USE_RDB
- }
-#endif
+ load_ns_dbase();
+ if (debug)
+ alog("debug: Loaded %s database (1/%d)", s_NickServ,
+ (PreNickDBName ? 8 : 7));
+ if (s_HostServ) {
+ load_hs_dbase();
+ if (debug)
+ alog("debug: Loaded %s database (2/%d)", s_HostServ,
+ (PreNickDBName ? 8 : 7));
+ } else if (debug) {
+ alog("debug: HostServ database (2/%d) not loaded because HostServ is disabled", (PreNickDBName ? 8 : 7));
+ }
+ if (s_BotServ) {
+ load_bs_dbase();
+ if (debug)
+ alog("debug: Loaded %s database (3/%d)", s_BotServ,
+ (PreNickDBName ? 8 : 7));
+ } else if (debug) {
+ alog("debug: BotServ database (3/%d) not loaded because BotServ is disabled", (PreNickDBName ? 8 : 7));
+ }
+ load_cs_dbase();
+ if (debug)
+ alog("debug: Loaded %s database (4/%d)", s_ChanServ,
+ (PreNickDBName ? 8 : 7));
+ load_os_dbase();
+ if (debug)
+ alog("debug: Loaded %s database (5/%d)", s_OperServ,
+ (PreNickDBName ? 8 : 7));
+ load_news();
+ if (debug)
+ alog("debug: Loaded news database (6/%d)",
+ (PreNickDBName ? 8 : 7));
+ load_exceptions();
+ if (debug)
+ alog("debug: Loaded exception database (7/%d)",
+ (PreNickDBName ? 8 : 7));
+ if (PreNickDBName) {
+ load_ns_req_db();
+ if (debug)
+ alog("debug: Loaded PreNick database (8/8)");
+ }
alog("Databases loaded");
@@ -626,19 +603,8 @@ int init_secondary(int ac, char **av)
}
/* Save the databases back to file/mysql to reflect any changes */
-#ifdef USE_RDB
- if (!UseRDB) { /* Only save if we are not using remote databases
- * to avoid floods. As a side effects our nice
- * FFF databases won't get overwritten if the
- * mysql db is broken (empty etc.) */
-#endif
alog("Info: Reflecting database records.");
save_databases();
-#ifdef USE_RDB
- } else {
- alog("Info: Not reflecting database records.");
- }
-#endif
send_event(EVENT_CONNECT, 1, EVENT_START);
/* Connect to the remote server */
diff --git a/src/main.c b/src/main.c
index d70e936ba..ab658e090 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,10 +49,6 @@ int protocoldebug = 0; /* -protocoldebug */
char *binary_dir; /* Used to store base path for win32 restart */
#endif
-#ifdef USE_RDB
-int do_mysql = 0; /* use mysql ? */
-#endif
-
/* Set to 1 if we are to quit */
int quitting = 0;
@@ -165,61 +161,6 @@ void save_databases(void)
save_news();
waiting = -18;
save_exceptions();
-
-#ifdef USE_RDB
- if (do_mysql) {
- if (debug)
- alog("debug: Saving RDB databases");
- waiting = -10;
- waiting = -11;
- save_ns_rdb_dbase();
- /* We send these PONG's when we're not syncing to avoid timeouts.
- * If we send them during the sync, we fuck something up there and
- * break the syncing process, resulting in lost (literally lost)
- * data. -GD
- * This used is_sync(serv_uplink) to check for sync states. There's
- * only a minor error with this: serv_uplink doesn't exist during
- * the first save. So now we check for serv_uplink only; if it
- * exists we're safe. -GD
- */
- if (serv_uplink)
- ircdproto->SendPong(ServerName, ServerName);
- waiting = -12;
- save_cs_rdb_dbase();
- if (serv_uplink)
- ircdproto->SendPong(ServerName, ServerName);
- if (PreNickDBName) {
- save_ns_req_rdb_dbase();
- if (serv_uplink)
- ircdproto->SendPong(ServerName, ServerName);
- waiting = -13;
- }
- if (s_BotServ) {
- waiting = -14;
- save_bs_rdb_dbase();
- if (serv_uplink)
- ircdproto->SendPong(ServerName, ServerName);
- }
- if (s_HostServ) {
- waiting = -15;