From 771cc10e925d581be0cc4d738f8c16fe7ec247a9 Mon Sep 17 00:00:00 2001 From: Sam Dodrill Date: Tue, 16 Dec 2014 08:24:50 -0800 Subject: [PATCH 1/2] Fix ban list add logic --- src/chmode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chmode.c b/src/chmode.c index 282e880e..d59d3f98 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -219,7 +219,7 @@ get_channel_access(struct Client *source_p, struct membership *msptr) /* check_bans_number() * * inputs - client, channel ban list - * outputs - 0 on ban being allowed, 1 on ban being disallowed + * outputs - 1 on ban being allowed, 0 on ban being disallowed * side effects - none */ int @@ -227,10 +227,10 @@ check_bans_number(struct Client *source_p, struct Channel *chptr, rb_dlink_list { if (rb_dlink_list_length(list) >= (chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans)) { - return 0; + return 1; } - return 1; + return 0; } /* add_id() From 100324f5c9dbe04ce4c089bb12b9d11f64037017 Mon Sep 17 00:00:00 2001 From: Sam Dodrill Date: Tue, 16 Dec 2014 08:26:32 -0800 Subject: [PATCH 2/2] Elemental-ircd 6.6.2 --- NEWS | 4 ++++ configure | 18 +++++++++--------- configure.ac | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 186b7d07..dc03a0f6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ This is elemental-ircd 6.6.1, Copyright (c) 2014 elemental-ircd team. See LICENSE for licensing details (GPL v2). +-- elemental-ircd 6.6.2 + +Fix ban logic + -- elemental-ircd 6.6.1 All code is now in the linux kernel coding style. Patches that do not diff --git a/configure b/configure index 9b9530ad..8491f812 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for elemental-ircd 6.6.1. +# Generated by GNU Autoconf 2.69 for elemental-ircd 6.6.2. # # 2014 elemental-ircd Team # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='elemental-ircd' PACKAGE_TARNAME='elemental-ircd' -PACKAGE_VERSION='6.6.1' -PACKAGE_STRING='elemental-ircd 6.6.1' +PACKAGE_VERSION='6.6.2' +PACKAGE_STRING='elemental-ircd 6.6.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1303,7 +1303,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elemental-ircd 6.6.1 to adapt to many kinds of systems. +\`configure' configures elemental-ircd 6.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1364,7 +1364,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elemental-ircd 6.6.1:";; + short | recursive ) echo "Configuration of elemental-ircd 6.6.2:";; esac cat <<\_ACEOF @@ -1488,7 +1488,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elemental-ircd configure 6.6.1 +elemental-ircd configure 6.6.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2092,7 +2092,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by elemental-ircd $as_me 6.6.1, which was +It was created by elemental-ircd $as_me 6.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -10100,7 +10100,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by elemental-ircd $as_me 6.6.1, which was +This file was extended by elemental-ircd $as_me 6.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10166,7 +10166,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -elemental-ircd config.status 6.6.1 +elemental-ircd config.status 6.6.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 290ef0b0..0241507f 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.57) dnl Sneaky way to get an Id tag into the configure script AC_COPYRIGHT([2014 elemental-ircd Team]) -AC_INIT([elemental-ircd],[6.6.1]) +AC_INIT([elemental-ircd],[6.6.2]) AC_CONFIG_HEADER(include/setup.h)