Februar 2010 - ngIRCd GIT Updates

Florian Westphal : configure.in: only add -lnsl when needed
by fw＠arthur.barton.de 17 Feb '10

17 Feb '10

Module: ngircd.git Branch: master Commit: 20276f7cc967ec1a472715574adc6792b1598314 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20276f7c… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 17 22:23:14 2010 +0100 configure.in: only add -lnsl when needed dpkg-shlibdeps: warning: dependency on libnsl.so.1 [..] (they use none of its symbols). As shown via commit 2b14234abc252383679bae2d23861b773dc9713e (dpkg-shlibdeps: warning: dependency on libnsl.so.1) and the following revert of that commit, we cannot simply drop the AC_CHECK_LIB(nsl). Although -lnsl is indeed unneeded when glibc is used, some platforms (e.g. Solaris) need it. Use AC_SEARCH_LIBS instead to only link when the library exports a particular symbol. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 10a72d3..f80e8a9 100644 --- a/configure.in +++ b/configure.in @@ -131,9 +131,11 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),, # -- Libraries -- +# A/UX needs this. AC_CHECK_LIB(UTIL,memmove) +# needed on solaris. GNU libc also has a libnsl, but we do not need it. +AC_SEARCH_LIBS(gethostbyname,nsl) AC_CHECK_LIB(socket,bind) -AC_CHECK_LIB(nsl,gethostent) # -- Functions --

1 0

Alexander Barton : Implement WEBIRC command
by alex＠arthur.barton.de 17 Feb '10

17 Feb '10

Module: ngircd.git Branch: master Commit: 6e8cf51bb216f956e7a6fdb5c61b0f2799bf8d2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6e8cf51b… Author: Alexander Barton <alex(a)barton.de> Date: Thu Feb 11 00:01:53 2010 +0100 Implement WEBIRC command The WEBIRC command is used by some Web-to-IRC gateways to set the correct user name and host name of users instead of their own. Syntax: WEBIRC <password> <username> <hostname> <ip-address> The <password> must be set using the new configuration variable "WebircPassword" in the [Global] section of ngircd.conf. Please note that the <ip-address> is currently not used by ngIRCd (we don't store it in the CLIENT structure, only the resolved hostname). --- doc/sample-ngircd.conf | 8 +++++++- man/ngircd.conf.5.tmpl | 5 +++++ src/ngircd/conf.c | 30 +++++++++++++++++++----------- src/ngircd/conf.h | 5 ++++- src/ngircd/conn.c | 12 ++++++++---- src/ngircd/irc-login.c | 27 ++++++++++++++++++++++++++- src/ngircd/irc-login.h | 3 ++- src/ngircd/parse.c | 3 ++- 8 files changed, 73 insertions(+), 20 deletions(-) diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index b945224..db326c9 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -28,9 +28,15 @@ # LINKS requests for example. Info = Server Info Text - # Global password for all users needed to connect to the server + # Global password for all users needed to connect to the server. + # (Default: not set) ;Password = abc + # Password required for using the WEBIRC command used by some + # Web-to-IRC gateways. If not set/empty, the WEBIRC command can't + # be used. (Default: not set) + ;WebircPassword = xyz + # Information about the server and the administrator, used by the # ADMIN command. Not required by server but by RFC! ;AdminInfo1 = Description diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 4d55592..46e0308 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -73,6 +73,11 @@ example. Global password for all users needed to connect to the server. The default is empty, so no password is required. .TP +\fBWebircPassword\fR +Password required for using the WEBIRC command used by some Web-to-IRC +gateways. If not set or empty, the WEBIRC command can't be used. +Default: not set. +.TP \fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR Information about the server and the administrator, used by the ADMIN command. diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fae2a28..694b5d4 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -291,16 +291,17 @@ Conf_Test( void ) } puts( "[GLOBAL]" ); - printf( " Name = %s\n", Conf_ServerName ); - printf( " Info = %s\n", Conf_ServerInfo ); - printf( " Password = %s\n", Conf_ServerPwd ); - printf( " AdminInfo1 = %s\n", Conf_ServerAdmin1 ); - printf( " AdminInfo2 = %s\n", Conf_ServerAdmin2 ); - printf( " AdminEMail = %s\n", Conf_ServerAdminMail ); - printf( " MotdFile = %s\n", Conf_MotdFile ); - printf( " MotdPhrase = %s\n", Conf_MotdPhrase ); - printf( " ChrootDir = %s\n", Conf_Chroot ); - printf( " PidFile = %s\n", Conf_PidFile); + printf(" Name = %s\n", Conf_ServerName); + printf(" Info = %s\n", Conf_ServerInfo); + printf(" Password = %s\n", Conf_ServerPwd); + printf(" WebircPassword = %s\n", Conf_WebircPwd); + printf(" AdminInfo1 = %s\n", Conf_ServerAdmin1); + printf(" AdminInfo2 = %s\n", Conf_ServerAdmin2); + printf(" AdminEMail = %s\n", Conf_ServerAdminMail); + printf(" MotdFile = %s\n", Conf_MotdFile); + printf(" MotdPhrase = %s\n", Conf_MotdPhrase); + printf(" ChrootDir = %s\n", Conf_Chroot); + printf(" PidFile = %s\n", Conf_PidFile); printf(" Listen = %s\n", Conf_ListenAddress); fputs(" Ports = ", stdout); ports_puts(&Conf_ListenPorts); @@ -845,6 +846,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } + if (strcasecmp(Var, "WebircPassword") == 0) { + /* Password required for WEBIRC command */ + len = strlcpy(Conf_WebircPwd, Arg, sizeof(Conf_WebircPwd)); + if (len >= sizeof(Conf_WebircPwd)) + Config_Error_TooLong(Line, Var); + return; + } if( strcasecmp( Var, "AdminInfo1" ) == 0 ) { /* Administrative info #1 */ len = strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 0180515..5764d0f 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -188,6 +188,9 @@ GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *H GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick)); +/* Password required by WEBIRC command */ +GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN]; + #endif diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 1e4ba0a..cd350a8 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1999,10 +1999,14 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) c = Conn_GetClient( i ); assert( c != NULL ); - /* Only update client information of unregistered clients */ - if( Client_Type( c ) == CLIENT_UNKNOWN ) { - strlcpy(My_Connections[i].host, readbuf, sizeof( My_Connections[i].host)); - Client_SetHostname( c, readbuf); + /* Only update client information of unregistered clients. + * Note: user commands (e. g. WEBIRC) are always read _after_ reading + * the resolver results, so we don't have to worry to override settings + * from these commands here. */ + if(Client_Type(c) == CLIENT_UNKNOWN) { + strlcpy(My_Connections[i].host, readbuf, + sizeof(My_Connections[i].host)); + Client_SetHostname(c, readbuf); #ifdef IDENTAUTH ++identptr; if (*identptr) { diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 7b73d40..2de4bd5 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -557,6 +557,31 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) } /* IRC_SERVICE */ +/** + * Handler for the IRC command "WEBIRC". + * Syntax: WEBIRC <password> <username> <real-hostname> <real-IP-address> + */ +GLOBAL bool +IRC_WEBIRC(CLIENT *Client, REQUEST *Req) +{ + /* Exactly 4 parameters are requited */ + if (Req->argc != 4) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + if (!Conf_WebircPwd[0] || strcmp(Req->argv[0], Conf_WebircPwd) != 0) + return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, + Client_ID(Client)); + + LogDebug("Connection %d: got valid WEBIRC command: user=%s, host=%s, ip=%s", + Client_Conn(Client), Req->argv[1], Req->argv[2], Req->argv[3]); + + Client_SetUser(Client, Req->argv[1], true); + Client_SetHostname(Client, Req->argv[2]); + return CONNECTED; +} /* IRC_WEBIRC */ + + GLOBAL bool IRC_QUIT( CLIENT *Client, REQUEST *Req ) { diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h index 0b92038..1504e0b 100644 --- a/src/ngircd/irc-login.h +++ b/src/ngircd/irc-login.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ GLOBAL bool IRC_PASS PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_NICK PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_USER PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_SERVICE PARAMS((CLIENT *Client, REQUEST *Req)); +GLOBAL bool IRC_WEBIRC PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req)); diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 2c28a30..3710d70 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -103,6 +103,7 @@ static COMMAND My_Commands[] = { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 0, 0, 0 }, { "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 }, { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : ngircd.conf.5: Document missing "Password" variable
by alex＠arthur.barton.de 10 Feb '10

10 Feb '10

Module: ngircd.git Branch: master Commit: 53fc0ebff6fe09bb6a3ae3b134647b3499fc6618 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=53fc0ebf… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 10 23:47:05 2010 +0100 ngircd.conf.5: Document missing "Password" variable --- man/ngircd.conf.5.tmpl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index d9e6f46..4d55592 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -69,6 +69,10 @@ IRC network and must contain at least one dot (".") character. Info text of the server. This will be shown by WHOIS and LINKS requests for example. .TP +\fBPassword\fR +Global password for all users needed to connect to the server. The default +is empty, so no password is required. +.TP \fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR Information about the server and the administrator, used by the ADMIN command.

1 0

Alexander Barton : Re-format Init_New_Client() function
by alex＠arthur.barton.de 10 Feb '10

10 Feb '10

Module: ngircd.git Branch: master Commit: 9b3e143a26f1079d185c41611cd2475f8fbdae39 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9b3e143a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 10 23:40:03 2010 +0100 Re-format Init_New_Client() function --- src/ngircd/client.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1edc755..c565830 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -181,39 +181,46 @@ Client_NewRemoteUser(CLIENT *Introducer, const char *Nick, int Hops, const char */ static CLIENT * Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, - int Type, const char *ID, const char *User, const char *Hostname, const char *Info, int Hops, - int Token, const char *Modes, bool Idented) + int Type, const char *ID, const char *User, const char *Hostname, + const char *Info, int Hops, int Token, const char *Modes, bool Idented) { CLIENT *client; - assert( Idx >= NONE ); - assert( Introducer != NULL ); - assert( Hostname != NULL ); + assert(Idx >= NONE); + assert(Introducer != NULL); + assert(Hostname != NULL); - client = New_Client_Struct( ); - if( ! client ) return NULL; + client = New_Client_Struct(); + if (!client) + return NULL; client->starttime = time(NULL); client->conn_id = Idx; client->introducer = Introducer; client->topserver = TopServer; client->type = Type; - if( ID ) Client_SetID( client, ID ); - if( User ) Client_SetUser( client, User, Idented ); - if( Hostname ) Client_SetHostname( client, Hostname ); - if( Info ) Client_SetInfo( client, Info ); + if (ID) + Client_SetID(client, ID); + if (User) + Client_SetUser(client, User, Idented); + if (Hostname) + Client_SetHostname(client, Hostname); + if (Info) + Client_SetInfo(client, Info); client->hops = Hops; client->token = Token; - if( Modes ) Client_SetModes( client, Modes ); - if( Type == CLIENT_SERVER ) Generate_MyToken( client ); + if (Modes) + Client_SetModes(client, Modes); + if (Type == CLIENT_SERVER) + Generate_MyToken(client); - if( strchr( client->modes, 'a' )) - strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away )); + if (strchr(client->modes, 'a')) + strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); client->next = (POINTER *)My_Clients; My_Clients = client; - Adjust_Counters( client ); + Adjust_Counters(client); return client; } /* Init_New_Client */

1 0

Alexander Barton : New README-Interix. txt for running ngIRCd on MS SFU and MS SUA
by alex＠arthur.barton.de 05 Feb '10

05 Feb '10

Module: ngircd.git Branch: master Commit: f1bbc92b391f2dabd8c07234689f4f36207f81c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1bbc92b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 5 00:24:33 2010 +0100 New README-Interix.txt for running ngIRCd on MS SFU and MS SUA --- doc/README-Interix.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/doc/README-Interix.txt b/doc/README-Interix.txt new file mode 100644 index 0000000..8f5451f --- /dev/null +++ b/doc/README-Interix.txt @@ -0,0 +1,37 @@ + + ngIRCd - Next Generation IRC Server + + (c)2001-2010 Alexander Barton, + alex(a)barton.de, http://www.barton.de/ + + ngIRCd is free software and published under the + terms of the GNU General Public License. + + + -- README-Interix.txt -- + + +ngIRCd release 15 has successfully been tested on Microsoft Windows XP +Professional using the Services for UNIX (SFU) version 3.5 and Microsoft +Windows 7 with the bundled Subsystem for UNIX Applications (SUA). + +SFU are supported on Windows 2000, Windows 2000 Server, Windows XP, and +Windows Server 2003. SUA is supported on Windows Server 2003 R2, Windows +Server 2008 & 2008 R2, Windows Vista, and Windows 7 -- so ngIRCd should be +able to run on all of these platforms. + +But please note that the poll() API function is not fully implemented by +SFU/SUA and therefore can't be used by ngIRCd -- which normally would be +the default. Please see <http://www.suacommunity.com/faqs.aspx> section +4.25 for details: + + "If you do try to use the poll() API your program will block on the + API call forever. You must direct your program to build using the + select() API." + +So when running the ./configure script, you HAVE TO DISABLE poll() support: + + ./configure --without-poll + +ngIRCd then defaults to using the select() API function which works fine. +

1 0