albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow "DefaultUserModes" to set all possible modes 

Let IRC_MODE() detect that the "fake" MODE command originated on the local
sever, which enables all modes to be settable using "DefaultUserModes"
that can be set by regular MODE commands, including modes only settable by
IRC Operators.
This commit is contained in:
Alexander Barton 2014-03-18 16:43:21 +01:00
parent 5009ab3e8c
commit d314c75a37
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sample-ngircd.conf.tmpl
View File

@ -172,8 +172,8 @@
;ConnectIPv4 = yes
# Default user mode(s) to set on new local clients. Please note that
# only modes can be set that the client could set on itself, you can't
# set "a" (away) or "o" (IRC Op), for example! Default: none.
# only modes can be set that the client could set using regular MODE
# commands, you can't set "a" (away) for example! Default: none.
;DefaultUserModes = i
# Do DNS lookups when a client connects to the server.

4
man/ngircd.conf.5.tmpl
View File

@ -267,8 +267,8 @@ Default: yes.
.TP
\fBDefaultUserModes\fR (string)
Default user mode(s) to set on new local clients. Please note that only modes
can be set that the client could set on itself, you can't set "a" (away) or
"o" (IRC Op), for example!
can be set that the client could set using regular MODE commands, you can't
set "a" (away) for example!
Default: none.
.TP
\fBDNS\fR (boolean)

7
src/ngircd/irc-mode.c
View File

@ -68,6 +68,13 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
_IRC_GET_SENDER_OR_RETURN_(origin, Req, Client)
/* Test for "fake" MODE commands injected by this local instance,
* for example when handling the "DefaultUserModes" settings.
* This doesn't harm real commands, because prefixes of regular
* clients are checked in Validate_Prefix() and can't be faked. */
if (Req->prefix && Client_Search(Req->prefix) == Client_ThisServer())
Client = Client_Search(Req->prefix);
/* Channel or user mode? */
cl = NULL; chan = NULL;
if (Client_IsValidNick(Req->argv[0]))

2
src/ngircd/login.c
View File

@ -192,7 +192,7 @@ Login_User_PostAuth(CLIENT *Client)
/* Set default user modes */
if (Conf_DefaultUserModes[0]) {
snprintf(modes, sizeof(modes), "+%s", Conf_DefaultUserModes);
Req.prefix = Client_ThisServer();
Req.prefix = Client_ID(Client_ThisServer());
Req.command = "MODE";
Req.argc = 2;
Req.argv[0] = Client_ID(Client);