Juni 2010 - ngIRCd GIT Updates

Alexander Barton : ngircd.init: require $network $remote_fs when stopping ngircd
by alex＠arthur.barton.de 25 Jun '10

25 Jun '10

Module: ngircd.git Branch: master Commit: 139d6303e73079f48adfe37be2b88efed31e47df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=139d6303… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jun 25 00:10:56 2010 +0200 ngircd.init: require $network $remote_fs when stopping ngircd --- contrib/Debian/ngircd.init | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index e550747..6a418d7 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,13 +1,13 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008,2009 Alexander Barton <alex(a)barton.de> +# Copyright 2008-2010 Alexander Barton <alex(a)barton.de> # ### BEGIN INIT INFO # Provides: ngircd # Required-Start: $network $remote_fs -# Required-Stop: +# Required-Stop: $network $remote_fs # Should-Start: $syslog $named # Should-Stop: $syslog # Default-Start: 2 3 4 5

1 0

Neale Pickett : Show SSL status in WHOIS, numeric 275
by alex＠arthur.barton.de 23 Jun '10

23 Jun '10

Module: ngircd.git Branch: master Commit: 28f8b501744a3c24cd7f5eec44707d656cc987c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=28f8b501… Author: Neale Pickett <neale(a)woozle.org> Date: Fri Jun 11 17:32:41 2010 -0500 Show SSL status in WHOIS, numeric 275 "I've been wanting this for years and finally took the 5 minutes to patch it in. I took the response code (275) from whatever's running OFTC's IRC network." -- Neale Pickett <neale(a)woozle.org>, Fri, 11 Jun 2010 17:32:41 -0500 (OFTC is running Hybrid ircd.) --- src/ngircd/irc-info.c | 7 +++++++ src/ngircd/messages.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7d7bb88..7e0bf63 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -993,6 +993,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; } + /* Connected using SSL? */ + if (Conn_UsesSSL(Client_Conn(c))) { + if (!IRC_WriteStrClient + (from, RPL_WHOISSSL_MSG, Client_ID(from), Client_ID(c))) + return DISCONNECTED; + } + /* Idle and signon time (local clients only!) */ if (Client_Conn(c) > NONE ) { if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c356e42..03ddc36 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -47,6 +47,7 @@ #define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu" #define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)" +#define RPL_WHOISSSL_MSG "275 %s %s :is connected via SSL (secure link)" #define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_USERHOST_MSG "302 %s :"

1 0

Alexander Barton : Show SSL status in WHOIS, numeric 275
by alex＠arthur.barton.de 23 Jun '10

23 Jun '10

Module: ngircd.git Branch: master Commit: a85f86e19b8c7ab17c8a0ee6a7f662b65d78a615 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a85f86e1… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jun 23 10:44:09 2010 +0200 Show SSL status in WHOIS, numeric 275 "I've been wanting this for years and finally took the 5 minutes to patch it in. I took the response code (275) from whatever's running OFTC's IRC network." -- Neale Pickett <neale(a)woozle.org>, Fri, 11 Jun 2010 17:32:41 -0500 (OFTC is running Hybrid ircd.) --- src/ngircd/irc-info.c | 7 +++++++ src/ngircd/messages.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 7d7bb88..7e0bf63 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -993,6 +993,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; } + /* Connected using SSL? */ + if (Conn_UsesSSL(Client_Conn(c))) { + if (!IRC_WriteStrClient + (from, RPL_WHOISSSL_MSG, Client_ID(from), Client_ID(c))) + return DISCONNECTED; + } + /* Idle and signon time (local clients only!) */ if (Client_Conn(c) > NONE ) { if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index c356e42..03ddc36 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -47,6 +47,7 @@ #define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu" #define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)" +#define RPL_WHOISSSL_MSG "275 %s %s :is connected via SSL (secure link)" #define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_USERHOST_MSG "302 %s :"

1 0

Alexander Barton : Include correct header files when testing for arpa/inet. h (Closes: #105)
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: e2930f3f5e7356d24f4b5e1616cb7674bd0123ec URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2930f3f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 8 15:23:04 2010 +0200 Include correct header files when testing for arpa/inet.h (Closes: #105) Tested on OpenBSD 4.7, OpenBSD 4.1, FreeBSD 8, Linux and Mac OS X. Thanks to rck <dev.rck(a)gmail.com> for reporting and testing! --- configure.in | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..57883ed 100644 --- a/configure.in +++ b/configure.in @@ -108,9 +108,14 @@ AC_CHECK_HEADERS([ \ AC_CHECK_HEADERS([ \ arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ ],[],[],[[ - #include <netinet/in.h> - #ifdef HAVE_NETINET_IN_SYSTM_H - #include <netinet/in_systm.h> + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> #endif ]] )

1 0

Florian Westphal : Revert "configure: make implicit declarations fatal"
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: 059e70724945264c2ab4f25edd48a50d173697f6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=059e7072… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 18:47:27 2010 +0200 Revert "configure: make implicit declarations fatal" This reverts commit b3a6c33da0b12ba74dc395979b677813d4bc2c0f. apparently not all gcc versions support this 8-( --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 8526af6..6d9312d 100644 --- a/configure.in +++ b/configure.in @@ -542,7 +542,6 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. -test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Florian Westphal : partially revert Include netinet/{in.h, in_systm. h} when checking for netinet/ip.h
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: b8ed3110305bd5a89face219b276cc7ffbeb9e37 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b8ed3110… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 17:18:33 2010 +0200 partially revert Include netinet/{in.h, in_systm.h} when checking for netinet/ip.h This partially reverts 6b0bb665c3cb31ba93fb5ac8197f033532614fd4. restrict the kludge to netinet/ip.h. --- configure.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 8526af6..d8a35ef 100644 --- a/configure.in +++ b/configure.in @@ -106,7 +106,10 @@ AC_CHECK_HEADERS([ \ ],,AC_MSG_ERROR([required C header missing!])) AC_CHECK_HEADERS([ \ - arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ + arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) + +AC_CHECK_HEADERS([ \ + netinet/ip.h \ ],[],[],[[ #include <netinet/in.h> #ifdef HAVE_NETINET_IN_SYSTM_H

1 0

Florian Westphal : configure: make implicit declarations fatal
by alex＠arthur.barton.de 09 Jun '10

09 Jun '10

Module: ngircd.git Branch: master Commit: b849e63fbfcddae7c770944816544c4799856042 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b849e63f… Author: Florian Westphal <fw(a)strlen.de> Date: Sat May 29 13:06:19 2010 +0200 configure: make implicit declarations fatal from bugzilla #105: "ngircd-16 works great under openbsd4.7/i386, but it segfaults on openbsd4.7/amd64." Caused by missing function prototypes and the resulting truncation of pointer to int. Lets try to catch these bugs during compilation instead of SIGSEGV. --- configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..8526af6 100644 --- a/configure.in +++ b/configure.in @@ -542,6 +542,7 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. +test "$GCC" = "yes" && CFLAGS="$CFLAGS -Werror=implicit-function-declaration" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files --

1 0

Alexander Barton : Merge branch 'master' of /srv/git/ngircd
by alex＠arthur.barton.de 08 Jun '10

08 Jun '10

Module: ngircd.git Branch: master Commit: 5c751b077aefca9ba1baf96a566c23a2e3ae55fe URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5c751b07… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 8 15:28:02 2010 +0200 Merge branch 'master' of /srv/git/ngircd ---

1 0

Alexander Barton : Include correct header files when testing for arpa/inet. h (Closes: #105)
by alex＠arthur.barton.de 08 Jun '10

08 Jun '10

Module: ngircd.git Branch: master Commit: 72b1651a3b90fc4ed88cc6d8936ebf70658b2a04 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=72b1651a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jun 8 15:23:04 2010 +0200 Include correct header files when testing for arpa/inet.h (Closes: #105) Tested on OpenBSD 4.7, OpenBSD 4.1, FreeBSD 8, Linux and Mac OS X. Thanks to rck <dev.rck(a)gmail.com> for reporting and testing! --- configure.in | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 6d9312d..57883ed 100644 --- a/configure.in +++ b/configure.in @@ -108,9 +108,14 @@ AC_CHECK_HEADERS([ \ AC_CHECK_HEADERS([ \ arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ ],[],[],[[ - #include <netinet/in.h> - #ifdef HAVE_NETINET_IN_SYSTM_H - #include <netinet/in_systm.h> + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> #endif ]] )

1 0