[svn] Exempt klines with a fixed user@ (no */?) from min_nonwildcard checks.
This commit is contained in:
parent
b808adf9d3
commit
598ebb42c7
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
|||
jilles 2007/05/18 20:31:33 UTC (20070518-3460)
|
||||
Log:
|
||||
- fold conf_connect_allowed() into accept_connection()
|
||||
- extend add_connection() so that exempt{}s apply to max unregistered
|
||||
connections per ip
|
||||
from ratbox
|
||||
|
||||
|
||||
Changes: Modified:
|
||||
+1 -1 trunk/doc/example.conf (File Modified)
|
||||
+1 -1 trunk/doc/reference.conf (File Modified)
|
||||
+2 -1 trunk/doc/sgml/oper-guide/config.sgml (File Modified)
|
||||
+0 -2 trunk/include/s_conf.h (File Modified)
|
||||
+14 -7 trunk/src/listener.c (File Modified)
|
||||
|
||||
|
||||
jilles 2007/05/18 19:51:22 UTC (20070518-3458)
|
||||
Log:
|
||||
m_webirc: call del_unknown_ip() otherwise the unknown will
|
||||
|
|
|
@ -1 +1 @@
|
|||
#define SERNO "20070518-3458"
|
||||
#define SERNO "20070518-3460"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*
|
||||
* $Id: m_kline.c 3225 2007-03-04 23:42:55Z jilles $
|
||||
* $Id: m_kline.c 3464 2007-05-19 22:21:10Z jilles $
|
||||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
|
@ -65,7 +65,7 @@ struct Message unkline_msgtab = {
|
|||
};
|
||||
|
||||
mapi_clist_av1 kline_clist[] = { &kline_msgtab, &unkline_msgtab, NULL };
|
||||
DECLARE_MODULE_AV1(kline, NULL, NULL, kline_clist, NULL, NULL, "$Revision: 3225 $");
|
||||
DECLARE_MODULE_AV1(kline, NULL, NULL, kline_clist, NULL, NULL, "$Revision: 3464 $");
|
||||
|
||||
/* Local function prototypes */
|
||||
static int find_user_host(struct Client *source_p, const char *userhost, char *user, char *host);
|
||||
|
@ -615,6 +615,10 @@ valid_wild_card(struct Client *source_p, const char *luser, const char *lhost)
|
|||
char tmpch;
|
||||
int nonwild = 0;
|
||||
|
||||
/* user has no wildcards, always accept -- jilles */
|
||||
if (!strchr(luser, '?') && !strchr(luser, '*'))
|
||||
return 1;
|
||||
|
||||
/* check there are enough non wildcard chars */
|
||||
p = luser;
|
||||
while ((tmpch = *p++))
|
||||
|
|
Loading…
Reference in New Issue