* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_user.c 3586 2007-11-20 11:16:43Z nenolod $
*/
#include "stdinc.h"
}
/* dont replace username if its supposed to be spoofed --fl */
- if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->name, '@'))
+ if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
{
p = username;
sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s",
source_p->sockhost, source_p->preClient->dnsbl_listed->host);
source_p->preClient->dnsbl_listed->hits++;
+
+ sendto_realops_snomask(SNO_REJ, L_ALL,
+ "%s (%s@%s) is being disconnected due to being listed in DNS Blacklist %s",
+ source_p->name, source_p->username, source_p->sockhost, source_p->preClient->dnsbl_listed->host);
+
add_reject(source_p, NULL, NULL);
exit_client(client_p, source_p, &me, "*** Banned (DNS blacklist)");
return CLIENT_EXITED;
if(MyConnect(source_p) && source_p->localClient->passwd)
{
- if (ConfigFileEntry.identifyservice[0] != '\0' &&
- ConfigFileEntry.identifycommand[0] != '\0')
+ if (!EmptyString(ConfigFileEntry.identifyservice) &&
+ !EmptyString(ConfigFileEntry.identifycommand))
{
/* use user@server */
p = strchr(ConfigFileEntry.identifyservice, '@');
expire_umode_p(void *data)
{
struct Client *source_p = data;
- char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
+ const char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
source_p->localClient->override_timeout_event = NULL;
user_mode(source_p, source_p, 3, parv);
}
sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
construct_snobuf(source_p->snomask));
- /* If we're setting +p, expire it, but only from local clients */
- if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
- {
- source_p->localClient->override_timeout_event =
- rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
- }
- else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
- {
- rb_event_delete(source_p->localClient->override_timeout_event);
- source_p->localClient->override_timeout_event = NULL;
- }
-
return 0;
}
Count.oper--;
+ user_metadata_delete(source_p, "OPERSTRING", 1);
+ user_metadata_delete(source_p, "SWHOIS", 1);
+
if(MyConnect(source_p))
{
source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
construct_snobuf(source_p->snomask));
+ /* If we're setting +p, expire it, but only from local clients */
+ if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
+ {
+ source_p->localClient->override_timeout_event =
+ rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
+ }
+ else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
+ {
+ rb_event_delete(source_p->localClient->override_timeout_event);
+ source_p->localClient->override_timeout_event = NULL;
+ }
+
+
return (0);
}
sendto_one_numeric(source_p, RPL_YOURHOST, form_str(RPL_YOURHOST),
get_listener_name(source_p->localClient->listener), ircd_version);
sendto_one_numeric(source_p, RPL_CREATED, form_str(RPL_CREATED), creation);
- sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf, cflagsmyinfo);
+ sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf, cflagsmyinfo, cflagsparaminfo);
show_isupport(source_p);
else
source_p->umodes |= DEFAULT_OPER_UMODES;
- if(oper_p->vhost || !EmptyString(ConfigFileEntry.default_operhost))
+ if(oper_p->swhois)
+ user_metadata_add(source_p, "SWHOIS", oper_p->swhois, 1);
+
+ if(oper_p->operstring)
+ user_metadata_add(source_p, "OPERSTRING", oper_p->operstring, 1);
+
+ if(oper_p->vhost || !EmptyString(GlobalSetOptions.operhost))
{
if(oper_p->vhost)
change_nick_user_host(source_p, source_p->name, source_p->username, oper_p->vhost, 0, "Changing host");
else
- change_nick_user_host(source_p, source_p->name, source_p->username, ConfigFileEntry.default_operhost, 0, "Changing host");
+ change_nick_user_host(source_p, source_p->name, source_p->username, GlobalSetOptions.operhost, 0, "Changing host");
sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host (set by %s)", source_p->host, source_p->servptr->name);
source_p->snomask &= ~SNO_NCHANGE;
if(!IsOperOperwall(source_p))
source_p->umodes &= ~UMODE_OPERWALL;
+ if (!IsOperOverride(source_p))
+ source_p->umodes &= ~UMODE_OVERRIDE;
hdata.client = source_p;
hdata.oldumodes = old;
hdata.oldsnomask = oldsnomask;
user_join(&me, source_p, aconf->autojoin_opers, NULL);
}
+ /* If we're setting +p, expire it */
+ if(ConfigFileEntry.expire_override_time && MyClient(source_p) && source_p->umodes & UMODE_OVERRIDE)
+ {
+ source_p->localClient->override_timeout_event =
+ rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
+ }
+
return (1);
}
chptr = mscptr->chptr;
mptr = mode;
- if(is_owner(mscptr))
+ if(is_admin(mscptr))
{
*mptr++ = 'a';
strcat(modeval, nick);