Dezember 2013 - ngIRCd GIT Updates

Federico G. Schwindt : Fix permanent k/gline
by alex＠arthur.barton.de 29 Dez '13

29 Dez '13

Module: ngircd.git Branch: master Commit: 9230f2fff1d374ecef93dafeb14099f22c9ef787 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9230f2ff… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Dec 8 01:43:55 2013 +0000 Fix permanent k/gline Reported by Toni Spets (hifi - at - jnz - dot - fi). --- src/ngircd/irc-oper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index ab4023a..49768bc 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -387,6 +387,7 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) CLIENT *from, *c, *c_next; char reason[COMMAND_LEN], class_c; struct list_head *list; + time_t timeout; int class; assert(Client != NULL); @@ -431,8 +432,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) } } else { /* Add new mask to list */ + timeout = atol(Req->argv[1]); + if (timeout > 0) + timeout += time(NULL); if (Class_AddMask(class, Req->argv[0], - time(NULL) + atol(Req->argv[1]), + timeout, Req->argv[2])) { Log(LOG_NOTICE|LOG_snotice, "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",

1 0

Alexander Barton : OS X has a working getaddrinfo() implementation
by alex＠arthur.barton.de 27 Dez '13

27 Dez '13

Module: ngircd.git Branch: master Commit: bd33bd770decd470577487fa4bd399cb1d8426fc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd33bd77… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 27 21:35:53 2013 +0100 OS X has a working getaddrinfo() implementation --- contrib/MacOSX/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 9374ab5..761a68e 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -105,6 +105,8 @@ #define HAVE_INET_ATON 1 /* Define to 1 if you have the `getaddrinfo' function. */ #define HAVE_GETADDRINFO 1 +/* getaddrinfo(0) */ +#define HAVE_WORKING_GETADDRINFO 1 /* Define to 1 if you have the `getnameinfo' function. */ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the `sigaction' function. */

1 0

Alexander Barton : Check for working getaddrinfo() function
by alex＠arthur.barton.de 27 Dez '13

27 Dez '13

Module: ngircd.git Branch: master Commit: b8433e9261c516d7b8743b33681050b6666192e5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b8433e92… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 12 00:28:50 2013 +0100 Check for working getaddrinfo() function At least AIX 4.3.3 and 5.1 have a broken implementation of getaddrinfo() which doesn't handle "0" as numeric service correctly. This patch adds a configure check for this case and changes all calling functions to only use getaddrinfo() if it "works". See <http://www.stacken.kth.se/lists/heimdal-discuss/2004-05/msg00059.html> --- configure.ng | 35 +++++++++++++++++++++++++++++++++-- src/ipaddr/ng_ipaddr.c | 2 +- src/ngircd/resolve.c | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/configure.ng b/configure.ng index 9a4cc99..bc30bed 100644 --- a/configure.ng +++ b/configure.ng @@ -93,6 +93,35 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ fi ]) +AC_DEFUN([WORKING_GETADDRINFO],[ + AC_CHECK_FUNCS([getaddrinfo],[ + AC_MSG_CHECKING([whether getaddrinfo() works]) + AC_TRY_RUN([ +#include <stdio.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> +int +main(int argc, char **argv) +{ + struct addrinfo hints, *ai; + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_PASSIVE; + hints.ai_socktype = SOCK_STREAM; + hints.ai_family = PF_UNSPEC; + if(getaddrinfo(NULL, "0", &hints, &ai) != 0) + return 1; + return 0; +} + ],[ + AC_DEFINE([HAVE_WORKING_GETADDRINFO], 1, [getaddrinfo(0)]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + ]) +]) + # -- Hard coded system and compiler dependencies/features/options ... -- if test "$GCC" = "yes"; then @@ -189,11 +218,13 @@ AC_CHECK_FUNCS([ \ AC_MSG_ERROR([required function missing!])) # Optional functions -AC_CHECK_FUNCS_ONCE([ \ - arc4random arc4random_stir gai_strerror getaddrinfo getnameinfo inet_aton +AC_CHECK_FUNCS_ONCE([ + arc4random arc4random_stir gai_strerror getnameinfo inet_aton \ sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \ strtok_r unsetenv waitpid]) +WORKING_GETADDRINFO + # -- Configuration options -- # use syslog? diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index 9cf35ec..37f75b6 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -23,7 +23,7 @@ GLOBAL bool ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port) { -#ifdef HAVE_GETADDRINFO +#ifdef HAVE_WORKING_GETADDRINFO int ret; char portstr[64]; struct addrinfo *res0; diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 6078da8..01f730c 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -242,7 +242,7 @@ ForwardLookup(const char *hostname, array *IpAddr, int af) { ng_ipaddr_t addr; -#ifdef HAVE_GETADDRINFO +#ifdef HAVE_WORKING_GETADDRINFO int res; struct addrinfo *a, *ai_results; static struct addrinfo hints;

1 0

Federico G. Schwindt : Fix spelling
by alex＠arthur.barton.de 24 Dez '13

24 Dez '13

Module: ngircd.git Branch: master Commit: 5a424f60dad660815d89285da9a7a07e4991461a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a424f60… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Tue Nov 26 00:19:01 2013 +0000 Fix spelling --- src/ngircd/conn.c | 2 +- src/ngircd/pam.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index e8bfcf1..3f447c6 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1915,7 +1915,7 @@ Handle_Buffer(CONN_ID Idx) ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n'); if (ptr) { /* Check if there is a single CR or LF _before_ the - * corerct CR+LF line terminator: */ + * correct CR+LF line terminator: */ first_eol = ptr1 < ptr2 ? ptr1 : ptr2; if (first_eol < ptr) { /* Single CR or LF before CR+LF found */ diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c index ed56497..81d635c 100644 --- a/src/ngircd/pam.c +++ b/src/ngircd/pam.c @@ -87,7 +87,7 @@ static struct pam_conv conv = { }; /** - * Authenticate a connectiong client using PAM. + * Authenticate a connecting client using PAM. * @param Client The client to authenticate. * @return true when authentication succeeded, false otherwise. */

1 0

Alexander Barton : doc/Platforms.txt: Add and update more systems
by alex＠arthur.barton.de 03 Dez '13

03 Dez '13

Module: ngircd.git Branch: master Commit: 444308ccde9bcf58c652ec6ed8f662f81854624a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=444308cc… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 3 12:16:23 2013 +0100 doc/Platforms.txt: Add and update more systems - add i386/unknown/netbsdelf1.5.2, egcs-1.1.2 - update i386/unknown/openbsd5.3, gcc 4.2.1 - add i386/unknown/openbsd5.4, gcc 4.2.1 - add x86_64/unknown/linux-gnu, nwcc 0.8.2 - update x86_64/unknown/linux-gnu, tcc 0.9.25 Thanks to Götz Hoffart <goetz(a)hoffart.de>! --- doc/Platforms.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index ea98ca3..233d402 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -47,6 +47,7 @@ i686/pc/minix gcc 4.4.6 21~rc2 13-10-27 alex Y Y N N i686/unknown/gnu0.3 gcc 4.4.5 19 12-02-29 alex Y Y Y Y i686/unknown/gnu0.5 gcc 4.8.1 21~rc2 13-10-27 alex Y Y Y Y i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y 3 +i386/unknown/netbsdelf1.5.2 egcs-1.1.2 21 13-11-25 goetz Y Y N Y i386/unknown/netbsdelf1.6.2 gcc 2.95.3 18 11-07-10 goetz Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y 3 i386/unknown/netbsdelf4.0 gcc 4.1.2 19 12-02-29 alex Y Y Y Y 3 @@ -54,7 +55,8 @@ i386/unknown/netbsdelf5.0.2 gcc 4.1.3 19 12-02-26 alex Y Y Y Y 3 i386/unknown/openbsd3.5 gcc 2.95.3 21 13-11-17 goetz Y Y Y Y 3 i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y 3 i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y 3 -i386/unknown/openbsd5.3 gcc 4.2.1 21~rc2 13-10-21 dspruell Y Y Y Y 3 +i386/unknown/openbsd5.3 gcc 4.2.1 21 13-11-28 goetz Y Y Y Y 3 +i386/unknown/openbsd5.4 gcc 4.2.1 21 13-11-28 goetz Y Y Y Y 3 i586/pc/haiku gcc 2.95.3 19.2~138 12-10-11 user Y Y N N i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y @@ -88,9 +90,10 @@ x86_64/unknown/freebsd9.1 gcc 4.2.1 21~rc2 13-10-27 alex Y Y Y Y 3 x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y 3 x86_64/unknown/linux-gnu clang 3.2 21~rc2 13-10-20 alex Y Y Y Y 1 x86_64/unknown/linux-gnu gcc 4.8.1 21~rc2 13-10-20 alex Y Y Y Y 1 +x86_64/unknown/linux-gnu nwcc 0.8.2 21 13-12-01 goetz Y Y Y Y 1 x86_64/unknown/linux-gnu Open64 20.3 13-10-16 goetz Y Y Y Y 1 x86_64/unknown/linux-gnu Sun C 5.12 21 13-11-22 goetz Y Y Y Y 1 -x86_64/unknown/linux-gnu tcc 0.9.25 20.3 13-10-16 goetz Y Y Y Y 1 +x86_64/unknown/linux-gnu tcc 0.9.25 21 13-11-30 goetz Y Y Y Y 1 x86_64/unknown/openbsd4.7 gcc 3.3.5 20~rc1 12-02-26 alex Y Y Y Y 3 x86_64/unknown/openbsd4.8 gcc 4.2.1 21~rc2 13-10-27 alex Y Y Y Y 3 x86_64/unknown/openbsd5.1 gcc 4.2.1 21~rc2 13-10-27 alex Y Y Y Y 3

1 0