November 2011 - ngIRCd GIT Updates

Alexander Barton : Only use poll() when poll.h exists as well
by alex＠arthur.barton.de 25 Nov '11

25 Nov '11

Module: ngircd.git Branch: master Commit: 8e193df973bef0765754ccf4d6cb3ea21c226955 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8e193df9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 25 22:06:44 2011 +0100 Only use poll() when poll.h exists as well --- src/ngircd/io.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 7e78e49..f44dfbf 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -54,7 +54,7 @@ typedef struct { # ifdef HAVE_SYS_DEVPOLL_H # define IO_USE_DEVPOLL 1 # else -# ifdef HAVE_POLL +# if defined(HAVE_POLL) && defined(HAVE_POLL_H) # define IO_USE_POLL 1 # else # ifdef HAVE_SELECT

1 0

Alexander Barton : Not only check for poll(), make sure poll. h exists as well
by alex＠arthur.barton.de 25 Nov '11

25 Nov '11

Module: ngircd.git Branch: master Commit: 9d348d00d9eda2aede0ea9052bcc34cd070d3b5a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d348d00… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 25 21:56:33 2011 +0100 Not only check for poll(), make sure poll.h exists as well This fixes building ngIRCd on Debian GNU/Linux 1.3 "Bo" :-) --- configure.in | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 92434ec..f3dbd72 100644 --- a/configure.in +++ b/configure.in @@ -252,13 +252,22 @@ AC_ARG_WITH(poll, CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(poll, x_io_backend=poll, - AC_MSG_ERROR([Can't enable poll IO support!]) + AC_CHECK_FUNCS(poll, + AC_CHECK_HEADERS(poll.h, + x_io_backend=poll, + AC_MSG_ERROR( + [Can't enable poll IO support!]) + , + AC_MSG_ERROR( + [Can't enable poll IO support!]) + ) ) fi ], [ - AC_CHECK_FUNCS(poll, x_io_backend=poll) + AC_CHECK_FUNCS(poll, + AC_CHECK_HEADERS(poll.h, x_io_backend=poll) + ) ] )

1 0

Alexander Barton : whois-test: handle local hostname = "localhost. localdomain"
by alex＠arthur.barton.de 10 Nov '11

10 Nov '11

Module: ngircd.git Branch: master Commit: 9e48f3f8f8c312ee20caef70cfb377a0d89260bb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9e48f3f8… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 10 11:54:22 2011 +0100 whois-test: handle local hostname = "localhost.localdomain" Use the pattern "localhost*" for valid local hostnames. --- src/testsuite/whois-test.e | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e index 7024d5f..2aed694 100644 --- a/src/testsuite/whois-test.e +++ b/src/testsuite/whois-test.e @@ -17,31 +17,31 @@ expect { send "whois nick\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois *\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois n*\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois ?ick\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois ????,n?*k\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "quit\r"

1 0

Alexander Barton : sample-ngircd.conf: show correct default for "PAM" variable
by alex＠arthur.barton.de 08 Nov '11

08 Nov '11

Module: ngircd.git Branch: master Commit: e4a06844a3b0ad1bbb7307cbe40f7d2bfb2f1226 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e4a06844… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 8 21:12:01 2011 +0100 sample-ngircd.conf: show correct default for "PAM" variable The default of "PAM" is "yes" when ngIRCd has been configured to use it, so show the correct default value in the sample configuration file. Closes #119. --- doc/sample-ngircd.conf.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index fb5d826..26103a7 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -160,7 +160,7 @@ ;OperServerMode = no # Use PAM if ngIRCd has been compiled with support for it. - ;PAM = no + ;PAM = yes # Allow Pre-Defined Channels only (see Section [Channels]) ;PredefChannelsOnly = no

1 0

Alexander Barton : Update GPL 2 license text to current version
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: 20ccc1bba7773c0f73afe2bbcc0ffecc7b11269b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20ccc1bb… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 21:51:48 2011 +0100 Update GPL 2 license text to current version See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>. --- COPYING | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/COPYING b/COPYING index 14db8fc..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.

1 0

Alexander Barton : Test for gai_strerror()
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: 13d9e0c5a7e03559a2b5bf405b526098b15bd0e6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=13d9e0c5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 14:16:59 2011 +0100 Test for gai_strerror() If gai_strerror() isn't available, use a macro that simply returns a static error message (regardless of the real error code). For example, GNU libc 2.0.7 doesn't implement gai_strerror(). --- configure.in | 8 +++++--- src/portab/portab.h | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e48e9e3..92434ec 100644 --- a/configure.in +++ b/configure.in @@ -160,10 +160,12 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([ \ bind gethostbyaddr gethostbyname gethostname inet_ntoa \ - setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) + setsid setsockopt socket strcasecmp waitpid],, + AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf \ - vsnprintf strdup strlcpy strlcat strtok_r) +AC_CHECK_FUNCS([ \ + gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ + sigprocmask snprintf vsnprintf strdup strlcpy strlcat strtok_r]) # -- Configuration options -- diff --git a/src/portab/portab.h b/src/portab/portab.h index a75aa34..90f36a0 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -164,6 +164,10 @@ extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr)); extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list args )); #endif +#ifndef HAVE_GAI_STRERROR +#define gai_strerror(r) "unknown error" +#endif + #ifndef PACKAGE_NAME #define PACKAGE_NAME PACKAGE #endif

1 0

Alexander Barton : Only use AI_NUMERICHOST if it is #define'd
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: a7911e35afce4de5f387f9dae0f414ae35006b25 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7911e35… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 14:13:49 2011 +0100 Only use AI_NUMERICHOST if it is #define'd It isn't using GNU libc 2.0.7, for example ... --- src/ipaddr/ng_ipaddr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index a47a40d..05ef6ec 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -32,7 +32,9 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port) assert(ip_str); memset(&hints, 0, sizeof(hints)); +#ifdef AI_NUMERICHOST hints.ai_flags = AI_NUMERICHOST; +#endif #ifndef WANT_IPV6 /* do not convert ipv6 addresses */ hints.ai_family = AF_INET; #endif

1 0

Alexander Barton : defines.h: fix comment: "lenth" -> "length"
by alex＠arthur.barton.de 05 Nov '11

05 Nov '11

Module: ngircd.git Branch: master Commit: 60812b6fdf8ec8b644e1209802cd001a0a032d23 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=60812b6f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 5 00:35:18 2011 +0100 defines.h: fix comment: "lenth" -> "length" Reported by Christoph Biedl in #ngircd. Thanks! --- src/ngircd/defines.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 8db59e8..4bcb6af 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -44,7 +44,7 @@ see RFC 2812, section 1.2.1 */ #define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ #define CLIENT_HOST_LEN 64 /* Max. host name length */ -#define CLIENT_MODE_LEN 16 /* Max. lenth of all client modes */ +#define CLIENT_MODE_LEN 16 /* Max. length of all client modes */ #define CLIENT_INFO_LEN 64 /* Max. length of server info texts */ #define CLIENT_AWAY_LEN 128 /* Max. length of away messages */ #define CLIENT_FLAGS_LEN 16 /* Max. length of client flags */

1 0

Alexander Barton : Init_Server_Struct(): correctly zero Server->bind_addr
by alex＠arthur.barton.de 05 Nov '11

05 Nov '11

Module: ngircd.git Branch: master Commit: 1ea681161652c118d7acb7932678e1acf6646611 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ea68116… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 5 00:21:19 2011 +0100 Init_Server_Struct(): correctly zero Server->bind_addr Don't use the size of the pointer, use the size of the variable! --- src/ngircd/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 97634af..dccc9c7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -2048,7 +2048,7 @@ Init_Server_Struct( CONF_SERVER *Server ) Proc_InitStruct(&Server->res_stat); Server->conn_id = NONE; - memset(&Server->bind_addr, 0, sizeof(&Server->bind_addr)); + memset(&Server->bind_addr, 0, sizeof(Server->bind_addr)); } /* -eof- */

1 0

Alexander Barton : Clean up and fix comments of Check_ArgIsTrue()
by alex＠arthur.barton.de 03 Nov '11

03 Nov '11

Module: ngircd.git Branch: master Commit: d2f54abbedb299a8c3d32295c24397535a4bd2af URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d2f54abb… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 3 09:54:28 2011 +0100 Clean up and fix comments of Check_ArgIsTrue() Thanks to kaFux for pointing this out! And fix code formatting as well ... --- src/ngircd/conf.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4991918..97634af 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -978,17 +978,21 @@ Read_Config( bool ngircd_starting ) } /** - * Check whether an string argument is true or false. + * Check whether a string argument is "true" or "false". * * @param Arg Input string. - * @returns true if string has been parsed as "yes"/"true"/"on". + * @returns true if the input string has been parsed as "yes", "true" + * (case insensitive) or a non-zero integer value. */ static bool -Check_ArgIsTrue( const char *Arg ) +Check_ArgIsTrue(const char *Arg) { - if( strcasecmp( Arg, "yes" ) == 0 ) return true; - if( strcasecmp( Arg, "true" ) == 0 ) return true; - if( atoi( Arg ) != 0 ) return true; + if (strcasecmp(Arg, "yes") == 0) + return true; + if (strcasecmp(Arg, "true") == 0) + return true; + if (atoi(Arg) != 0) + return true; return false; }

1 0