GitHub-Mirror/NeoStats-NeoIRCd
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed a nick collide... and fixed modes

Browse source
This commit is contained in:
fishwaldo 2002-09-26 12:34:46 +00:00
parent 18c4f4488a
commit b26c297116
5 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/core/m_nick.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_nick.c,v 1.17 2002/09/24 13:25:29 fishwaldo Exp $
* $Id: m_nick.c,v 1.18 2002/09/26 12:34:45 fishwaldo Exp $
*/
#include "stdinc.h"
@ -97,7 +97,7 @@ _moddeinit(void)
mod_del_cmd(&client_msgtab);
}
const char *_version = "$Revision: 1.17 $";
const char *_version = "$Revision: 1.18 $";
#endif
/*
@ -926,9 +926,9 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
target_p->flags |= FLAGS_KILLED;
(void)exit_client(client_p, target_p, &me, "Nick collision");
if(parc == 10)
if(parc == 11)
nick_from_server(client_p,source_p,parc,parv,newts,nick);
else if(parc == 11)
else if(parc == 12)
client_from_server(client_p,source_p,parc,parv,newts,nick);
return 0;

4
src/channel_mode.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: channel_mode.c,v 1.18 2002/09/23 10:47:30 fishwaldo Exp $
* $Id: channel_mode.c,v 1.19 2002/09/26 12:34:45 fishwaldo Exp $
*/
#include "stdinc.h"
@ -703,7 +703,7 @@ chm_simple(struct Client *client_p, struct Client *source_p,
}
/* don't allow users to set +r */
if ((!IsServices(source_p) || !IsUlined(source_p->from)) && (mode_type == MODE_REGCHAN)) {
if ((!IsServices(source_p) || !IsUlined(source_p->servptr)) && (mode_type == MODE_REGCHAN)) {
sendto_one(source_p, ":%s NOTICE %s :Only Services can (un)set +r", me.name, source_p->name);
return;
}

4
src/ircd_parser.y
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: ircd_parser.y,v 1.9 2002/09/19 05:41:11 fishwaldo Exp $
* $Id: ircd_parser.y,v 1.10 2002/09/26 12:34:46 fishwaldo Exp $
*/
%{
@ -1904,13 +1904,11 @@ general_oper_autojoin: OPERAUTOJOIN '=' QSTRING ';'
if (!check_channel_name(ConfigFileEntry.operautojoin) || !IsChannelName(ConfigFileEntry.operautojoin)) {
sendto_realops_flags(FLAGS_ALL, L_ALL, "Invalid Autojoin Channelname %s", ConfigFileEntry.operautojoin);
ilog(L_ERROR, "Invalid autojoin Channelname %s", ConfigFileEntry.operautojoin);
strlcpy(ConfigFileEntry.operautojoin, "#ircop", CHANNELLEN);
return 0;
}
if (ConfigFileEntry.operautojoin[0] == '&') {
sendto_realops_flags(FLAGS_ALL, L_ALL, "Cannot set Autojoin Channel to a local channel");
ilog(L_ERROR, "Cannot set Autojoin Channel to a local channel");
strlcpy(ConfigFileEntry.operautojoin, "#ircop", CHANNELLEN);
return 0;
}
} ;

4
src/s_conf.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: s_conf.c,v 1.8 2002/09/19 05:41:11 fishwaldo Exp $
* $Id: s_conf.c,v 1.9 2002/09/26 12:34:46 fishwaldo Exp $
*/
#include "stdinc.h"
@ -1336,7 +1336,7 @@ set_default_conf(void)
ConfigFileEntry.maximum_links = MAXIMUM_LINKS_DEFAULT;
ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
DupString(ConfigFileEntry.servlink_path, SLPATH);
strlcpy(ConfigFileEntry.operautojoin, "#ircop", CHANNELLEN);
strlcpy(ConfigFileEntry.operautojoin, "", CHANNELLEN);
ConfigFileEntry.egdpool_path = NULL;
#ifdef HAVE_LIBCRYPTO

6
src/s_user.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: s_user.c,v 1.31 2002/09/26 12:17:45 fishwaldo Exp $
* $Id: s_user.c,v 1.32 2002/09/26 12:34:46 fishwaldo Exp $
*/
#include "stdinc.h"
@ -984,7 +984,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, char *parv
sendto_one(source_p, form_str(RPL_UMODEIS), me.name, parv[0], buf);
return 0;
}
sendto_realops_flags(FLAGS_ALL, L_ALL, "source: %s client %s target %s mode %s", source_p->name, client_p->name, target_p->name, parv[2]);
/* find flags already set for user */
setflags = target_p->umodes;
@ -1200,13 +1199,10 @@ send_umode_out(struct Client *source_p, struct Client *client_p,
struct Client *target_p,
int old)
{
struct Client *starget_p;
char buf[BUFSIZE];
dlink_node *ptr;
send_umode(target_p, target_p, old, ALL_UMODES, buf);
sendto_server(IsServer(client_p) ? client_p : NULL, target_p, NULL, NOCAPS, NOCAPS, NOFLAGS, ":%s MODE %s :%s", IsUlined(source_p) ? source_p->name : target_p->servptr->name, target_p->name, buf);
sendto_realops_flags(FLAGS_ALL, L_ALL, "sending client %s (from %s) source %s target %s mode %s", client_p->name, IsUlined(source_p) ? source_p->name : target_p->servptr->name, source_p->name, target_p->name, buf);
}
/*