Merge branch 'master' into authd-framework-2
This commit is contained in:
commit
2f355b7e3c
76 changed files with 83 additions and 154 deletions
3
NEWS.md
3
NEWS.md
|
@ -46,8 +46,7 @@ See LICENSE for licensing details (GPL v2).
|
|||
Typedefs have been added for consistency reasons. For example, now you would
|
||||
write `rb_dictionary *foo` and `RB_DICTIONARY_FOREACH`.
|
||||
- C99 bools have been added. Don't use ints as simple true/false flags anymore.
|
||||
Don't use `YES`/`NO` or `TRUE`/`FALSE` macros (`TRUE`/`FALSE` has been removed
|
||||
and `YES`/`NO` is awaiting the same fate). Use just `true` and `false`.
|
||||
Accordingly, the `YES`/`NO` and `TRUE`/`FALSE` macros have been removed.
|
||||
- libratbox has been renamed to librb, as we have diverged from upstream long
|
||||
ago.
|
||||
- Almost all 2.8-style hashtable structures have been moved to dictionaries or
|
||||
|
|
78
README.md
78
README.md
|
@ -10,8 +10,52 @@ It is meant to be used with an IRCv3-capable services implementation such as [At
|
|||
# necessary requirements
|
||||
|
||||
* A supported platform
|
||||
* A working dynamic load library.
|
||||
* A working lex. Solaris /usr/ccs/bin/lex appears to be broken, on this system flex should be used.
|
||||
* A working dynamic library system
|
||||
* A working lex and yacc - flex and bison should work
|
||||
|
||||
# platforms
|
||||
|
||||
Charybdis is designed with portability in mind, but does not target older systems nor those of solely academic
|
||||
interest.
|
||||
|
||||
Do note that operating systems are only supported if they are supported by their vendor.
|
||||
|
||||
## Tier 1
|
||||
|
||||
These platforms are the best supported, and should always work. They are actively tested. If you encounter
|
||||
problems, please file a bug.
|
||||
|
||||
* FreeBSD 10.x and above (i386 and amd64)
|
||||
* Linux 2.6.x and above with glibc or musl (i386, x86_64, and ARM)
|
||||
* Mac OS X 10.7 and above
|
||||
* Windows Vista/Server 2008 and above (x86 or x64)
|
||||
|
||||
## Tier 2
|
||||
|
||||
These platforms are supported and occasionally tested, and most features should work, but this is not
|
||||
guaranteed. If you find any problems, file a bug, but as these are not regularly tested platforms, a timely
|
||||
resolution may not be possible.
|
||||
|
||||
* DragonflyBSD 4.4 and above (i386)
|
||||
* Linux with uClibc (i386 or x86_64)
|
||||
* NetBSD 6.1.x and above (i386, amd64)
|
||||
* OpenBSD 5.6 and above (i386, amd64)
|
||||
* Solaris 10 and above (i386)
|
||||
|
||||
## Tier 3
|
||||
|
||||
Anything else that hasn't been tested. Charybdis may or may not work on it; patches welcome if they don't.
|
||||
|
||||
# platform specific errata
|
||||
|
||||
These are known issues and workarounds for supported platforms.
|
||||
|
||||
* **FreeBSD**: if you are compiling with ipv6 you may experience
|
||||
problems with ipv4 due to the way the socket code is written. To
|
||||
fix this you must: "sysctl net.inet6.ip6.v6only=0"
|
||||
|
||||
* **Solaris**: you may have to set your PATH to include /usr/gnu/bin and /usr/gnu/sbin before /usr/bin
|
||||
and /usr/sbin. Solaris's default tools don't seem to play nicely with the configure script.
|
||||
|
||||
# building from git
|
||||
|
||||
|
@ -31,9 +75,8 @@ You will need to run `autogen.sh` to build the autotools files prior to building
|
|||
(Using CHALLENGE is not recommended for new deployments, so if you want to use a different TLS library,
|
||||
feel free.)
|
||||
|
||||
* For ECDHE, OpenSSL 1.0.0 or newer is required. RHEL/Fedora and derivatives like CentOS
|
||||
will need to compile OpenSSL from source, as ECC/ECDHE-functionality is removed from
|
||||
the OpenSSL package in these distributions.
|
||||
* For ECDHE, OpenSSL 1.0.0 or newer is required. Solaris; and RHEL/Fedora and its derivatives such as CentOS
|
||||
have removed support for ECC/ECDHE. You will need to compile your own OpenSSL on these systems.
|
||||
|
||||
# tips
|
||||
|
||||
|
@ -41,31 +84,10 @@ You will need to run `autogen.sh` to build the autotools files prior to building
|
|||
|
||||
* Please read doc/index.txt to get an overview of the current documentation.
|
||||
|
||||
* Read the NEWS file for what's new in this release.
|
||||
|
||||
* The files, /etc/services, /etc/protocols, and /etc/resolv.conf, SHOULD be
|
||||
readable by the user running the server in order for ircd to start with
|
||||
the correct settings. If these files are wrong, charybdis will try to use
|
||||
127.0.0.1 for a resolver as a last-ditch effort.
|
||||
|
||||
* FREEBSD USERS: if you are compiling with ipv6 you may experience
|
||||
problems with ipv4 due to the way the socket code is written. To
|
||||
fix this you must: "sysctl net.inet6.ip6.v6only=0"
|
||||
|
||||
* SOLARIS USERS: this code appears to tickle a bug in older gcc and
|
||||
egcs ONLY on 64-bit Solaris7. gcc-2.95 and SunPro C on 64bit should
|
||||
work fine, and any gcc or SunPro compiled on 32bit.
|
||||
|
||||
* SUPPORTED PLATFORMS: this code should compile without any warnings on:
|
||||
|
||||
* FreeBSD 10
|
||||
* Gentoo & Gentoo Hardened ~x86/~amd64/~fbsd
|
||||
* RHEL 6 / 7
|
||||
* Debian Jessie
|
||||
* OpenSuSE 11/12
|
||||
* OpenSolaris 2008.x?
|
||||
* Solaris 10 sparc.
|
||||
|
||||
Please let us know if you find otherwise. It may work on other platforms, but this is not guaranteed.
|
||||
|
||||
* Please read NEWS for information about what is in this release.
|
||||
|
||||
* Other files recommended for reading: BUGS, INSTALL
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <stdio.h>
|
||||
|
||||
#include "setup.h"
|
||||
#include "common.h"
|
||||
#include "ircd_defs.h"
|
||||
|
||||
extern rb_helper *authd_helper;
|
||||
|
||||
|
|
|
@ -97,7 +97,6 @@ typedef struct rb_addrinfo rb_addrinfo;
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "res.h"
|
||||
#include "reslib.h"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <rb_lib.h>
|
||||
#include <stdio.h>
|
||||
#include "rsdb.h"
|
||||
#include "common.h"
|
||||
#include "ircd_defs.h"
|
||||
|
||||
|
||||
#define MAXPARA 10
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include <time.h>
|
||||
|
||||
#include "stdinc.h"
|
||||
#include "common.h"
|
||||
#include "rsdb.h"
|
||||
|
||||
#define EmptyString(x) ((x == NULL) || (*(x) == '\0'))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
|
||||
AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared
|
||||
AM_LDFLAGS += -export-symbols-regex _mheader
|
||||
LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
|
||||
LIBS += $(top_srcdir)/ircd/libircd.la
|
||||
|
||||
extensiondir=@moduledir@/extensions
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "match.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "match.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -36,7 +36,7 @@ struct Blacklist {
|
|||
int ipv6; /* Does this blacklist support IPv6 lookups? */
|
||||
char host[IRCD_RES_HOSTLEN + 1];
|
||||
rb_dlink_list filters; /* Filters for queries */
|
||||
char reject_reason[IRCD_BUFSIZE];
|
||||
char reject_reason[BUFSIZE];
|
||||
unsigned int hits;
|
||||
time_t lastwarning;
|
||||
};
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
/*
|
||||
* ircd-ratbox: A slightly useful ircd.
|
||||
* common.h: An ircd header common to most code.
|
||||
*
|
||||
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||
* Copyright (C) 1996-2002 Hybrid Development Team
|
||||
* Copyright (C) 2002-2004 ircd-ratbox development team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_common_h
|
||||
#define INCLUDED_common_h
|
||||
|
||||
/* Just blindly define our own MIN/MAX macro */
|
||||
|
||||
#define IRCD_MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
#define IRCD_MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
/* Right out of the RFC */
|
||||
#define IRCD_BUFSIZE 512
|
||||
|
||||
/* readbuf size */
|
||||
#define READBUF_SIZE 16384
|
||||
|
||||
#endif /* INCLUDED_common_h */
|
|
@ -56,6 +56,14 @@
|
|||
#define IRC_DEPRECATED
|
||||
#endif
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#define HOSTLEN 63 /* Length of hostname. Updated to */
|
||||
/* comply with RFC1123 */
|
||||
|
||||
|
@ -115,4 +123,7 @@
|
|||
#define PATRICIA_BITS 32
|
||||
#endif
|
||||
|
||||
/* Read buffer size */
|
||||
#define READBUF_SIZE 16384
|
||||
|
||||
#endif /* INCLUDED_ircd_defs_h */
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
#include "ircd_defs.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
|
||||
struct Client;
|
||||
struct DNSReply;
|
||||
|
@ -389,7 +388,7 @@ extern int yylex(void);
|
|||
|
||||
extern unsigned long cidr_to_bitmask[];
|
||||
|
||||
extern char conffilebuf[IRCD_BUFSIZE + 1];
|
||||
extern char conffilebuf[BUFSIZE + 1];
|
||||
extern int lineno;
|
||||
|
||||
#define NOT_AUTHORISED (-1)
|
||||
|
|
|
@ -227,7 +227,7 @@ struct Blacklist *new_blacklist(char *name, char *reject_reason, int ipv4, int i
|
|||
blptr->status &= ~CONF_ILLEGAL;
|
||||
|
||||
rb_strlcpy(blptr->host, name, IRCD_RES_HOSTLEN + 1);
|
||||
rb_strlcpy(blptr->reject_reason, reject_reason, IRCD_BUFSIZE);
|
||||
rb_strlcpy(blptr->reject_reason, reject_reason, BUFSIZE);
|
||||
blptr->ipv4 = ipv4;
|
||||
blptr->ipv6 = ipv6;
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "common.h"
|
||||
#include "s_conf.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "channel.h"
|
||||
#include "chmode.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "hook.h"
|
||||
#include "match.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "hook.h"
|
||||
#include "match.h"
|
||||
|
@ -889,7 +888,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
|
|||
* also make sure it will always fit on a line with channel
|
||||
* name etc.
|
||||
*/
|
||||
if(strlen(mask) > IRCD_MIN(BANLEN, MODEBUFLEN - 5))
|
||||
if(strlen(mask) > MIN(BANLEN, MODEBUFLEN - 5))
|
||||
{
|
||||
sendto_one_numeric(source_p, ERR_INVALIDBAN,
|
||||
form_str(ERR_INVALIDBAN),
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
#include "s_conf.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include "client.h"
|
||||
#include "class.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
|
||||
ExtbanFunc extban_table[256] = { NULL };
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "s_conf.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd_signal.h"
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "logger.h"
|
||||
#include "s_conf.h"
|
||||
|
@ -53,8 +52,8 @@ void cinclude(void);
|
|||
void hashcomment(void);
|
||||
int ieof(void);
|
||||
int lineno_stack[MAX_INCLUDE_DEPTH];
|
||||
char conffile_stack[MAX_INCLUDE_DEPTH][IRCD_BUFSIZE];
|
||||
char conffilebuf[IRCD_BUFSIZE+1];
|
||||
char conffile_stack[MAX_INCLUDE_DEPTH][BUFSIZE];
|
||||
char conffilebuf[BUFSIZE+1];
|
||||
char *current_file = conffilebuf;
|
||||
|
||||
FILE *inc_fbfile_in[MAX_INCLUDE_DEPTH];
|
||||
|
@ -195,7 +194,7 @@ void cinclude(void)
|
|||
if (tmp_fbfile_in == NULL)
|
||||
{
|
||||
/* if its not found in PREFIX, look in ETCPATH */
|
||||
char fnamebuf[IRCD_BUFSIZE];
|
||||
char fnamebuf[BUFSIZE];
|
||||
|
||||
snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ETCPATH, c);
|
||||
tmp_fbfile_in = fopen(fnamebuf, "r");
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#define WE_ARE_MEMORY_C
|
||||
#include "stdinc.h"
|
||||
#include "setup.h"
|
||||
#include "common.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "defaults.h"
|
||||
#include "client.h"
|
||||
|
@ -161,7 +160,7 @@ static void add_cur_list(int type, char *str, int number)
|
|||
|
||||
%union {
|
||||
int number;
|
||||
char string[IRCD_BUFSIZE + 1];
|
||||
char string[BUFSIZE + 1];
|
||||
conf_parm_t * conf_parm;
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
#include "newconf.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "common.h"
|
||||
#include "logger.h"
|
||||
#include "s_conf.h"
|
||||
#include "s_user.h"
|
||||
|
@ -2030,10 +2029,10 @@ void
|
|||
conf_report_error(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
char msg[IRCD_BUFSIZE + 1] = { 0 };
|
||||
char msg[BUFSIZE + 1] = { 0 };
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
|
||||
vsnprintf(msg, BUFSIZE, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (testing_conf)
|
||||
|
@ -2050,10 +2049,10 @@ void
|
|||
conf_report_warning(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
char msg[IRCD_BUFSIZE + 1] = { 0 };
|
||||
char msg[BUFSIZE + 1] = { 0 };
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
|
||||
vsnprintf(msg, BUFSIZE, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (testing_conf)
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "s_conf.h"
|
||||
#include "s_serv.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "parse.h"
|
||||
#include "packet.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "parse.h"
|
||||
#include "client.h"
|
||||
#include "channel.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
#include "s_auth.h"
|
||||
#include "s_conf.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "ircd_defs.h"
|
||||
#include "common.h"
|
||||
#include "s_conf.h"
|
||||
#include "s_newconf.h"
|
||||
#include "client.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "s_serv.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
@ -219,7 +218,7 @@ register_local_user(struct Client *client_p, struct Client *source_p)
|
|||
{
|
||||
struct ConfItem *aconf, *xconf;
|
||||
struct User *user = source_p->user;
|
||||
char tmpstr2[IRCD_BUFSIZE];
|
||||
char tmpstr2[BUFSIZE];
|
||||
char ipaddr[HOSTIPLEN];
|
||||
char myusername[USERLEN+1];
|
||||
int status;
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
@ -218,7 +217,7 @@ send_queued_write(rb_fde_t *F, void *data)
|
|||
static void
|
||||
linebuf_put_msgvbuf(struct MsgBuf *msgbuf, buf_head_t *linebuf, unsigned int capmask, const char *pattern, va_list *va)
|
||||
{
|
||||
char buf[IRCD_BUFSIZE];
|
||||
char buf[BUFSIZE];
|
||||
|
||||
rb_linebuf_newbuf(linebuf);
|
||||
msgbuf_unparse_prefix(buf, sizeof buf, msgbuf, capmask);
|
||||
|
@ -497,7 +496,7 @@ void
|
|||
sendto_channel_flags(struct Client *one, int type, struct Client *source_p,
|
||||
struct Channel *chptr, const char *pattern, ...)
|
||||
{
|
||||
char buf[IRCD_BUFSIZE];
|
||||
char buf[BUFSIZE];
|
||||
va_list args;
|
||||
buf_head_t rb_linebuf_local;
|
||||
buf_head_t rb_linebuf_id;
|
||||
|
|
|
@ -72,7 +72,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "numeric.h"
|
||||
#include "ircd.h"
|
||||
#include "s_conf.h"
|
||||
|
|
|
@ -123,7 +123,7 @@ rb_setselect_ports(rb_fde_t *F, unsigned int type, PF * handler, void *client_da
|
|||
int
|
||||
rb_select_ports(long delay)
|
||||
{
|
||||
int i;
|
||||
int i, fd = -1;
|
||||
unsigned int nget = 1;
|
||||
struct timespec poll_time;
|
||||
struct timespec *p = NULL;
|
||||
|
|
|
@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
|
||||
AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared
|
||||
AM_LDFLAGS += -export-symbols-regex _mheader
|
||||
LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
|
||||
LIBS += $(top_srcdir)/ircd/libircd.la
|
||||
|
||||
auto_load_moddir=@moduledir@/autoload
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ mapi_cap_list_av2 cap_server_time_cap_list[] = {
|
|||
static void
|
||||
cap_server_time_process(hook_data *data)
|
||||
{
|
||||
static char buf[IRCD_BUFSIZE];
|
||||
static char buf[BUFSIZE];
|
||||
time_t ts = rb_current_time();
|
||||
struct MsgBuf *msgbuf = data->arg1;
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "match.h"
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
#include "send.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "client.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
#include "common.h"
|
||||
#include "s_conf.h"
|
||||
#include "s_serv.h"
|
||||
#include "msg.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include "msg.h"
|
||||
#include "parse.h"
|
||||
#include "modules.h"
|
||||
#include "common.h"
|
||||
#include "packet.h"
|
||||
#include "scache.h"
|
||||
#include "s_newconf.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h" /* client struct */
|
||||
#include "common.h"
|
||||
#include "hash.h" /* add_to_client_hash */
|
||||
#include "match.h"
|
||||
#include "ircd.h" /* me */
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "hash.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "hostmask.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
#include "hook.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "m_info.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "hook.h"
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
#include "common.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "channel.h"
|
||||
#include "class.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "hostmask.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "numeric.h"
|
||||
#include "send.h"
|
||||
#include "msg.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "channel.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "s_serv.h"
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "hook.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "numeric.h"
|
||||
#include "s_serv.h"
|
||||
#include "send.h"
|
||||
#include "common.h"
|
||||
#include "channel.h"
|
||||
#include "s_conf.h"
|
||||
#include "s_newconf.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "hook.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "hash.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "class.h" /* report_classes */
|
||||
#include "client.h" /* Client */
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h" /* me */
|
||||
#include "listener.h" /* show_ports */
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
*/
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "ircd.h"
|
||||
#include "match.h"
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
/* List of ircd includes from ../include/ */
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "ircd.h"
|
||||
#include "match.h"
|
||||
#include "numeric.h"
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#include "stdinc.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "match.h"
|
||||
#include "hash.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "hook.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
* USA
|
||||
*/
|
||||
#include "stdinc.h"
|
||||
#include "common.h"
|
||||
#include "client.h"
|
||||
#include "channel.h"
|
||||
#include "hash.h"
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
#include "common.h"
|
||||
#include "client.h"
|
||||
#include "hash.h"
|
||||
#include "channel.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "stdinc.h"
|
||||
#include "whowas.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "hash.h"
|
||||
#include "match.h"
|
||||
#include "ircd.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include "send.h"
|
||||
#include "channel.h"
|
||||
#include "client.h"
|
||||
#include "common.h"
|
||||
#include "defaults.h"
|
||||
#include "class.h"
|
||||
#include "ircd.h"
|
||||
|
|
Loading…
Reference in a new issue