9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[svn] Move username check after xline and dnsbl checks, so it

Browse source 
will not complain to opers about clients who are xlined
or blacklisted anyway (both of which silently reject).
This commit is contained in:
jilles 2007-03-06 06:07:11 -08:00
parent 35237302c0
commit 0734f634d9
3 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
nenolod 2007/03/05 19:01:05 UTC (20070305-3253)
Log:
- MASTER_MAX is no longer relevant
Changes: Modified:
+0 -7 trunk/modules/m_set.c (File Modified)
nenolod 2007/03/05 18:58:38 UTC (20070305-3251) nenolod 2007/03/05 18:58:38 UTC (20070305-3251)
Log: Log:
- add config option for setting max_clients. - add config option for setting max_clients.

2
include/serno.h
View file

@ -1 +1 @@
#define SERNO "20070305-3251" #define SERNO "20070305-3253"

32
src/s_user.c
View file

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: s_user.c 3227 2007-03-05 01:14:46Z jilles $ * $Id: s_user.c 3255 2007-03-06 14:07:11Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -415,21 +415,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
return (CLIENT_EXITED); return (CLIENT_EXITED);
} }
/* valid user name check */
if(!valid_username(source_p->username))
{
sendto_realops_snomask(SNO_REJ, L_ALL,
"Invalid username: %s (%s@%s)",
source_p->name, source_p->username, source_p->host);
ServerStats->is_ref++;
ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
exit_client(client_p, source_p, &me, tmpstr2);
return (CLIENT_EXITED);
}
/* end of valid user name check */
/* kline exemption extends to xline too */ /* kline exemption extends to xline too */
if(!IsExemptKline(source_p) && if(!IsExemptKline(source_p) &&
find_xline(source_p->info, 1) != NULL) find_xline(source_p->info, 1) != NULL)
@ -473,6 +458,21 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
} }
} }
/* valid user name check */
if(!valid_username(source_p->username))
{
sendto_realops_snomask(SNO_REJ, L_ALL,
"Invalid username: %s (%s@%s)",
source_p->name, source_p->username, source_p->host);
ServerStats->is_ref++;
ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
exit_client(client_p, source_p, &me, tmpstr2);
return (CLIENT_EXITED);
}
/* end of valid user name check */
/* Store original hostname -- jilles */ /* Store original hostname -- jilles */
strlcpy(source_p->orighost, source_p->host, HOSTLEN + 1); strlcpy(source_p->orighost, source_p->host, HOSTLEN + 1);