struct Client *acptr;
char *to;
+ /* Assume it's me, if no server or an unregistered client */
+ if (parc <= server || EmptyString((to = parv[server])) || IsUnknown(from))
+ return (HUNTED_ISME);
+
if (MustBeOper && !IsPrivileged(from))
{
send_reply(from, ERR_NOPRIVILEGES);
return HUNTED_NOSUCH;
}
- /* Assume it's me, if no server or an unregistered client */
- if (parc <= server || EmptyString((to = parv[server])) || IsUnknown(from))
- return (HUNTED_ISME);
/* Make sure it's a server */
if (MyUser(from)) {
return exit_client(cptr, sptr, &me, "Unknown error -- Try again");
}
ircd_strncpy(user->host, cli_sockhost(sptr), HOSTLEN);
+ ircd_strncpy(user->realhost, cli_sockhost(sptr), HOSTLEN);
aconf = cli_confs(sptr)->value.aconf;
clean_user_id(user->username,
sendcmdto_serv_butone(user->server, CMD_NICK, cptr,
"%s %d %Tu %s %s %s%s%s%s %s%s :%s",
nick, cli_hopcount(sptr) + 1, cli_lastnick(sptr),
- user->username, user->host,
+ user->username, user->realhost,
*tmpstr ? "+" : "", tmpstr, *tmpstr ? " " : "",
inttobase64(ip_base64, ntohl(cli_ip(sptr).s_addr), 6),
NumNick(sptr), cli_info(sptr));
{ FLAGS_SERVNOTICE, 's' },
{ FLAGS_DEAF, 'd' },
{ FLAGS_CHSERV, 'k' },
- { FLAGS_DEBUG, 'g' }
+ { FLAGS_DEBUG, 'g' },
+ { FLAGS_ACCOUNT, 'r' },
+ { FLAGS_HIDDENHOST, 'x' }
};
#define USERMODELIST_SIZE sizeof(userModeList) / sizeof(struct UserMode)
{
if (IsServer(sptr)) {
int i;
+ const char* account = 0;
const char* p;
/*
for (i = 0; i < USERMODELIST_SIZE; ++i) {
if (userModeList[i].c == *p) {
cli_flags(new_client) |= userModeList[i].flag;
+ if (userModeList[i].flag & FLAGS_ACCOUNT)
+ account = parv[7];
break;
}
}
cli_serv(sptr)->ghost = 0; /* :server NICK means end of net.burst */
ircd_strncpy(cli_username(new_client), parv[4], USERLEN);
ircd_strncpy(cli_user(new_client)->host, parv[5], HOSTLEN);
+ ircd_strncpy(cli_user(new_client)->realhost, parv[5], HOSTLEN);
ircd_strncpy(cli_info(new_client), parv[parc - 1], REALLEN);
+ if (account)
+ ircd_strncpy(cli_user(new_client)->account, account, ACCOUNTLEN);
+ if (HasHiddenHost(new_client))
+ ircd_snprintf(0, cli_user(new_client)->host, HOSTLEN, "%s.%s",
+ account, feature_str(FEAT_HIDDEN_HOST));
return register_user(cptr, new_client, cli_name(new_client), parv[4]);
}
*/
if (MyUser(sptr)) {
const char* channel_name;
+ struct Membership *member;
if ((channel_name = find_no_nickchange_channel(sptr))) {
return send_reply(cptr, ERR_BANNICKCHANGE, channel_name);
}
* then 30 seconds ago. This is intended to get rid of
* clone bots doing NICK FLOOD. -SeKs
* If someone didn't change their nick for more then 60 seconds
- * however, allow to do two nick changes immedately after another
+ * however, allow to do two nick changes immediately after another
* before limiting the nick flood. -Run
*/
if (CurrentTime < cli_nextnick(cptr)) {
if (cli_nextnick(cptr) < CurrentTime)
cli_nextnick(cptr) = CurrentTime;
}
+ /* Invalidate all bans against the user so we check them again */
+ for (member = (cli_user(cptr))->channel; member;
+ member = member->next_channel)
+ ClearBanValid(member);
}
/*
* Also set 'lastnick' to current time, if changed.
* on that channel. Propagate notice to other servers.
*/
if (IsUser(sptr)) {
- sendcmdto_common_channels(sptr, CMD_NICK, ":%s", nick);
+ sendcmdto_common_channels_butone(sptr, CMD_NICK, NULL, ":%s", nick);
add_history(sptr, 1);
sendcmdto_serv_butone(sptr, CMD_NICK, cptr, "%s %Tu", nick,
cli_lastnick(sptr));
if ((acptr = FindUser(name))) {
if (users_found++)
msgq_append(0, mb, " ");
- (*fmt)(acptr, mb);
+ (*fmt)(acptr, sptr, mb);
}
if (5 == ++arg_count)
break;
msgq_clean(mb);
}
+/*
+ * hide_hostmask()
+ *
+ * If, after setting the flags, the user has both HiddenHost and Account
+ * set, its hostmask is changed.
+ */
+#define FLAGS_HOST_HIDDEN (FLAGS_ACCOUNT|FLAGS_HIDDENHOST)
+int hide_hostmask(struct Client *cptr, unsigned int flags)
+{
+ struct Membership *chan;
+ int newflags;
+
+ if (MyConnect(cptr) && !feature_bool(FEAT_HOST_HIDING))
+ flags &= ~FLAGS_HIDDENHOST;
+
+ newflags = cli_flags(cptr) | flags;
+ if ((newflags & FLAGS_HOST_HIDDEN) != FLAGS_HOST_HIDDEN) {
+ /* The user doesn't have both flags, don't change the hostmask */
+ cli_flags(cptr) |= flags;
+ return 0;
+ }
+
+ sendcmdto_common_channels_butone(cptr, CMD_QUIT, cptr, ":Registered");
+ ircd_snprintf(0, cli_user(cptr)->host, HOSTLEN, "%s.%s",
+ cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
+ cli_flags(cptr) |= flags;
+
+ /*
+ * Go through all channels the client was on, rejoin him
+ * and set the modes, if any
+ */
+ for (chan = cli_user(cptr)->channel; chan; chan = chan->next_channel) {
+ sendcmdto_channel_butserv_butone(cptr, CMD_JOIN, chan->channel, cptr,
+ "%H", chan->channel);
+ if (IsChanOp(chan) && HasVoice(chan)) {
+ sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr,
+ "%H +ov %C %C", chan->channel, cptr, cptr);
+ } else if (IsChanOp(chan) || HasVoice(chan)) {
+ sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr,
+ "%H +%c %C", chan->channel, IsChanOp(chan) ? 'o' : 'v', cptr);
+ }
+ }
+ return 0;
+}
+
/*
* set_user_mode() added 15/10/91 By Darren Reed.
int snomask_given = 0;
char buf[BUFSIZE];
int prop = 0;
+ int do_host_hiding = 0;
what = MODE_ADD;
if (IsServer(sptr) || sptr != acptr)
{
if (IsServer(cptr))
- sendcmdto_flag_butone(&me, CMD_WALLOPS, 0, FLAGS_WALLOP,
- ":MODE for User %s from %s!%s", parv[1],
+ sendwallto_group_butone(&me, WALL_WALLOPS, 0,
+ "MODE for User %s from %s!%s", parv[1],
cli_name(cptr), cli_name(sptr));
else
send_reply(sptr, ERR_USERSDONTMATCH);
m = buf;
*m++ = '+';
for (i = 0; i < USERMODELIST_SIZE; ++i) {
- if ( (userModeList[i].flag & cli_flags(sptr)))
+ if ((userModeList[i].flag & cli_flags(sptr)) &&
+ !(userModeList[i].flag & FLAGS_ACCOUNT))
*m++ = userModeList[i].c;
}
*m = '\0';
else
ClearDebug(sptr);
break;
+ case 'x':
+ if (what == MODE_ADD)
+ do_host_hiding = 1;
+ break;
default:
break;
}
--UserStats.inv_clients;
if (!(setflags & FLAGS_INVISIBLE) && IsInvisible(sptr))
++UserStats.inv_clients;
+ if (!(setflags & FLAGS_HIDDENHOST) && do_host_hiding)
+ hide_hostmask(sptr, FLAGS_HIDDENHOST);
send_umode_out(cptr, sptr, setflags, prop);
return 0;
if ( (c_flags & userModeList[i].flag))
*m++ = userModeList[i].c;
}
+
+ if (IsAccount(cptr)) {
+ char* t = cli_user(cptr)->account;
+
+ *m++ = ' ';
+ while ((*m++ = *t++))
+ ; /* Empty loop */
+ }
+
*m = '\0';
return umodeBuf; /* Note: static buffer, gets
struct User *user;
static char sender[HOSTLEN + NICKLEN + USERLEN + 5];
static char senderip[16 + NICKLEN + USERLEN + 5];
+ static char senderh[HOSTLEN + ACCOUNTLEN + USERLEN + 6];
if (!cli_user(acptr) || !(lp = cli_user(acptr)->silence) || !(user = cli_user(sptr)))
return 0;
user->username, user->host);
ircd_snprintf(0, senderip, sizeof(senderip), "%s!%s@%s", cli_name(sptr),
user->username, ircd_ntoa((const char*) &(cli_ip(sptr))));
+ if (HasHiddenHost(sptr))
+ ircd_snprintf(0, senderh, sizeof(senderh), "%s!%s@%s", cli_name(sptr),
+ user->username, user->realhost);
for (; lp; lp = lp->next)
{
- if ((!(lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, sender)) ||
+ if ((!(lp->flags & CHFL_SILENCE_IPMASK) && (!match(lp->value.cp, sender) ||
+ (HasHiddenHost(sptr) && !match(lp->value.cp, senderh)))) ||
((lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, senderip)))
{
if (!MyConnect(sptr))
projects / ircu2.10.12-pk.git / blobdiff