summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes1
-rw-r--r--Makefile.in3
-rwxr-xr-xconfigure4
-rw-r--r--configure.in1
-rw-r--r--src/Makefile2
-rw-r--r--src/core/Makefile5
-rw-r--r--src/core/Makefile.sub5
-rw-r--r--src/core/hs_group.c3
-rw-r--r--src/core/hs_setall.c2
-rw-r--r--src/core/ms_read.c2
-rw-r--r--src/core/ms_rsend.c1
-rw-r--r--src/core/ms_send.c1
-rw-r--r--src/core/ms_sendall.c1
-rw-r--r--src/core/ms_staff.c1
-rw-r--r--src/modules/Makefile5
-rw-r--r--src/modules/Makefile.sub5
-rw-r--r--src/protocol/Makefile5
-rw-r--r--src/protocol/Makefile.sub5
-rw-r--r--src/protocol/inspircd.c19
-rw-r--r--src/protocol/plexus.c2270
-rw-r--r--src/protocol/ptlink.c5
-rw-r--r--version.log11
22 files changed, 1291 insertions, 1066 deletions
diff --git a/Changes b/Changes
index f85db06f1..c98caa4c1 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
Anope Version S V N
-------------------
Provided by Anope Dev. <dev@anope.org> - 2005
+05/17 F Compiling on solaris and amd64 systems. [ #00]
05/13 F Possible segfault with do_part by using freed memory. [#379]
05/13 F Long hosts got cut off when setting topic and host was recorded. [#377]
05/12 F NSListOpersOnly works correctly. [#375]
diff --git a/Makefile.in b/Makefile.in
index d6978d861..a1ea38095 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ RDB=@RDB@
LDFLAGS=@LDFLAGS@
RUNGROUP=@RUNGROUP@
SHARED=@SHARED@
+MODULEFLAGS=@MODULEFLAGS@
all: language headers build core protocols tools modules
strict: language headers strict_build core protocols tools strict_modules
@@ -29,7 +30,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' 'RDB=${RDB}'\
- 'MYSQL=${MYSQL}' 'SHARED=${SHARED}'
+ 'MYSQL=${MYSQL}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
build:
@for i in $(SUBDIRS); do \
diff --git a/configure b/configure
index 596c84459..4c5f758ca 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL CPP EGREP MYSQL RDB MYSQLCLIENT_LDFLAGS MYSQLCLIENT_CFLAGS MYSQLCLIENT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS SHARED RUNGROUP BINDEST DATDEST MODULE_PATH IRCDFILE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL CPP EGREP MYSQL RDB MYSQLCLIENT_LDFLAGS MYSQLCLIENT_CFLAGS MYSQLCLIENT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS SHARED MODULEFLAGS RUNGROUP BINDEST DATDEST MODULE_PATH IRCDFILE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4621,6 +4621,7 @@ fi
MODULEFLAGS=$ac_cv_pic
+
cat >>confdefs.h <<\_ACEOF
#define USE_MODULES 1
_ACEOF
@@ -9314,6 +9315,7 @@ s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
s,@ANOPELIBS@,$ANOPELIBS,;t t
s,@SHARED@,$SHARED,;t t
+s,@MODULEFLAGS@,$MODULEFLAGS,;t t
s,@RUNGROUP@,$RUNGROUP,;t t
s,@BINDEST@,$BINDEST,;t t
s,@DATDEST@,$DATDEST,;t t
diff --git a/configure.in b/configure.in
index 201871519..c9b675aad 100644
--- a/configure.in
+++ b/configure.in
@@ -159,6 +159,7 @@ AC_DEFINE(DL_PREFIX,"","No prefix needed for dlopen")
fi
MODULEFLAGS=$ac_cv_pic
+AC_SUBST(MODULEFLAGS)
AC_DEFINE(USE_MODULES,1,"Modules available")
])
diff --git a/src/Makefile b/src/Makefile
index f187f263c..4627127c0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' 'MYSQL=${MYSQL}'\
- 'RDB=${RDB}' 'SHARED=${SHARED}'
+ 'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
.c.o:
$(CC) $(CFLAGS) -I../include/ -c $<
diff --git a/src/core/Makefile b/src/core/Makefile
index e73fd7e7c..602d43bec 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -5,12 +5,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: modules subs
@@ -22,7 +21,7 @@ install:
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../${INCLUDEDIR} -c $<
+ $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
$(CC) ${SHARED} $< -o $*.so ${PROFILE}
diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
index b060ca5b6..7c4744ce8 100644
--- a/src/core/Makefile.sub
+++ b/src/core/Makefile.sub
@@ -3,12 +3,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: module
@@ -17,7 +16,7 @@ module: $(OBJECTS) so
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../ -I../../${INCLUDEDIR} -c $<
+ $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
so:
$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index db034a948..9f5ef0a3e 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -17,6 +17,9 @@
int do_group(User * u);
void myHostServHelp(User * u);
+extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
+ char *creator, time_t time);
+
/**
* Create the off command, and tell anope about it.
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index a0685a89f..3d0a5a83c 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -17,6 +17,8 @@
int do_setall(User * u);
void myHostServHelp(User * u);
+extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
+ char *creator, time_t time);
/**
* Create the off command, and tell anope about it.
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 4c650f5e1..d608d0a37 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -19,6 +19,8 @@ int do_read(User * u);
int read_memo_callback(User * u, int num, va_list args);
int read_memo(User * u, int index, MemoInfo * mi, const char *chan);
void myMemoServHelp(User * u);
+extern void rsend_notify(User * u, Memo * m, const char *chan);
+
/**
* Create the command, and tell anope about it.
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index b712f4af1..0b0c7b995 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -17,6 +17,7 @@
int do_rsend(User * u);
void myMemoServHelp(User * u);
+extern void memo_send(User * u, char *name, char *text, int z);
/**
* Create the command, and tell anope about it.
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index c366072a4..bbca927f9 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -17,6 +17,7 @@
int do_send(User * u);
void myMemoServHelp(User * u);
+extern void memo_send(User * u, char *name, char *text, int z);
/**
* Create the command, and tell anope about it.
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 36eae983f..589d9871b 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -17,6 +17,7 @@
int do_sendall(User * u);
void myMemoServHelp(User * u);
+extern void memo_send(User * u, char *name, char *text, int z);
/**
* Create the command, and tell anope about it.
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 091a23ce5..534aeeb24 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -17,6 +17,7 @@
int do_staff(User * u);
void myMemoServHelp(User * u);
+extern void memo_send(User * u, char *name, char *text, int z);
/**
* Create the command, and tell anope about it.
diff --git a/src/modules/Makefile b/src/modules/Makefile
index e73fd7e7c..602d43bec 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -5,12 +5,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: modules subs
@@ -22,7 +21,7 @@ install:
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../${INCLUDEDIR} -c $<
+ $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
$(CC) ${SHARED} $< -o $*.so ${PROFILE}
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index b060ca5b6..7c4744ce8 100644
--- a/src/modules/Makefile.sub
+++ b/src/modules/Makefile.sub
@@ -3,12 +3,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: module
@@ -17,7 +16,7 @@ module: $(OBJECTS) so
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../ -I../../${INCLUDEDIR} -c $<
+ $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
so:
$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index e73fd7e7c..602d43bec 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -5,12 +5,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: modules subs
@@ -22,7 +21,7 @@ install:
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../${INCLUDEDIR} -c $<
+ $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
$(CC) ${SHARED} $< -o $*.so ${PROFILE}
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
index b060ca5b6..7c4744ce8 100644
--- a/src/protocol/Makefile.sub
+++ b/src/protocol/Makefile.sub
@@ -3,12 +3,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
-CFLAGS=$(CFLAGS) $(CDEFS)
all: module
@@ -17,7 +16,7 @@ module: $(OBJECTS) so
distclean: clean spotless
.c.o:
- $(CC) $(CFLAGS) -I../ -I../../${INCLUDEDIR} -c $<
+ $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
so:
$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index e16f38e9d..762c2260c 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -522,7 +522,7 @@ void inspircd_cmd_vhost_off(User * u)
void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
- send_cmd(CreateSum(), "# %s@%s %s %lu %lu :%s", user, host, who, (long int)when, 86400 * 2, reason);
+ send_cmd(CreateSum(), "# %s@%s %s %lu %lu :%s", user, host, who, (unsigned long)when, (unsigned long)86400 * 2, reason);
}
void inspircd_cmd_svskill(char *source, char *user, char *buf)
@@ -586,9 +586,9 @@ void inspircd_cmd_bot_nick(char *nick, char *user, char *host, char *real,
void inspircd_cmd_kick(char *source, char *chan, char *user, char *buf)
{
if (buf) {
- send_cmd(CreateSum(), "k %s %s :%s", source, user, chan, buf);
+ send_cmd(CreateSum(), "k %s %s %s :%s", source, user, chan, buf);
} else {
- send_cmd(CreateSum(), "k %s %s :", source, user, chan);
+ send_cmd(CreateSum(), "k %s %s %s :", source, user, chan);
}
}
@@ -682,7 +682,6 @@ int anope_event_eob(char *source, int ac, char **av)
/* SERVER name hop descript */
void inspircd_cmd_server(char *servname, int hop, char *descript)
{
- Server *newserv;
if (hop == 0)
{
send_cmd(CreateSum(), "H %s",servname);
@@ -758,7 +757,7 @@ void inspircd_cmd_part(char *nick, char *chan, char *buf)
return;
}
if (buf) {
- send_cmd(CreateSum(), "L %s :%s", nick, chan, buf);
+ send_cmd(CreateSum(), "L %s %s :%s", nick, chan, buf);
} else {
send_cmd(CreateSum(), "L %s %s :", nick, chan);
}
@@ -1037,17 +1036,9 @@ int anope_event_kick(char *source, int ac, char **av)
int anope_event_join(char *source, int ac, char **av)
{
- //if (ac != 2)
- // return MOD_CONT;
- //char *v[32];
- //v[0] = av[1];
- //do_join(av[0], 1, v);
- //return MOD_CONT;
-
User *u;
Channel *c;
int i;
- int32 modes = 0, thismode;
char* new_av[32];
char* cumodes[3];
char thismodes[256];
@@ -1295,7 +1286,7 @@ void inspircd_cmd_unszline(char *mask)
void inspircd_cmd_szline(char *mask, char *reason, char *whom)
{
// } <mask> <who-set-it> <time-set> <duration> :<reason>
- send_cmd(CreateSum(), "} %s %s %lu %lu :%s",mask,whom,(long int) time(NULL),86400 * 2, reason);
+ send_cmd(CreateSum(), "} %s %s %lu %lu :%s",mask,whom,(unsigned long)time(NULL),(unsigned long)86400 * 2, reason);
}
/* SGLINE */
diff --git a/src/protocol/plexus.c b/src/protocol/plexus.c
index 32f9feea3..c85b38eb3 100644
--- a/src/protocol/plexus.c
+++ b/src/protocol/plexus.c
@@ -1,6 +1,4 @@
/* PlexusIRCD IRCD functions
-/* PlexusIRCD IRCD functions
-/* PlexusIRCD IRCD functions
*
* (C) 2003-2005 Anope Team
* Contact us at info@anope.org
@@ -8,194 +6,199 @@
* Please read COPYING and README for furhter details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- *
- */
+ * Based on the original code of Services by Andy Church.
+ **/
#include "services.h"
#include "pseudo.h"
#include "plexus.h"
IRCDVar myIrcd[] = {
- {"PleXusIRCd 2.0+", /* ircd name */
- "+oiSR", /* nickserv mode */
- "+oiSR", /* chanserv mode */
- "+oiSR", /* memoserv mode */
- "+oiSR", /* hostserv mode */
- "+oaiSR", /* operserv mode */
- "+oiSR", /* botserv mode */
- "+oiSR", /* helpserv mode */
- "+oiSR", /* Dev/Null mode */
- "+oiSR", /* Global mode */
- "+oiSR", /* nickserv alias mode */
- "+oiSR", /* chanserv alias mode */
- "+oiSR", /* memoserv alias mode */
- "+oiSR", /* hostserv alias mode */
- "+oaiSR", /* operserv alias mode */
- "+oiSR", /* botserv alias mode */
- "+oiSR", /* helpserv alias mode */
- "+oiSR", /* Dev/Null alias mode */
- "+oiSR", /* Global alias mode */
- "+iSR", /* Used by BotServ Bots */
- 3, /* Chan Max Symbols */
- "-acilmnpstMNORZ", /* Modes to Remove */
- "+o", /* Channel Umode used by Botserv bots */
- 1, /* SVSNICK */
- 1, /* Vhost */
- 0, /* Has Owner */
- NULL, /* Mode to set for an owner */
- NULL, /* Mode to unset for an owner */
- NULL, /* Mode to set for chan admin */
- NULL, /* Mode to unset for chan admin */
- "+R", /* Mode On Reg */
- "-R", /* Mode on UnReg */
- "-R", /* Mode on Nick Change */
- 0, /* Supports SGlines */
- 1, /* Supports SQlines */
- 0, /* Supports SZlines */
- 1, /* Supports Halfop +h */
- 3, /* Number of server args */
- 0, /* Join 2 Set */
- 0, /* Join 2 Message */
- 1, /* Has exceptions +e */
- 0, /* TS Topic Forward */
- 0, /* TS Topci Backward */
- 0, /* Protected Umode */
- 0, /* Has Admin */
- 1, /* Chan SQlines */
- 0, /* Quit on Kill */
- 0, /* SVSMODE unban */
- 0, /* Has Protect */
- 0, /* Reverse */
- 0, /* Chan Reg */
- 0, /* Channel Mode */
- 0, /* vidents */
- 0, /* svshold */
- 1, /* time stamp on mode */
- 0, /* NICKIP */
- 0, /* UMODE */
- 0, /* O:LINE */
- 1, /* VHOST ON NICK */
- 0, /* Change RealName */
- CMODE_p, /* No Knock */
- 0, /* Admin Only */
- DEFAULT_MLOCK, /* Default MLOCK */
- UMODE_h, /* Vhost Mode */
- 0, /* +f */
- 0, /* +L */
- 0, /* +f Mode */
- 0, /* +L Mode */
- 0, /* On nick change check if they could be identified */
- 0, /* No Knock requires +i */
- NULL, /* CAPAB Chan Modes */
- 0, /* We support TOKENS */
- 1, /* TOKENS are CASE inSensitive */
- 0, /* TIME STAMPS are BASE64 */
- 1, /* +I support */
- 0, /* SJOIN ban char */
- 0, /* SJOIN except char */
- 0, /* SJOIN invite char */
- 0, /* Can remove User Channel Modes with SVSMODE */
- 0, /* Sglines are not enforced until user reconnects */
- "h", /* vhost char */
- 0, /* ts6 */
- 0, /* support helper umode */
- 0, /* p10 */
- NULL, /* character set */
- 1, /* reports sync state */
- }
- ,
- {NULL}
+ {"PleXusIRCd 2.0+", /* ircd name */
+ "+oiSR", /* nickserv mode */
+ "+oiSR", /* chanserv mode */
+ "+oiSR", /* memoserv mode */
+ "+oiSR", /* hostserv mode */
+ "+oaiSR", /* operserv mode */
+ "+oiSR", /* botserv mode */
+ "+oiSR", /* helpserv mode */
+ "+oiSR", /* Dev/Null mode */
+ "+oiSR", /* Global mode */
+ "+oiSR", /* nickserv alias mode */
+ "+oiSR", /* chanserv alias mode */
+ "+oiSR", /* memoserv alias mode */
+ "+oiSR", /* hostserv alias mode */
+ "+oaiSR", /* operserv alias mode */
+ "+oiSR", /* botserv alias mode */
+ "+oiSR", /* helpserv alias mode */
+ "+oiSR", /* Dev/Null alias mode */
+ "+oiSR", /* Global alias mode */
+ "+iSR", /* Used by BotServ Bots */
+ 3, /* Chan Max Symbols */
+ "-acilmnpstMNORZ", /* Modes to Remove */
+ "+o", /* Channel Umode used by Botserv bots */
+ 1, /* SVSNICK */
+ 1, /* Vhost */
+ 0, /* Has Owner */
+ NULL, /* Mode to set for an owner */
+ NULL, /* Mode to unset for an owner */
+ NULL, /* Mode to set for chan admin */
+ NULL, /* Mode to unset for chan admin */
+ "+R", /* Mode On Reg */
+ "-R", /* Mode on UnReg */
+ "-R", /* Mode on Nick Change */
+ 0, /* Supports SGlines */
+ 1, /* Supports SQlines */
+ 0, /* Supports SZlines */
+ 1, /* Supports Halfop +h */
+ 3, /* Number of server args */
+ 0, /* Join 2 Set */
+ 0, /* Join 2 Message */
+ 1, /* Has exceptions +e */
+ 0, /* TS Topic Forward */
+ 0, /* TS Topci Backward */
+ 0, /* Protected Umode */
+ 0, /* Has Admin */
+ 1, /* Chan SQlines */
+ 0, /* Quit on Kill */
+ 0, /* SVSMODE unban */
+ 0, /* Has Protect */
+ 0, /* Reverse */
+ 0, /* Chan Reg */
+ 0, /* Channel Mode */
+ 0, /* vidents */
+ 0, /* svshold */
+ 1, /* time stamp on mode */
+ 0, /* NICKIP */
+ 0, /* UMODE */
+ 0, /* O:LINE */
+ 1, /* VHOST ON NICK */
+ 0, /* Change RealName */
+ CMODE_p, /* No Knock */
+ 0, /* Admin Only */
+ DEFAULT_MLOCK, /* Default MLOCK */
+ UMODE_h, /* Vhost Mode */
+ 0, /* +f */
+ 0, /* +L */
+ 0, /* +f Mode */
+ 0, /* +L Mode */
+ 0, /* On nick change check if they could be identified */
+ 0, /* No Knock requires +i */
+ NULL, /* CAPAB Chan Modes */
+ 0, /* We support TOKENS */
+ 1, /* TOKENS are CASE inSensitive */
+ 0, /* TIME STAMPS are BASE64 */
+ 1, /* +I support */
+ 0, /* SJOIN ban char */
+ 0, /* SJOIN except char */
+ 0, /* SJOIN invite char */
+ 0, /* Can remove User Channel Modes with SVSMODE */
+ 0, /* Sglines are not enforced until user reconnects */
+ "h", /* vhost char */
+ 0, /* ts6 */
+ 0, /* support helper umode */
+ 0, /* p10 */
+ NULL, /* character set */
+ 1, /* reports sync state */
+ }
+ ,
+ {NULL}
};
IRCDCAPAB myIrcdcap[] = {
- {
- 0, /* NOQUIT */
- 0, /* TSMODE */
- 0, /* UNCONNECT */
- 0, /* NICKIP */
- 0, /* SJOIN */
- CAPAB_ZIP, /* ZIP */
- 0, /* BURST */
- CAPAB_TS5, /* TS5 */
- 0, /* TS3 */
- 0, /* DKEY */
- 0, /* PT4 */
- 0, /* SCS */
- CAPAB_QS, /* QS */
- CAPAB_UID, /* UID */
- CAPAB_KNOCK, /* KNOCK */
- 0, /* CLIENT */
- 0, /* IPV6 */
- 0, /* SSJ5 */
- 0, /* SN2 */
- 0, /* TOKEN */
- 0, /* VHOST */
- 0, /* SSJ3 */
- 0, /* NICK2 */
- 0, /* UMODE2 */
- 0, /* VL */
- 0, /* TLKEXT */
- 0, /* DODKEY */
- 0, /* DOZIP */
- 0, 0, 0}
+ {
+ 0, /* NOQUIT */
+ 0, /* TSMODE */
+ 0, /* UNCONNECT */
+ 0, /* NICKIP */
+ 0, /* SJOIN */
+ CAPAB_ZIP, /* ZIP */
+ 0, /* BURST */
+ CAPAB_TS5, /* TS5 */
+ 0, /* TS3 */
+ 0, /* DKEY */
+ 0, /* PT4 */
+ 0, /* SCS */
+ CAPAB_QS, /* QS */
+ CAPAB_UID, /* UID */
+ CAPAB_KNOCK, /* KNOCK */
+ 0, /* CLIENT */
+ 0, /* IPV6 */
+ 0, /* SSJ5 */
+ 0, /* SN2 */
+ 0, /* TOKEN */
+ 0, /* VHOST */
+ 0, /* SSJ3 */
+ 0, /* NICK2 */
+ 0, /* UMODE2 */
+ 0, /* VL */
+ 0, /* TLKEXT */
+ 0, /* DODKEY */
+ 0, /* DOZIP */
+ 0, 0, 0}
};
-void plexus_set_umode(User * user, int ac, char **av)
-{
- int add = 1; /* 1 if adding modes, 0 if deleting */
- char *modes = av[0];
-
- ac--;
-
- if (debug)
- alog("debug: Changing mode for %s to %s", user->nick, modes);
-
- while (*modes) {
-
- /* This looks better, much better than "add ? (do_add) : (do_remove)".
- * At least this is readable without paying much attention :) -GD
- */
- if (add)
- user->mode |= umodes[(int) *modes];
- else
- user->mode &= ~umodes[(int) *modes];
-
- switch (*modes++) {
- case '+':
- add = 1;
- break;
- case '-':
- add = 0;
- break;
- case 'h':
- update_host(user);
- break;
- case 'o':
- if (add) {
- opcnt++;
-
- if (WallOper)
- anope_cmd_global(s_OperServ,
- "\2%s\2 is now an IRC operator.",
- user->nick);
- display_news(user, NEWS_OPER);
-
- } else {
- opcnt--;
- }
- break;
- case 'R':
- if (add && !nick_identified(user)) {
- common_svsmode(user, "-R", NULL);
- user->mode &= ~UMODE_R;
- }
- break;
-
- }
+void
+plexus_set_umode (User * user, int ac, char **av)
+{
+ int add = 1; /* 1 if adding modes, 0 if deleting */
+ char *modes = av[0];
+
+ ac--;
+
+ if (debug)
+ alog ("debug: Changing mode for %s to %s", user->nick, modes);
+
+ while (*modes)
+ {
+
+ /* This looks better, much better than "add ? (do_add) : (do_remove)".
+ * At least this is readable without paying much attention :) -GD
+ */
+ if (add)
+ user->mode |= umodes[(int) *modes];
+ else
+ user->mode &= ~umodes[(int) *modes];
+
+ switch (*modes++)
+ {
+ case '+':
+ add = 1;
+ break;
+ case '-':
+ add = 0;
+ break;
+ case 'h':
+ update_host (user);
+ break;
+ case 'o':
+ if (add)
+ {
+ opcnt++;
+
+ if (WallOper)
+ anope_cmd_global (s_OperServ,
+ "\2%s\2 is now an IRC operator.",
+ user->nick);
+ display_news (user, NEWS_OPER);
+
+ }
+ else
+ {
+ opcnt--;
+ }
+ break;
+ case 'R':
+ if (add && !nick_identified (user))
+ {
+ common_svsmode (user, "-R", NULL);
+ user->mode &= ~UMODE_R;
+ }
+ break;
+
+ }
}
}
@@ -207,565 +210,647 @@ void plexus_set_umode(User * user, int ac, char **av)
* is_valid_op, as it always sends a -o. Breaking up the routines corrects this problem. - ThaPrince
*/
-int plexus_check_valid_halfop(User * user, Channel * chan, int servermode)
+int
+plexus_check_valid_halfop (User * user, Channel * chan, int servermode)
{
- if (!chan || !chan->ci)
- return 1;
+ if (!chan || !chan->ci)
+ return 1;
- /* They will be kicked; no need to deop, no need to update our internal struct too */
- if (chan->ci->flags & CI_VERBOTEN)
- return 0;
+ /* They will be kicked; no need to deop, no need to update our internal struct too */
+ if (chan->ci->flags & CI_VERBOTEN)
+ return 0;
- if (servermode && !check_access(user, chan->ci, CA_AUTOHALFOP)) {
- notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ);
- anope_cmd_mode(whosends(chan->ci), chan->name, "-h %s",
- user->nick);
- return 0;
+ if (servermode && !check_access (user, chan->ci, CA_AUTOHALFOP))
+ {
+ notice_lang (s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ);
+ anope_cmd_mode (whosends (chan->ci), chan->name, "-h %s", user->nick);
+ return 0;
}
- if (check_access(user, chan->ci, CA_AUTODEOP)) {
- anope_cmd_mode(whosends(chan->ci), chan->name, "-h %s",
- user->nick);
- return 0;
+ if (check_access (user, chan->ci, CA_AUTODEOP))
+ {
+ anope_cmd_mode (whosends (chan->ci), chan->name, "-h %s", user->nick);