Skip to content

Remote +x #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrIron-no wants to merge 2 commits into
base: u2_10_12_branch
Choose a base branch
from
Open

Remote +x #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eac35d8
Added support for remote +x from U:lined servers.
MrIron-no Sep 20, 2025
c1f35da
Only permit ACCOUNT messages from U:lined servers.
MrIron-no Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ircd/m_account.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@
#include "ircd_string.h"
#include "msg.h"
#include "numnicks.h"
#include "s_conf.h"
#include "s_debug.h"
#include "s_user.h"
#include "send.h"
#include "numeric.h"

/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdlib.h>
Expand All @@ -108,6 +110,7 @@ int ms_account(struct Client* cptr, struct Client* sptr, int parc,
char* parv[])
{
struct Client *acptr;
struct ConfItem *conf;
uint64_t acc_id = 0, acc_flags = 0;

if (parc < 3)
Expand All @@ -117,6 +120,9 @@ int ms_account(struct Client* cptr, struct Client* sptr, int parc,
return protocol_violation(cptr, "ACCOUNT from non-server %s",
cli_name(sptr));

if (!(conf = find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD)))
return send_reply(sptr, ERR_NOPRIVILEGES, parv[1]); /* Ignore ACCOUNT from non U:lined servers. */

if (!(acptr = findNUser(parv[1])))
return 0; /* Ignore ACCOUNT for a user that QUIT; probably crossed */

Expand Down
10 changes: 8 additions & 2 deletions ircd/m_opmode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,22 @@ int ms_opmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
}

conf = find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD);
if (!conf || !(conf->flags & CONF_UWORLD_OPER))
if (!conf || ((!strcmp(parv[2], "+o") || !strcmp(parv[2], "-o")) && !(conf->flags & CONF_UWORLD_OPER)))
return send_reply(sptr, ERR_NOPRIVILEGES, parv[1]);

/* At the moment, we only support +o and -o. set_user_mode() does
/* At the moment, we only support +o, -o and +x. set_user_mode() does
* not support remote mode setting or setting +o.
*/
if (!strcmp(parv[2], "+o") && !IsOper(dptr))
make_oper(sptr, dptr);
else if (!strcmp(parv[2], "-o") && IsOper(dptr))
de_oper(dptr);
else if (!strcmp(parv[2], "+x") && IsAccount(dptr) && !HasHiddenHost(dptr)) {
struct Flags old_mode = cli_flags(dptr);
SetHiddenHost(dptr);
send_umode_out(dptr, dptr, &old_mode, HasPriv(dptr, PRIV_PROPAGATE));
hide_hostmask(dptr, FLAG_HIDDENHOST);
}

return 0;
}
Expand Down