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 6e7faac5523c092ba2062432c5e0228bfa7871f4 (commit)
via 0ddcaac8d5eee8cf3318f39e96b130cff66a4a3b (commit)
from dc983eff145c2f5c8257fa671800cd1b4374c4e2 (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 6e7faac5523c092ba2062432c5e0228bfa7871f4
Author: Michael Poole <[email protected]>
Date: Wed Oct 19 22:56:03 2016 -0400
make_client: Set initial username to "" rather than "unknown".
This allows Client blocks to use expressions like ip = "@127.0.0.1"; to
match clients with no ident results. Document this.
diff --git a/doc/example.conf b/doc/example.conf
index 46541f2..fad7ad9 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -164,7 +164,8 @@ Class {
# };
#
# Everything in a Client block is optional. If a username mask is
-# given, it must match the client's username from the IDENT protocol.
+# given, it must match the client's username from the IDENT protocol;
+# an empty username mask matches clients for whom IDENT failed.
# If a host mask is given, the client's hostname must resolve and
# match the host mask. If a CIDR-style IP mask is given, the client
# must have an IP matching that range. If maxlinks is given, it is
diff --git a/ircd/list.c b/ircd/list.c
index d304e16..ace92a0 100644
--- a/ircd/list.c
+++ b/ircd/list.c
@@ -227,7 +227,7 @@ struct Client* make_client(struct Client *from, int status)
cli_magic(cptr) = CLIENT_MAGIC;
cli_status(cptr) = status;
cli_hnext(cptr) = cptr;
- strcpy(cli_username(cptr), "unknown");
+ strcpy(cli_username(cptr), "");
return cptr;
}
commit 0ddcaac8d5eee8cf3318f39e96b130cff66a4a3b
Author: Michael Poole <[email protected]>
Date: Wed Oct 19 22:53:26 2016 -0400
ircd_parser: Do not insert *@ before host/IP names for opers.
This means that 'host = "127/8";' will match clients without working
ident. Document this.
diff --git a/doc/example.conf b/doc/example.conf
index f2e106e..46541f2 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -639,6 +639,10 @@ CRULE
# makes it easier to update operator nicks, passwords, classes, and
# privileges.
#
+# In most cases, the host mask should start with "<ident>@" or "*@".
+# If there is no <ident>@ prefix, clients without ident results
+# (but matching host name or IP address) can use the Operator block.
+#
# Operator {
# host = "host/IP mask";
# name = "opername";
diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 9735036..530b548 100644
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -628,15 +628,7 @@ operhost: HOST '=' QSTRING ';'
{
struct SLink *link;
link = make_link();
- if (!strchr($3, '@'))
- {
- int uh_len;
- link->value.cp = (char*) MyMalloc((uh_len = strlen($3)+3));
- ircd_snprintf(0, link->value.cp, uh_len, "*@%s", $3);
- }
- else
- DupString(link->value.cp, $3);
- MyFree($3);
+ link->value.cp = $3;
link->next = hosts;
hosts = link;
};
-----------------------------------------------------------------------
Summary of changes:
doc/example.conf | 7 ++++++-
ircd/ircd_parser.y | 10 +---------
ircd/list.c | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
hooks/post-receive
--
Undernet IRC Server Source Code.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
