[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
From: Toni G. <zo...@us...> - 2005-10-25 09:53:03
|
CVSROOT : /cvsroot/irc-dev Module : ircd-ircdev Commit time: 2005-10-25 09:52:53 UTC Modified files: ChangeLog ChangeLog.es RELEASE.NOTES RELEASE.NOTES.es doc/en/features.txt include/channel.h include/class.h include/ircd_features.h include/patchlevel.h include/s_stats.h include/s_user.h ircd/Makefile.in ircd/channel.c ircd/class.c ircd/client.c ircd/gline.c ircd/ircd.c ircd/ircd_features.c ircd/ircd_parser.y ircd/ircd_res.c ircd/m_burst.c ircd/m_clearmode.c ircd/m_create.c ircd/m_defaults.c ircd/m_gline.c ircd/m_invite.c ircd/m_join.c ircd/m_kick.c ircd/m_kill.c ircd/m_names.c ircd/m_proto.c ircd/m_stats.c ircd/m_topic.c ircd/m_version.c ircd/m_who.c ircd/m_whois.c ircd/parse.c ircd/s_conf.c ircd/s_misc.c ircd/s_numeric.c ircd/s_stats.c ircd/s_user.c ircd/test/Makefile.in Removed files: include/supported.h include/whocmds.h ircd/whocmds.c Log message: Author: zoltan <zo...@ir...> Log message: 2005-10-25 Toni García <zo...@ir...> 1.0.alpha45 * ISSUPORT dinámico ---------------------- diff included ---------------------- Index: ircd-ircdev/ChangeLog diff -u ircd-ircdev/ChangeLog:1.46 ircd-ircdev/ChangeLog:1.47 --- ircd-ircdev/ChangeLog:1.46 Mon Oct 17 07:02:32 2005 +++ ircd-ircdev/ChangeLog Tue Oct 25 02:52:43 2005 @@ -1,10 +1,13 @@ # # ChangeLog for ircd-ircdev # -# $Id: ChangeLog,v 1.46 2005/10/17 14:02:32 zolty Exp $ +# $Id: ChangeLog,v 1.47 2005/10/25 09:52:43 zolty Exp $ # # Insert new changes at beginning of the change list. # +2005-10-25 Toni García <zo...@ir...> 1.0.alpha45 + * Dynamic ISSUPORT + 2005-10-17 Toni García <zo...@ir...> 1.0.alpha44 * Undernet synchronization Index: ircd-ircdev/ChangeLog.es diff -u ircd-ircdev/ChangeLog.es:1.46 ircd-ircdev/ChangeLog.es:1.47 --- ircd-ircdev/ChangeLog.es:1.46 Mon Oct 17 07:02:32 2005 +++ ircd-ircdev/ChangeLog.es Tue Oct 25 02:52:43 2005 @@ -1,10 +1,13 @@ # # Log de Cambios para ircd-ircdev # -# $Id: ChangeLog.es,v 1.46 2005/10/17 14:02:32 zolty Exp $ +# $Id: ChangeLog.es,v 1.47 2005/10/25 09:52:43 zolty Exp $ # # Insertar los nuevos cambios al principio de esta lista de cambios. # +2005-10-25 Toni García <zo...@ir...> 1.0.alpha45 + * ISSUPORT dinámico + 2005-10-17 Toni García <zo...@ir...> 1.0.alpha44 * Sincronización Undernet Index: ircd-ircdev/RELEASE.NOTES diff -u ircd-ircdev/RELEASE.NOTES:1.3 ircd-ircdev/RELEASE.NOTES:1.4 --- ircd-ircdev/RELEASE.NOTES:1.3 Thu Sep 1 04:25:42 2005 +++ ircd-ircdev/RELEASE.NOTES Tue Oct 25 02:52:43 2005 @@ -1,5 +1,5 @@ Release notes for IRC-Dev IRCD version 1.0 -Last updated: 23 Apr 2005 +Last updated: 25 October 2005 Written by Toni Garcia <zo...@ir...> Based on earlier documents by Kev <kl...@mi...>, Braden <db...@ya...> and Michael Poole <md...@tr...> @@ -11,6 +11,16 @@ IPv6 support and oplevels) are not supported by old ircds. +Semantic Changes (TAKE NOTE): + +Channel keys and passwords (see the "oplevels" enhancement below) +listed in a JOIN are now only checked against the corresponding +channel. In an old ircd, "JOIN #a,#b key" would attempt to use "key" +as the key for both #a and #b. IRC-Dev IRCD will only attempt to use +it as the key for #a. IRC-Dev IRCD's behavior matches that documented +in RFC 1459. + + Enhancements: The configuration file format has changed to one that is easier to @@ -78,6 +88,11 @@ The server will no longer kick "net riders" in keyed (+k) channels if both sides of the net join have the same key. +IP masks (as used in bans, G-lines, etc) are now parsed in a more +forgiving manner. 127.0.0.0/8, 127.* and 127/8 are all accepted and +mean the same thing. Ambiguous expressions like 127/8 are interpreted +as IPv4 masks; to interpret it as an IPv6 mask, use 127:/8. + GLINE has been extended to allow IRC operators to issue global G-lines; see doc/en/gline.txt for more information about how to use this feature. @@ -175,6 +190,11 @@ when you join using those keys. Part of this channel protection is that you cannot be deopped in channel by someone who you opped. +IP masks (as used in bans, G-lines, etc) are now parsed in a more +forgiving manner. 127.0.0.0/8, 127.* and 127/8 are all accepted and +mean the same thing. Ambiguous expressions like 127/8 are interpreted +as IPv4 masks; to interpret it as an IPv6 mask, use 127:/8. + Configuration Changes: Index: ircd-ircdev/RELEASE.NOTES.es diff -u ircd-ircdev/RELEASE.NOTES.es:1.3 ircd-ircdev/RELEASE.NOTES.es:1.4 --- ircd-ircdev/RELEASE.NOTES.es:1.3 Thu Sep 1 04:25:42 2005 +++ ircd-ircdev/RELEASE.NOTES.es Tue Oct 25 02:52:43 2005 @@ -1,5 +1,5 @@ Notas de lanzamiento para IRCD de IRC-Dev version 1.0 -Ultima actualización: 23 Abril 2005 +Ultima actualización: 25 Octubre 2005 Escrito y traducido por Toni Garcia <zo...@ir...> Basado en anteriores documentos por Kev <kl...@mi...>, Braden <db...@ya...> y Michael Poole <md...@tr...> @@ -12,6 +12,17 @@ IPv6 y oplevels) no están soportadas por ircds viejos. +Cambios semántico (NOTA): + +Las contraseñas de canales (vease la implementación de "oplevels" +abajo) eumeradas en un JOIN ahora se comprueban solamente al canal +correspondiente. En un ircd viejo, "JOIN #a,#b key" procuraría +utilizar la "key" como la contraseña para ambos canales #a y #b. +El IRCD de IRC-Dev procurará utilizar solamente para la contraseña +del canal #a. El comportamiento del IRCD de IRC-Dev está documentado +en el RFC 1459. + + Implementaciones: El formato del archivo de la configuración ha cambiado a uno que es @@ -83,6 +94,11 @@ El servidor no puede kickear por "net riders" en los canales con llave (+k) si ambos lados de la red al unirse tienen la misma llave. +Las máscaras de IP (utilizadas en bans, G-lines, etc) ahora se analizan +de una manera más extensa. 127.0.0.0/8, 127.* y 127/8 son todos aceptadas +y significan la misma cosa. Expresiones ambiguas como 127/8 son interpretadas +como máscaras de IPv4, para interpretarlo como una máscara IPv6 use 127:/8. + GLINE se ha ampliado para permitir a los Operadores de IRC (IRCops) publicar G-lines globales; vea doc/es/gline.txt para más información sobre cómo utilizar esta característica. Index: ircd-ircdev/doc/en/features.txt diff -u ircd-ircdev/doc/en/features.txt:1.3 ircd-ircdev/doc/en/features.txt:1.4 --- ircd-ircdev/doc/en/features.txt:1.3 Thu Sep 1 04:25:42 2005 +++ ircd-ircdev/doc/en/features.txt Tue Oct 25 02:52:43 2005 @@ -1,4 +1,4 @@ -$Id: features.txt,v 1.3 2005/09/01 11:25:42 zolty Exp $ +$Id: features.txt,v 1.4 2005/10/25 09:52:43 zolty Exp $ Many of the old compile-time options are now configured through the server configuration file, ircd.conf. This file is intended to @@ -351,6 +351,12 @@ larger than the CHANNELLEN #define. Like the NICKLEN feature, this is intended to ease changes in channel name length across a network. +USER_GLIST +* Type: boolean +* Default: FALSE + +Optionally removes the ability to list glines by users +(ie /GLINE id...@ho..., shows reason, expiry time etc) AVBANLEN * Type: integer Index: ircd-ircdev/include/channel.h diff -u ircd-ircdev/include/channel.h:1.14 ircd-ircdev/include/channel.h:1.15 --- ircd-ircdev/include/channel.h:1.14 Mon Oct 17 07:02:32 2005 +++ ircd-ircdev/include/channel.h Tue Oct 25 02:52:43 2005 @@ -22,7 +22,7 @@ */ /** @file * @brief Channel management and maintenance. - * @version $Id: channel.h,v 1.14 2005/10/17 14:02:32 zolty Exp $ + * @version $Id: channel.h,v 1.15 2005/10/25 09:52:43 zolty Exp $ */ #ifndef INCLUDED_channel_h #define INCLUDED_channel_h @@ -376,6 +376,9 @@ char *mbma_string; /**< A string */ struct Client *mbma_client; /**< A client */ } mbm_arg; /**< The mode argument */ +#if defined(UNDERNET) + unsigned short mbm_oplevel; /**< Oplevel for a bounce */ +#endif } mb_modeargs[MAXMODEPARAMS]; /**< A mode w/args */ }; @@ -401,6 +404,9 @@ #define MB_UINT(mb, i) ((mb)->mb_modeargs[(i)].mbm_arg.mbma_uint) #define MB_STRING(mb, i) ((mb)->mb_modeargs[(i)].mbm_arg.mbma_string) #define MB_CLIENT(mb, i) ((mb)->mb_modeargs[(i)].mbm_arg.mbma_client) +#if defined(UNDERNET) +#define MB_OPLEVEL(mb, i) ((mb)->mb_modeargs[(i)].mbm_oplevel) +#endif /** A buffer represeting a list of joins to send */ struct JoinBuf { @@ -486,7 +492,7 @@ extern void modebuf_mode_string(struct ModeBuf *mbuf, unsigned int mode, char *string, int free); extern void modebuf_mode_client(struct ModeBuf *mbuf, unsigned int mode, - struct Client *client); + struct Client *client, int oplevel); extern int modebuf_flush(struct ModeBuf *mbuf); extern void modebuf_extract(struct ModeBuf *mbuf, char *buf); Index: ircd-ircdev/include/class.h diff -u ircd-ircdev/include/class.h:1.7 ircd-ircdev/include/class.h:1.8 --- ircd-ircdev/include/class.h:1.7 Wed Jun 22 00:54:29 2005 +++ ircd-ircdev/include/class.h Tue Oct 25 02:52:43 2005 @@ -22,7 +22,7 @@ */ /** @file * @brief Declarations and interfaces for handling connection classes. - * @version $Id: class.h,v 1.7 2005/06/22 07:54:29 zolty Exp $ + * @version $Id: class.h,v 1.8 2005/10/25 09:52:43 zolty Exp $ */ #ifndef INCLUDED_class_h #define INCLUDED_class_h @@ -89,6 +89,8 @@ #define ConfLinks(x) ((x)->conn_class->ref_count) /** Get default usermode for ConfItem \a x. */ #define ConfUmode(x) ((x)->conn_class->default_umode) +/** Find a valid configuration class by name. */ +#define find_class(name) do_find_class((name), 0) /* * Proto types @@ -100,7 +102,7 @@ extern void class_mark_delete(void); extern void class_delete_marked(void); -extern struct ConnectionClass *find_class(const char *name); +extern struct ConnectionClass *do_find_class(const char *name, int extras); extern struct ConnectionClass *make_class(void); extern void free_class(struct ConnectionClass * tmp); extern char *get_conf_class(const struct ConfItem *aconf); Index: ircd-ircdev/include/ircd_features.h diff -u ircd-ircdev/include/ircd_features.h:1.13 ircd-ircdev/include/ircd_features.h:1.14 --- ircd-ircdev/include/ircd_features.h:1.13 Thu Sep 1 04:25:42 2005 +++ ircd-ircdev/include/ircd_features.h Tue Oct 25 02:52:43 2005 @@ -21,7 +21,7 @@ */ /** @file * @brief Public interfaces and declarations for dealing with configurable features. - * @version $Id: ircd_features.h,v 1.13 2005/09/01 11:25:42 zolty Exp $ + * @version $Id: ircd_features.h,v 1.14 2005/10/25 09:52:43 zolty Exp $ */ #ifndef INCLUDED_features_h #define INCLUDED_features_h @@ -58,11 +58,10 @@ FEAT_HIDDEN_HOST, FEAT_HIDDEN_IP, FEAT_CONNEXIT_NOTICES, -#if defined(UNDERNET) FEAT_OPLEVELS, -#endif FEAT_LOCAL_CHANNELS, FEAT_TOPIC_BURST, + FEAT_USER_GLIST, /* features that probably should not be touched */ FEAT_KILLCHASETIMELIMIT, Index: ircd-ircdev/include/patchlevel.h diff -u ircd-ircdev/include/patchlevel.h:1.45 ircd-ircdev/include/patchlevel.h:1.46 --- ircd-ircdev/include/patchlevel.h:1.45 Mon Oct 17 07:02:32 2005 +++ ircd-ircdev/include/patchlevel.h Tue Oct 25 02:52:43 2005 @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: patchlevel.h,v 1.45 2005/10/17 14:02:32 zolty Exp $ + * $Id: patchlevel.h,v 1.46 2005/10/25 09:52:43 zolty Exp $ * */ -#define PATCHLEVEL ".alpha44" +#define PATCHLEVEL "45" -#define RELEASE "1.0" +#define RELEASE "1.0.alpha" /* * Deliberate empty lines Index: ircd-ircdev/include/s_stats.h diff -u ircd-ircdev/include/s_stats.h:1.4 ircd-ircdev/include/s_stats.h:1.5 --- ircd-ircdev/include/s_stats.h:1.4 Mon Jan 10 04:22:00 2005 +++ ircd-ircdev/include/s_stats.h Tue Oct 25 02:52:43 2005 @@ -21,7 +21,7 @@ */ /** @file * @brief Report configuration lines and other statistics from this server. - * @version $Id: s_stats.h,v 1.4 2005/01/10 12:22:00 zolty Exp $ + * @version $Id: s_stats.h,v 1.5 2005/10/25 09:52:43 zolty Exp $ */ #ifndef INCLUDED_s_stats_h #define INCLUDED_s_stats_h @@ -55,8 +55,9 @@ #define STAT_FLAG_OPERONLY 0x01 /**< Oper-only stat */ #define STAT_FLAG_OPERFEAT 0x02 /**< Oper-only if the feature is true */ -#define STAT_FLAG_CASESENS 0x04 /**< Flag is case-sensitive */ -#define STAT_FLAG_VARPARAM 0x08 /**< May have an extra parameter */ +#define STAT_FLAG_LOCONLY 0x04 /**< Local user only */ +#define STAT_FLAG_CASESENS 0x08 /**< Flag is case-sensitive */ +#define STAT_FLAG_VARPARAM 0x10 /**< May have an extra parameter */ extern void stats_init(void); const struct StatDesc *stats_find(const char *name_or_char); Index: ircd-ircdev/include/s_user.h diff -u ircd-ircdev/include/s_user.h:1.8 ircd-ircdev/include/s_user.h:1.9 --- ircd-ircdev/include/s_user.h:1.8 Sun Jul 3 11:44:51 2005 +++ ircd-ircdev/include/s_user.h Tue Oct 25 02:52:43 2005 @@ -21,7 +21,7 @@ */ /** @file s_user.h * @brief Miscellaneous user-related helper functions. - * @version $Id: s_user.h,v 1.8 2005/07/03 18:44:51 zolty Exp $ + * @version $Id: s_user.h,v 1.9 2005/10/25 09:52:43 zolty Exp $ */ #ifndef INCLUDED_s_user_h #define INCLUDED_s_user_h @@ -146,6 +146,12 @@ extern void add_target(struct Client *sptr, void *target); extern unsigned int umode_make_snomask(unsigned int oldmask, char *arg, int what); + +extern void init_isupport(void); +extern void add_isupport(const char *name); +extern void add_isupport_i(const char *name, int value); +extern void add_isupport_s(const char *name, const char *value); +extern void del_isupport(const char *name); extern int send_supported(struct Client *cptr); #define NAMES_ALL 1 /**< List all users in channel */ Index: ircd-ircdev/include/supported.h diff -u ircd-ircdev/include/supported.h:1.9 ircd-ircdev/include/supported.h:removed --- ircd-ircdev/include/supported.h:1.9 Thu Sep 1 04:25:42 2005 +++ ircd-ircdev/include/supported.h Tue Oct 25 02:52:53 2005 @@ -1,90 +0,0 @@ -/* - * IRC-Dev IRCD - An advanced and innovative IRC Daemon, include/supported.h - * - * Copyright (C) 2002-2005 IRC-Dev Development Team <de...@ir...> - * Copyright (C) 1999 Perry Lorier - * - * 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 - * - * $Id: supported.h,v 1.9 2005/09/01 11:25:42 zolty Exp $ - * - */ -#ifndef INCLUDED_supported_h -#define INCLUDED_supported_h - -/* - * Description: This file has the featureset that ircu announces on connecting - * a client. It's in this .h because it's likely to be appended - * to frequently and s_user.h is included by basically everyone. - */ -#include "channel.h" -#include "ircd_defs.h" - -/* - * 'Features' supported by this ircd - */ -#define FEATURES1 \ - "AWAYLEN=%i" \ - " MAXCHANNELLEN=%i" \ - " CHANNELLEN=%i" \ - " MAXNICKLEN=%i" \ - " NICKLEN=%i" \ - " TOPICLEN=%i" - -#define FEATURES2 \ - "CHANMODES=%s" \ - " CHANTYPES=%s" \ - " PREFIX=%s" \ - " STATUSMSG=%s" \ - -#define FEATURES3 \ - "MAXCHANNELS=%i" \ - " MAXBANS=%i" \ - " MAXTARGETS=%i" \ - " MODES=%i" \ - " SILENCE=%i" \ - " WATCH=%i" - -#define FEATURES4 \ - "CNOTICE" \ - " CPRIVMSG" \ - " MAP" \ - " USERIP" \ - " WALLCHOPS" \ - " WALLVOICES" \ - " WHOX" - -#define FEATURES5 "CHARMAPPING=%s" \ - " NETWORK=%s" \ - " FNC" \ - " SAFELIST" - - -#define FEATURESVALUES1 AWAYLEN, CHANNELLEN, feature_int(FEAT_CHANNELLEN), NICKLEN, feature_int(FEAT_NICKLEN), TOPICLEN - -#if defined(DDB) || defined(SERVICES) -#define FEATURESVALUES2 "b,k,l,imnpstrRDd", feature_bool(FEAT_LOCAL_CHANNELS) ? "#&" : "#", "(qov).@+", ".@+" -#else -#define FEATURESVALUES2 "b,k,l,imnpstRDd", feature_bool(FEAT_LOCAL_CHANNELS) ? "#&" : "#", "(ov)@+", "@+" -#endif - -#define FEATURESVALUES3 feature_int(FEAT_MAXCHANNELSPERUSER), feature_int(FEAT_MAXBANS), \ - MAXTARGETS, MAXMODEPARAMS, feature_int(FEAT_MAXSILES), \ - feature_int(FEAT_MAXWATCHS) - -#define FEATURESVALUES5 "rfc1459", feature_str(FEAT_NETWORK) - - -#endif /* INCLUDED_supported_h */ Index: ircd-ircdev/include/whocmds.h diff -u ircd-ircdev/include/whocmds.h:1.5 ircd-ircdev/include/whocmds.h:removed --- ircd-ircdev/include/whocmds.h:1.5 Mon Jan 10 04:22:00 2005 +++ ircd-ircdev/include/whocmds.h Tue Oct 25 02:52:53 2005 @@ -1,114 +0,0 @@ -/* - * IRC-Dev IRCD - An advanced and innovative IRC Daemon, include/whocmds.h - * - * Copyright (C) 2002-2005 IRC-Dev Development Team <de...@ir...> - * Copyright (C) 1990 Jarkko Oikarinen - * - * 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 - * - */ -/** @file whocmds.h - * @brief Support functions for /WHO-like commands. - * @version $Id: whocmds.h,v 1.5 2005/01/10 12:22:00 zolty Exp $ - */ -#ifndef INCLUDED_whocmds_h -#define INCLUDED_whocmds_h - -struct Client; -struct Channel; - - -/* - * m_who() - * m_who with support routines rewritten by Nemesi, August 1997 - * - Alghoritm have been flattened (no more recursive) - * - Several bug fixes - * - Strong performance improvement - * - Added possibility to have specific fields in the output - * See readme.who for further details. - */ - -/* Macros used only in here by m_who and its support functions */ - -#define WHOSELECT_OPER 1 /**< Flag for /WHO: Show IRC operators. */ -#define WHOSELECT_EXTRA 2 /**< Flag for /WHO: Pull rank to see users. */ - -#define WHO_FIELD_QTY 1 /**< Display query type. */ -#define WHO_FIELD_CHA 2 /**< Show common channel name. */ -#define WHO_FIELD_UID 4 /**< Show username. */ -#define WHO_FIELD_NIP 8 /**< Show IP address. */ -#define WHO_FIELD_HOS 16 /**< Show hostname. */ -#define WHO_FIELD_SER 32 /**< Show server. */ -#define WHO_FIELD_NIC 64 /**< Show nickname. */ -#define WHO_FIELD_FLA 128 /**< Show flags (away, oper, chanop, etc). */ -#define WHO_FIELD_DIS 256 /**< Show hop count (distance). */ -#define WHO_FIELD_REN 512 /**< Show realname (info). */ -#define WHO_FIELD_IDL 1024 /**< Show idle time. */ -#if defined(UNDERNET) -#define WHO_FIELD_ACC 2048 /**< Show account name. */ -#endif - -/** Default fields for /WHO */ -#define WHO_FIELD_DEF ( WHO_FIELD_NIC | WHO_FIELD_UID | WHO_FIELD_HOS | WHO_FIELD_SER ) - -/** Is \a ac plainly visible to \a s? - * @param[in] s Client trying to see \a ac. - * @param[in] ac Client being looked at. - */ -#define IS_VISIBLE_USER(s,ac) ((s==ac) || (!IsInvisible(ac))) - -/** Can \a s see \a ac by using the flags in \a b? - * @param[in] s Client trying to see \a ac. - * @param[in] ac Client being looked at. - * @param[in] b Bitset of extra flags (options: WHOSELECT_EXTRA). - */ -#define SEE_LUSER(s, ac, b) (IS_VISIBLE_USER(s, ac) || \ - ((b & WHOSELECT_EXTRA) && MyConnect(ac) && \ - (HasPriv((s), PRIV_SHOW_INVIS) || \ - HasPriv((s), PRIV_SHOW_ALL_INVIS)))) - -/** Can \a s see \a ac by using the flags in \a b? - * @param[in] s Client trying to see \a ac. - * @param[in] ac Client being looked at. - * @param[in] b Bitset of extra flags (options: WHOSELECT_EXTRA). - */ -#define SEE_USER(s, ac, b) (SEE_LUSER(s, ac, b) || \ - ((b & WHOSELECT_EXTRA) && \ - HasPriv((s), PRIV_SHOW_ALL_INVIS))) - -/** Should we show more clients to \a sptr? - * @param[in] sptr Client listing other users. - * @param[in,out] counter Default count for clients. - */ -#define SHOW_MORE(sptr, counter) (HasPriv(sptr, PRIV_UNLIMIT_QUERY) || (!(counter-- < 0)) ) - -/** Can \a s see \a chptr? - * @param[in] s Client trying to see \a chptr. - * @param[in] chptr Channel being looked at. - * @param[in] b Bitset of extra flags (options: WHOSELECT_EXTRA). - */ -#define SEE_CHANNEL(s, chptr, b) (!SecretChannel(chptr) || ((b & WHOSELECT_EXTRA) && HasPriv((s), PRIV_SEE_CHAN))) - -/** Maximum number of lines to send in response to a /WHOIS. */ -#define MAX_WHOIS_LINES 50 - -/* - * Prototypes - */ -extern void do_who(struct Client* sptr, struct Client* acptr, struct Channel* repchan, - int fields, char* qrt); -extern int count_users(char* mask); - -#endif /* INCLUDED_whocmds_h */ Index: ircd-ircdev/ircd/Makefile.in diff -u ircd-ircdev/ircd/Makefile.in:1.28 ircd-ircdev/ircd/Makefile.in:1.29 --- ircd-ircdev/ircd/Makefile.in:1.28 Mon Oct 17 07:02:32 2005 +++ ircd-ircdev/ircd/Makefile.in Tue Oct 25 02:52:43 2005 @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA -# $Id: Makefile.in,v 1.28 2005/10/17 14:02:32 zolty Exp $ +# $Id: Makefile.in,v 1.29 2005/10/25 09:52:43 zolty Exp $ #### Start of system configuration section. #### @@ -236,7 +236,6 @@ uping.c \ userload.c \ watch.c \ - whocmds.c \ whowas.c \ y.tab.c @@ -403,32 +402,29 @@ # DO NOT DELETE THIS LINE (or the blank line after it) -- make depend depends on them. -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" IPcheck.o: IPcheck.c ../config.h ../include/IPcheck.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/ircd.h ../include/struct.h \ - ../include/match.h ../include/msg.h ../include/numnicks.h \ - ../include/ircd_alloc.h ../include/ircd_events.h \ - ../include/ircd_features.h ../include/ircd_log.h ../include/s_debug.h \ - ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/match.h ../include/msg.h ../include/ircd_alloc.h \ + ../include/ircd_events.h ../include/ircd_features.h \ + ../include/ircd_log.h ../include/ircd_string.h ../include/ircd_chattr.h \ + ../include/s_debug.h ../include/s_user.h ../include/send.h channel.o: channel.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ - ../include/ircd_handler.h ../include/capab.h \ - ../include/destruct_event.h ../include/hash.h ../include/ircd.h \ - ../include/struct.h ../include/ircd_alloc.h ../include/ircd_chattr.h \ - ../include/ircd_defs.h ../include/ircd_features.h ../include/ircd_log.h \ + ../include/ircd_handler.h ../include/capab.h ../include/ddb.h \ + ../config.h ../include/client.h ../include/destruct_event.h \ + ../include/hash.h ../include/ircd.h ../include/struct.h \ + ../include/ircd_alloc.h ../include/ircd_chattr.h ../include/ircd_defs.h \ + ../include/ircd_features.h ../include/ircd_log.h \ ../include/ircd_reply.h ../include/ircd_snprintf.h \ ../include/ircd_string.h ../include/list.h ../include/match.h \ ../include/msg.h ../include/msgq.h ../include/numeric.h \ ../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \ - ../include/s_bsd.h ../include/s_conf.h ../include/client.h \ - ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \ - ../include/send.h ../include/struct.h ../include/sys.h \ - ../include/whowas.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/s_bsd.h ../include/s_conf.h ../include/s_debug.h \ + ../include/s_misc.h ../include/s_user.h ../include/send.h \ + ../include/struct.h ../include/sys.h ../include/whowas.h class.o: class.c ../config.h ../include/class.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -437,7 +433,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/list.h ../include/numeric.h \ ../include/s_conf.h ../include/s_debug.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" client.o: client.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -446,7 +441,6 @@ ../include/ircd_reply.h ../include/list.h ../include/msgq.h \ ../include/numeric.h ../include/s_conf.h ../include/s_debug.h \ ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" crule.o: crule.c ../config.h ../include/crule.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -454,20 +448,16 @@ ../include/ircd_alloc.h ../include/ircd_chattr.h \ ../include/ircd_string.h ../include/match.h ../include/s_bsd.h \ ../include/s_debug.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" dbuf.o: dbuf.c ../config.h ../include/dbuf.h ../include/ircd_alloc.h \ ../include/ircd_chattr.h ../include/ircd_features.h \ ../include/ircd_log.h ../include/send.h ../include/sys.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" destruct_event.o: destruct_event.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/s_debug.h \ ../include/ircd_alloc.h ../include/ircd.h ../include/struct.h \ ../include/ircd_events.h ../include/ircd_log.h ../include/send.h \ ../include/msg.h ../include/ircd_handler.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" fileio.o: fileio.c ../config.h ../include/fileio.h \ ../include/ircd_alloc.h ../include/ircd_log.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" gline.o: gline.c ../config.h ../include/gline.h ../include/res.h \ ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \ ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \ @@ -478,18 +468,17 @@ ../include/ircd_chattr.h ../include/match.h ../include/numeric.h \ ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \ ../include/s_stats.h ../include/send.h ../include/struct.h \ - ../include/msg.h ../include/numnicks.h ../include/whocmds.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/msg.h ../include/numnicks.h hash.o: hash.c ../config.h ../include/hash.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/channel.h ../include/ddb.h ../config.h \ ../include/client.h ../include/ircd_alloc.h ../include/ircd_chattr.h \ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ - ../include/ircd.h ../include/struct.h ../include/msg.h \ - ../include/numeric.h ../include/random.h ../include/send.h \ - ../include/struct.h ../include/sys.h ../include/watch.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/ircd.h ../include/struct.h ../include/match.h \ + ../include/msg.h ../include/numeric.h ../include/random.h \ + ../include/send.h ../include/struct.h ../include/sys.h \ + ../include/watch.h ircd.o: ircd.c ../config.h ../include/ircd.h ../include/struct.h \ ../include/ircd_defs.h ../include/IPcheck.h ../include/class.h \ ../include/client.h ../include/dbuf.h ../include/msgq.h \ @@ -508,11 +497,9 @@ ../include/s_misc.h ../include/s_stats.h ../include/send.h \ ../include/sys.h ../include/uping.h ../include/userload.h \ ../include/version.h ../include/whowas.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_alloc.o: ircd_alloc.c ../config.h ../include/ircd_alloc.h \ ../include/ircd_log.h ../include/ircd_string.h ../include/ircd_chattr.h \ ../include/s_debug.h ../include/ircd_defs.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_auth.o: ircd_auth.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -524,19 +511,16 @@ ../include/msg.h ../include/msgq.h ../include/res.h ../include/s_bsd.h \ ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_crypt.o: ircd_crypt.c ../config.h ../include/ircd_crypt.h \ ../include/ircd_alloc.h ../include/ircd_features.h \ ../include/ircd_log.h ../include/ircd_string.h ../include/ircd_chattr.h \ ../include/s_debug.h ../include/ircd_defs.h \ ../include/ircd_crypt_native.h ../include/ircd_crypt_plain.h \ ../include/ircd_crypt_smd5.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_events.o: ircd_events.c ../config.h ../include/ircd_events.h \ ../include/ircd.h ../include/struct.h ../include/ircd_defs.h \ ../include/ircd_alloc.h ../include/ircd_log.h \ ../include/ircd_snprintf.h ../include/s_debug.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_features.o: ircd_features.c ../config.h ../include/ircd_features.h \ ../include/channel.h ../include/ircd_defs.h ../include/res.h \ ../include/class.h ../include/client.h ../include/dbuf.h \ @@ -547,9 +531,9 @@ ../include/ircd_chattr.h ../include/match.h ../include/motd.h \ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/random.h ../include/s_bsd.h ../include/s_debug.h \ - ../include/s_misc.h ../include/s_stats.h ../include/send.h \ - ../include/struct.h ../include/sys.h ../include/whowas.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/s_misc.h ../include/s_stats.h ../include/s_user.h \ + ../include/send.h ../include/struct.h ../include/sys.h \ + ../include/whowas.h ircd_log.o: ircd_log.c ../config.h ../include/ircd_log.h \ ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \ ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \ @@ -558,7 +542,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/ircd.h \ ../include/struct.h ../include/numeric.h ../include/s_debug.h \ ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_relay.o: ircd_relay.c ../config.h ../include/ircd_relay.h \ ../include/channel.h ../include/ircd_defs.h ../include/res.h \ ../include/client.h ../include/dbuf.h ../include/msgq.h \ @@ -569,7 +552,6 @@ ../include/match.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_debug.h ../include/s_misc.h \ ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_reply.o: ircd_reply.c ../config.h ../include/ircd_reply.h \ ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \ ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \ @@ -578,7 +560,6 @@ ../include/msg.h ../include/msgq.h ../include/numeric.h \ ../include/s_conf.h ../include/client.h ../include/s_debug.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_res.o: ircd_res.c ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../config.h ../include/ircd_handler.h ../include/res.h \ @@ -590,31 +571,25 @@ ../include/s_bsd.h ../include/s_debug.h ../include/s_stats.h \ ../include/ircd_features.h ../include/send.h ../include/sys.h \ ../include/res.h ../include/ircd_reslib.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_reslib.o: ircd_reslib.c ../include/ircd.h ../include/struct.h \ ../include/ircd_defs.h ../include/res.h ../config.h \ ../include/ircd_reslib.h ../include/ircd_defs.h ../include/fileio.h \ ../include/ircd_string.h ../include/ircd_chattr.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_signal.o: ircd_signal.c ../config.h ../include/ircd.h \ ../include/struct.h ../include/ircd_defs.h ../include/ircd_events.h \ ../include/ircd_log.h ../include/ircd_signal.h ../include/s_conf.h \ ../include/client.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_snprintf.o: ircd_snprintf.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/channel.h ../include/ircd_log.h \ ../include/ircd_snprintf.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_string.o: ircd_string.c ../config.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/ircd_defs.h \ ../include/ircd_chattr.h ../include/ircd_log.h ../include/res.h \ chattr.tab.c -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" ircd_tea.o: ircd_tea.c ../config.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" jupe.o: jupe.c ../config.h ../include/jupe.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -625,11 +600,9 @@ ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \ ../include/s_misc.h ../include/send.h ../include/struct.h \ ../include/sys.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" lex.yy.o: lex.yy.c ../config.h ../include/ircd.h ../include/struct.h \ ../include/ircd_defs.h ../include/ircd_alloc.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/s_debug.h y.tab.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" list.o: list.c ../config.h ../include/list.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -641,7 +614,6 @@ ../include/s_bsd.h ../include/s_conf.h ../include/client.h \ ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \ ../include/send.h ../include/struct.h ../include/whowas.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" listener.o: listener.c ../config.h ../include/listener.h \ ../include/ircd_defs.h ../include/ircd_events.h ../include/res.h \ ../include/client.h ../include/dbuf.h ../include/msgq.h \ @@ -654,7 +626,6 @@ ../include/s_bsd.h ../include/s_conf.h ../include/client.h \ ../include/s_misc.h ../include/s_stats.h ../include/send.h \ ../include/sys.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_admin.o: m_admin.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -663,7 +634,6 @@ ../include/ircd_reply.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_conf.h ../include/client.h \ ../include/s_user.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_asll.o: m_asll.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -672,7 +642,6 @@ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/match.h ../include/msg.h ../include/send.h \ ../include/s_bsd.h ../include/s_user.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_away.o: m_away.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -680,7 +649,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_burst.o: m_burst.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -692,7 +660,6 @@ ../include/match.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_conf.h ../include/client.h \ ../include/s_misc.h ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_cap.o: m_cap.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -700,7 +667,6 @@ ../include/ircd_log.h ../include/ircd_reply.h \ ../include/ircd_snprintf.h ../include/ircd_string.h ../include/msg.h \ ../include/numeric.h ../include/send.h ../include/s_user.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_clearmode.o: m_clearmode.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -711,14 +677,12 @@ ../include/ircd_chattr.h ../include/list.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \ ../include/client.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_close.o: m_close.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/ircd.h ../include/struct.h \ ../include/ircd_log.h ../include/ircd_reply.h ../include/numeric.h \ ../include/s_bsd.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_connect.o: m_connect.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -729,13 +693,11 @@ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/s_bsd.h ../include/s_conf.h ../include/client.h \ ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_cprivmsg.o: m_cprivmsg.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/ircd_log.h ../include/ircd_reply.h \ ../include/ircd_string.h ../include/ircd_chattr.h ../include/s_user.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_create.o: m_create.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -745,15 +707,12 @@ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_debug.h ../include/s_misc.h \ ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_defaults.o: m_defaults.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ ../include/capab.h ../include/ircd.h ../include/struct.h \ ../include/ircd_log.h ../include/ircd_reply.h ../include/numeric.h \ - ../include/numnicks.h ../include/send.h ../include/supported.h \ - ../include/channel.h ../include/version.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/numnicks.h ../include/send.h ../include/version.h m_destruct.o: m_destruct.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -762,7 +721,6 @@ ../include/struct.h ../include/ircd_log.h ../include/ircd_reply.h \ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_desynch.o: m_desynch.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -771,7 +729,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_die.o: m_die.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -779,7 +736,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_bsd.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_endburst.o: m_endburst.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -788,7 +744,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_error.o: m_error.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -797,7 +752,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/s_debug.h ../include/s_misc.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_get.o: m_get.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -806,7 +760,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_gline.o: m_gline.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -816,7 +769,6 @@ ../include/ircd_chattr.h ../include/match.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \ ../include/client.h ../include/s_misc.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_help.o: m_help.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -824,7 +776,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_info.o: m_info.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -834,7 +785,6 @@ ../include/numnicks.h ../include/s_misc.h ../include/s_user.h \ ../include/s_conf.h ../include/client.h ../include/send.h \ ../include/version.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_invite.o: m_invite.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -844,7 +794,6 @@ ../include/ircd_chattr.h ../include/list.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_user.h \ ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_ison.o: m_ison.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -852,17 +801,16 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msgq.h ../include/numeric.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_join.o: m_join.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ - ../include/ircd_handler.h ../include/capab.h ../include/gline.h \ - ../include/hash.h ../include/ircd.h ../include/struct.h \ - ../include/ircd_chattr.h ../include/ircd_features.h \ - ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ - ../include/msg.h ../include/numeric.h ../include/numnicks.h \ - ../include/s_debug.h ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/ircd_handler.h ../include/capab.h ../include/ddb.h \ + ../config.h ../include/client.h ../include/gline.h ../include/hash.h \ + ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \ + ../include/ircd_features.h ../include/ircd_log.h \ + ../include/ircd_reply.h ../include/ircd_string.h ../include/msg.h \ + ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \ + ../include/s_user.h ../include/send.h ../include/sys.h m_jupe.o: m_jupe.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -872,7 +820,6 @@ ../include/ircd_chattr.h ../include/match.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \ ../include/client.h ../include/s_misc.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_kick.o: m_kick.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -881,7 +828,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_kill.o: m_kill.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -891,7 +837,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_misc.h \ ../include/send.h ../include/whowas.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_links.o: m_links.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -901,7 +846,6 @@ ../include/ircd_chattr.h ../include/match.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_user.h \ ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_list.o: m_list.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -911,7 +855,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/s_bsd.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_lusers.o: m_lusers.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -922,7 +865,6 @@ ../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \ ../include/s_misc.h ../include/s_serv.h ../include/s_user.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_map.o: m_map.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -933,7 +875,6 @@ ../include/match.h ../include/msg.h ../include/numeric.h \ ../include/s_user.h ../include/s_serv.h ../include/send.h \ ../include/querycmds.h ../include/ircd_features.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_mode.o: m_mode.c ../config.h ../include/handlers.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -943,7 +884,6 @@ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_conf.h ../include/client.h \ ../include/s_debug.h ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_motd.o: m_motd.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -953,7 +893,6 @@ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/s_conf.h ../include/client.h ../include/class.h \ ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_names.o: m_names.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -962,7 +901,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_nick.o: m_nick.c ../config.h ../include/IPcheck.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -973,7 +911,6 @@ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \ ../include/send.h ../include/sys.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_notice.o: m_notice.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -981,7 +918,6 @@ ../include/ircd_relay.h ../include/ircd_reply.h \ ../include/ircd_string.h ../include/match.h ../include/msg.h \ ../include/numeric.h ../include/send.h ../include/handlers.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_oper.o: m_oper.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -993,7 +929,6 @@ ../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \ ../include/s_conf.h ../include/client.h ../include/s_debug.h \ ../include/s_user.h ../include/s_misc.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_opmode.o: m_opmode.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1003,7 +938,6 @@ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/send.h ../include/s_conf.h \ ../include/client.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_part.o: m_part.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -1012,13 +946,11 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_pass.o: m_pass.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_ping.o: m_ping.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -1027,7 +959,6 @@ ../include/struct.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/opercmds.h ../include/s_debug.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_pong.o: m_pong.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -1036,7 +967,6 @@ ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/opercmds.h ../include/s_user.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_privmsg.o: m_privmsg.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1045,7 +975,6 @@ ../include/ircd_log.h ../include/ircd_relay.h ../include/ircd_reply.h \ ../include/ircd_string.h ../include/match.h ../include/msg.h \ ../include/numeric.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_privs.o: m_privs.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1053,7 +982,6 @@ ../include/struct.h ../include/ircd_log.h ../include/ircd_reply.h \ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_proto.o: m_proto.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1061,9 +989,7 @@ ../include/ircd_log.h ../include/ircd_alloc.h ../include/ircd_chattr.h \ ../include/ircd_reply.h ../include/ircd_string.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \ - ../include/s_misc.h ../include/send.h ../include/supported.h \ - ../include/channel.h ../include/version.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" + ../include/s_misc.h ../include/send.h ../include/version.h m_pseudo.o: m_pseudo.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1074,7 +1000,6 @@ ../include/ircd_snprintf.h ../include/msg.h ../include/numeric.h \ ../include/numnicks.h ../include/s_conf.h ../include/client.h \ ../include/s_user.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_quit.o: m_quit.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -1082,7 +1007,6 @@ ../include/struct.h ../include/ircd_log.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/struct.h ../include/s_misc.h \ ../include/ircd_reply.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_rehash.o: m_rehash.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1090,7 +1014,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/motd.h ../include/numeric.h \ ../include/s_conf.h ../include/client.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_reset.o: m_reset.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1099,7 +1022,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_restart.o: m_restart.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1107,7 +1029,6 @@ ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_rping.o: m_rping.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1116,7 +1037,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \ ../include/s_user.h ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_rpong.o: m_rpong.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1125,7 +1045,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_server.o: m_server.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1138,7 +1057,6 @@ ../include/s_bsd.h ../include/s_conf.h ../include/client.h \ ../include/s_debug.h ../include/s_misc.h ../include/s_serv.h \ ../include/send.h ../include/userload.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_set.o: m_set.c ../config.h ../include/client.h ../include/ircd_defs.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ ../include/ircd_handler.h ../include/res.h ../include/capab.h \ @@ -1147,7 +1065,6 @@ ../include/ircd_reply.h ../include/ircd_string.h \ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \ ../include/send.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_settime.o: m_settime.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1157,7 +1074,6 @@ ../include/ircd_string.h ../include/ircd_chattr.h ../include/list.h \ ../include/msg.h ../include/numeric.h ../include/numnicks.h \ ../include/s_user.h ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_silence.o: m_silence.c ../config.h ../include/channel.h \ ../include/ircd_defs.h ../include/res.h ../include/client.h \ ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \ @@ -1168,7 +1084,6 @@ ../include/ircd_chattr.h ../include/list.h ../include/msg.h \ ../include/numeric.h ../include/numnicks.h ../include/s_user.h \ ../include/send.h ../include/struct.h -# 1 "/usr/home/zoltan/ircd-ircdev/ircd//" m_squit.o: m_squit.c ../config.h ../include/client.h \ ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \ ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \ @@ -1177,7 ... [truncated message content] |