This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Undernet IRC Server Source Code.".
The branch, u2_10_12_branch has been updated
via 6440220c73454f03fb9fe02b3585d4ccdb4603f7 (commit)
via d4109f547107728f529d3586e7a247ed70aeea4c (commit)
via 264338ef1e07bcfd17264b416bdb018db88cce5f (commit)
via 00c0c1318fd40379d7de8a8ef046e2ef2f2832c5 (commit)
from 4e44b583e0853147a22c2571f76fb1cba2ba9fc5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6440220c73454f03fb9fe02b3585d4ccdb4603f7
Merge: 264338ef d4109f54
Author: Michael Poole <[email protected]>
Date: Sun Nov 10 16:25:22 2024 -0500
Merge pull request #41 from MrIron-no/cap
Var. fixes to CAP implementation.
commit d4109f547107728f529d3586e7a247ed70aeea4c
Author: MrIron-no <[email protected]>
Date: Sun Nov 10 22:20:57 2024 +0100
CHGHOST: Fix bug causing unidented usernames not being included. AWAY:
Sending AWAY message on-join (thanks to progval). ACCOUNTNOTIFY: Sending
ACCOUNT message to the logged in user.
diff --git a/ircd/channel.c b/ircd/channel.c
index e8322fbb..e5d88bb3 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3561,6 +3561,9 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan,
unsigned int flags)
CAP_EXTJOIN, _CAP_LAST_CAP, "%H %s :%s", chan,
IsAccount(jbuf->jb_source) ? cli_account(jbuf->jb_source) : "*",
cli_info(jbuf->jb_source));
+ if (cli_user(jbuf->jb_source)->away)
+ sendcmdto_capflag_common_channels_butone(jbuf->jb_source, CMD_AWAY,
jbuf->jb_connect,
+ CAP_AWAYNOTIFY, _CAP_LAST_CAP, ":%s",
cli_user(jbuf->jb_source)->away);
/* send an op, too, if needed */
if (flags & CHFL_CHANOP && (oplevel < MAXOPLEVEL ||
!MyUser(jbuf->jb_source)))
diff --git a/ircd/m_account.c b/ircd/m_account.c
index bb9a8c94..26b4783e 100644
--- a/ircd/m_account.c
+++ b/ircd/m_account.c
@@ -147,5 +147,8 @@ int ms_account(struct Client* cptr, struct Client* sptr,
int parc,
sendcmdto_capflag_common_channels_butone(acptr, CMD_ACCOUNT, acptr,
CAP_ACCOUNTNOTIFY,
_CAP_LAST_CAP, "%s", cli_user(acptr)->account);
+ if (CapHas(cli_active(acptr), CAP_ACCOUNTNOTIFY))
+ sendcmdto_one(acptr, CMD_ACCOUNT, cli_from(acptr), "%s",
cli_user(acptr)->account);
+
return 0;
}
diff --git a/ircd/s_user.c b/ircd/s_user.c
index 6a60e78f..e70a2ea7 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -905,7 +905,7 @@ hide_hostmask(struct Client *cptr, unsigned int flag)
sendcmdto_capflag_common_channels_butone(cptr, CMD_QUIT, cptr,
_CAP_LAST_CAP, CAP_CHGHOST, ":Registered");
sendcmdto_capflag_common_channels_butone(cptr, CMD_CHGHOST, cptr,
CAP_CHGHOST, _CAP_LAST_CAP, "%s %s.%s",
- cli_username(cptr), cli_account(cptr), feature_str(FEAT_HIDDEN_HOST));
+ cli_user(cptr)->username, cli_user(cptr)->account,
feature_str(FEAT_HIDDEN_HOST));
ircd_snprintf(0, cli_user(cptr)->host, HOSTLEN, "%s.%s",
cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
commit 264338ef1e07bcfd17264b416bdb018db88cce5f
Merge: 4e44b583 00c0c131
Author: Michael Poole <[email protected]>
Date: Mon Oct 28 19:53:47 2024 -0400
Merge pull request #39 from hiddn/fixglinelookup
fix /gline command: wc matching will now work for lookups
commit 00c0c1318fd40379d7de8a8ef046e2ef2f2832c5
Author: Hidden <[email protected]>
Date: Tue Oct 15 21:12:34 2024 -0400
fix /gline command: wc matching will now work for lookups
diff --git a/ircd/gline.c b/ircd/gline.c
index 17ee7f0d..ec36e021 100644
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -951,7 +951,7 @@ gline_find(char *userhost, unsigned int flags)
(flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
else if ((flags & GLINE_EXACT ? ircd_strcmp(gline->gl_user, userhost) :
- match(gline->gl_user, userhost)) == 0)
+ match(userhost, gline->gl_user)) == 0)
return gline;
}
}
@@ -973,10 +973,10 @@ gline_find(char *userhost, unsigned int flags)
(ircd_strcmp(gline->gl_user, user) == 0))
break;
} else {
- if (((gline->gl_host && host && match(gline->gl_host, host) == 0)
- || (!gline->gl_host && !host)) &&
- (match(gline->gl_user, user) == 0))
- break;
+ if (((gline->gl_host && host && match(host, gline->gl_host) == 0) ||
+ (!gline->gl_host && !host)) &&
+ (match(user, gline->gl_user) == 0))
+ break;
}
}
-----------------------------------------------------------------------
Summary of changes:
ircd/channel.c | 3 +++
ircd/gline.c | 10 +++++-----
ircd/m_account.c | 3 +++
ircd/s_user.c | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
hooks/post-receive
--
Undernet IRC Server Source Code.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
