December 2008 - ngIRCd GIT Updates

Alexander Barton : Allow pre-defined server local channels ("&").
by alex＠arthur.barton.de 30 Dec '08

30 Dec '08

Module: ngircd.git Branch: master Commit: 0e4e22a7a671d1e8efbc44bffd80062191f75c38 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0e4e22a7… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 30 19:23:03 2008 +0100 Allow pre-defined server local channels ("&"). --- src/ngircd/conf.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index c82ac2b..fc12cd9 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2008 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 @@ -1168,11 +1168,10 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name) size_t size = sizeof(new_chan->name); char *dest = new_chan->name; - /* - * channels must begin with &, +, or '#', if it is + /* Channels names must begin with "&" or "#", if it is * missing, add a '#'. This is only here for user convenience. */ - if (*name && *name != '#') { + if (*name && *name != '#' && *name != '&') { *dest = '#'; --size; ++dest;

1 0

Alexander Barton : Spell check and enhance ngIRCd manual pages.
by alex＠arthur.barton.de 30 Dec '08

30 Dec '08

Module: ngircd.git Branch: master Commit: 9d20397470e579e603897dc4e3a80538e278491f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d203974… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 30 19:20:09 2008 +0100 Spell check and enhance ngIRCd manual pages. --- man/ngircd.8.tmpl | 5 ++- man/ngircd.conf.5.tmpl | 77 +++++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index 2fc7a9b..bd5b67d 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -64,15 +64,16 @@ The system wide default configuration file. .RS Default "message of the day" (MOTD). .RE +.SH HINTS +It's wise to use "ngircd \-\-configtest" to validate the configuration file +after changing it. .SH AUTHOR Alexander Barton, .UR mailto:alex@barton.de -alex(a)barton.de .UE .br Homepage: .UR http://ngircd.barton.de/ -http://ngircd.barton.de/ .UE .SH "SEE ALSO" .BR ngircd.conf (5), diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 616a358..d456bb4 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -12,6 +12,9 @@ is the configuration file of the .BR ngircd (8) Internet Relay Chat (IRC) daemon which you should adept to your local preferences and needs. +.PP +Most variables can be modified while the ngIRCd daemon is already running: +It will reload its configuration when a HUP signal is received. .SH "FILE FORMAT" The file consists of sections and parameters. A section begins with the name of the section in square brackets and continues until the next section @@ -58,7 +61,9 @@ section is used to define the server main configuration, like the server name and the ports on which the server should be listening. .TP \fBName\fR -Server name in the IRC network, must contain at least one dot ("."). +Server name in the IRC network. This is an individual name of the IRC +server, it is not related to the DNS host name. It must be unique in the +IRC network and must contain at least one dot (".") character. .TP \fBInfo\fR Info text of the server. This will be shown by WHOIS and LINKS requests for @@ -70,11 +75,12 @@ command. .TP \fBPorts\fR Ports on which the server should listen. There may be more than one port, -separated with ','. Default: 6667. +separated with commas (","). Default: 6667. .TP \fBSSLPorts\fR -Same as \fBPorts\fR , except that ngircd will expect incoming connections -to be SSL/TLS encrypted. Default: None +Same as \fBPorts\fR , except that ngIRCd will expect incoming connections +to be SSL/TLS encrypted. Common port numbers for SSL-encrypted IRC are 6669 +and 6697. Default: none. .TP \fBSSLKeyFile\fR Filename of SSL Server Key to be used for SSL connections. This is required for @@ -84,20 +90,20 @@ SSL/TLS support. (OpenSSL only:) Password to decrypt private key. .TP \fBSSLCertFile\fR -Certificate of the private key +Certificate file of the private key. .TP \fBSSLDHFile\fR Name of the Diffie-Hellman Parameter file. Can be created with gnutls "certtool \-\-generate-dh-params" or "openssl dhparam". -If this file is not present, it will be generated on startup when ngircd -was compiled with gnutls support (this may take some time). If ngircd +If this file is not present, it will be generated on startup when ngIRCd +was compiled with gnutls support (this may take some time). If ngIRCd was compiled with OpenSSL, then (Ephemeral)-Diffie-Hellman Key Exchanges and several Cipher Suites will not be available. .TP \fBListen\fR -A comma seperated list of IP address on which the server should listen. -If unset, the defaults value is "0.0.0.0", or, if ngircd was compiled -with IPv6 support, "::,0.0.0.0", so the server listens on all configured +A comma separated list of IP address on which the server should listen. +If unset, the defaults value is "0.0.0.0" or, if nIRCcd was compiled +with IPv6 support, "::,0.0.0.0". So the server listens on all configured IP addresses and interfaces by default. .TP \fBMotdFile\fR @@ -106,8 +112,8 @@ to all users connecting to the server. .TP \fBMotdPhrase\fR A simple Phrase (<256 chars) if you don't want to use a MOTD file. -If it is set no MotdFile will be read at all which can be handy if the -daemon should run inside a chroot directory. +If this variabke is set, no \fBMotdFile\fR will be read at all which can be +handy if the daemon should run inside a chroot directory. .TP \fBServerUID\fR User ID under which the server should run; you can use the name of the user @@ -168,35 +174,35 @@ Should IRC Operators be allowed to use the MODE command even if they are not(!) channel-operators? Default: no. .TP \fBOperServerMode\fR -If OperCanUseMode is enabled, this may lead the compatibility problems with +If \fBOperCanUseMode\fR is enabled, this may lead the compatibility problems with Servers that run the ircd-irc2 Software. This Option "masks" mode requests by non-chanops as if they were coming from the server. Default: no. .TP \fBPredefChannelsOnly\fR If enabled, no new channels can be created. Useful if you do not want to have channels other than those defined in -the config file. -Default: No. +[Channel] sections in the configuration file. +Default: no. .TP \fBNoDNS\fR -If set to true, ngircd will not make DNS lookups when clients connect. -If you configure ngircd to connect to other servers, ngircd may still +If set to true, ngIRCd will not make DNS lookups when clients connect. +If you configure the daemon to connect to other servers, ngIRCd may still perform a DNS lookup if required. -Default: false. +Default: no. .TP \fBNoIdent\fR -If ngircd is compiled with IDENT support this can be used to disable IDENT +If ngIRCd is compiled with IDENT support this can be used to disable IDENT lookups at run time. -Default: false. +Default: no. .TP \fBConnectIPv4\fR -Set this to no if you do not want ngircd to connect to other irc servers using ipv4. -This allows use of ngircd in ipv6-only setups. -Default: Yes. +Set this to no if you do not want ngIRCd to connect to other IRC servers using +IPv4. This allows usage of ngIRCd in IPv6-only setups. +Default: yes. .TP \fBConnectIPv6\fR -Set this to no if you do not want ngircd to connect to other irc servers using ipv6. -Default: Yes. +Set this to no if you do not want ngIRCd to connect to other irc servers using IPv6. +Default: yes. .TP \fBMaxConnections\fR Maximum number of simultaneous in- and outbound connections the server is @@ -217,7 +223,7 @@ note that all servers in an IRC network MUST use the same maximum nick name length! .TP \fBSSLConnect\fR -Connect to the remote server using TLS/SSL (Default: false) +Connect to the remote server using TLS/SSL. Default: false. .SH [OPERATOR] .I [Operator] sections are used to define IRC Operators. There may be more than one @@ -258,21 +264,21 @@ IRC name of the remote server. Internet host name (or IP address) of the peer. .TP \fBBind\fR -IP address to use as source IP for the outgoing connection. Default ist +IP address to use as source IP for the outgoing connection. Default is to let the operating system decide. .TP \fBPort\fR Port of the remote server to which ngIRCd should connect (active). If no port is assigned to a configured server, the daemon only waits for -incoming connections (passive). +incoming connections (passive, default). .TP \fBMyPassword\fR Own password for this connection. This password has to be configured as -"PeerPassword" on the other server. Must not have ':' as first character. +\fBPeerPassword\fR on the other server. Must not have ':' as first character. .TP \fBPeerPassword\fR Foreign password for this connection. This password has to be configured as -"MyPassword" on the other server. +\fBMyPassword\fR on the other server. .TP \fBGroup\fR Group of this server (optional). @@ -282,13 +288,13 @@ Disable automatic connection even if port value is specified. Default: false. You can use the IRC Operator command CONNECT later on to create the link. .TP \fBServiceMask\fR -Define a (case insensitive) mask matching nick names that sould be treated as +Define a (case insensitive) mask matching nick names that should be treated as IRC services when introduced via this remote server. REGULAR SERVERS DON'T NEED this parameter, so leave it empty (which is the default). .PP .RS When you are connecting IRC services which mask as a IRC server and which use -"virtual users" to communicate with, for example "NickServ" amd "ChanServ", +"virtual users" to communicate with, for example "NickServ" and "ChanServ", you should set this parameter to something like "*Serv". .SH [CHANNEL] Pre-defined channels can be configured in @@ -304,7 +310,7 @@ There may be more than one block. .TP \fBName\fR -Name of the channel, including channel prefix ("#"). +Name of the channel, including channel prefix ("#" or "&"). .TP \fBTopic\fR Topic for this channel. @@ -316,7 +322,8 @@ Initial channel modes. Sets initial channel key (only relevant if mode k is set). .TP \fBMaxUsers\fR -Set maximum user limit for this channel (only relevant if mode l is set). +Set maximum user limit for this channel (only relevant if channel mode "l" +is set). .SH HINTS It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it. See @@ -325,12 +332,10 @@ for details. .SH AUTHOR Alexander Barton, .UR mailto:alex@barton.de -alex(a)barton.de .UE .br Homepage: .UR http://ngircd.barton.de/ -http://ngircd.barton.de/ .UE .SH "SEE ALSO" .BR ngircd (8)

1 0

Florian Westphal : man ngircd.conf: line break missing before the SSLConnect description
by fw＠arthur.barton.de 29 Dec '08

29 Dec '08

Module: ngircd.git Branch: master Commit: 307cdce90819ec3371d18c1f46374462220d6fa3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=307cdce9… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Dec 29 23:34:20 2008 +0100 man ngircd.conf: line break missing before the SSLConnect description reported by Christoph Biedl. --- man/ngircd.conf.5.tmpl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 3c6c278..616a358 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -215,6 +215,7 @@ Default: 10. Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! +.TP \fBSSLConnect\fR Connect to the remote server using TLS/SSL (Default: false) .SH [OPERATOR]

1 0

Florian Westphal : defines.h: remove MAX_LISTEN_PORTS, MAX_SERVICES
by fw＠arthur.barton.de 27 Dec '08

27 Dec '08

Module: ngircd.git Branch: master Commit: dc9f42dc3c646e0c44350760e86cbe97977196c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dc9f42dc… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Dec 27 23:50:32 2008 +0100 defines.h: remove MAX_LISTEN_PORTS, MAX_SERVICES _SERVICES was never used; _LISTEN_PORTS is a leftover from commit 51ccb5928ad1453b0593fedd934298384d09e619 ('internal changes needed for future ssl support'). --- src/ngircd/defines.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index dccb15a..905a5a6 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -30,14 +30,10 @@ #define HOST_LEN 256 /* Max. lenght of fully qualified host names (e. g. "abc.domain.tld") */ -#define MAX_LISTEN_PORTS 16 /* Max. count of listening ports */ - #define MAX_OPERATORS 16 /* Max. count of configurable IRC Ops */ #define MAX_SERVERS 16 /* Max. count of configurable servers */ -#define MAX_SERVICES 8 /* Max. count of services */ - #define MAX_WHOWAS 64 /* Max. number of WHOWAS items */ #define DEFAULT_WHOWAS 5 /* default count for WHOWAS command */

1 0

Florian Westphal : Remove limit on max number of predefined channels.
by fw＠arthur.barton.de 26 Dec '08

26 Dec '08

Module: ngircd.git Branch: master Commit: a971047bc5491358b2d4f7873708af5458ba5f85 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a971047b… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Nov 24 22:59:10 2008 +0100 Remove limit on max number of predefined channels. This resolves Bugzilla Bug 68 ('Too many pre-defined channels configured.') --- src/ngircd/channel.c | 71 ++++++++++++++++++-------------------- src/ngircd/conf.c | 92 ++++++++++++++++++++++++++------------------------ src/ngircd/conf.h | 11 +++--- src/ngircd/defines.h | 2 - 4 files changed, 87 insertions(+), 89 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=a971…

1 0

Florian Westphal : channel.c: constify a few function arguments.
by fw＠arthur.barton.de 26 Dec '08

26 Dec '08

Module: ngircd.git Branch: master Commit: 6500d443fc27300127e1c3b33e7c0bf1ad4407e4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6500d443… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Nov 23 00:39:32 2008 +0100 channel.c: constify a few function arguments. --- src/ngircd/channel.c | 6 +++--- src/ngircd/channel.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 609bbf5..4f1aa76 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -690,7 +690,7 @@ Channel_TopicWho(CHANNEL *Chan) GLOBAL void -Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic) +Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, const char *Topic) { size_t len; assert( Chan != NULL ); @@ -728,7 +728,7 @@ Channel_SetModes( CHANNEL *Chan, char *Modes ) GLOBAL void -Channel_SetKey( CHANNEL *Chan, char *Key ) +Channel_SetKey( CHANNEL *Chan, const char *Key ) { assert( Chan != NULL ); assert( Key != NULL ); @@ -806,7 +806,7 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, GLOBAL CHANNEL * -Channel_Create( char *Name ) +Channel_Create( const char *Name ) { /* Create new CHANNEL structure and add it to linked list */ CHANNEL *c; diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 91d1e21..56b1240 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -79,9 +79,9 @@ GLOBAL char *Channel_Topic PARAMS(( CHANNEL *Chan )); GLOBAL char *Channel_Key PARAMS(( CHANNEL *Chan )); GLOBAL unsigned long Channel_MaxUsers PARAMS(( CHANNEL *Chan )); -GLOBAL void Channel_SetTopic PARAMS(( CHANNEL *Chan, CLIENT *Client, char *Topic )); +GLOBAL void Channel_SetTopic PARAMS(( CHANNEL *Chan, CLIENT *Client, const char *Topic )); GLOBAL void Channel_SetModes PARAMS(( CHANNEL *Chan, char *Modes )); -GLOBAL void Channel_SetKey PARAMS(( CHANNEL *Chan, char *Key )); +GLOBAL void Channel_SetKey PARAMS(( CHANNEL *Chan, const char *Key )); GLOBAL void Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, unsigned long Count )); GLOBAL CHANNEL *Channel_Search PARAMS(( const char *Name )); @@ -112,7 +112,7 @@ GLOBAL bool Channel_Write PARAMS((CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, bool SendErrors, const char *Text)); -GLOBAL CHANNEL *Channel_Create PARAMS(( char *Name )); +GLOBAL CHANNEL *Channel_Create PARAMS(( const char *Name )); #ifndef STRICT_RFC GLOBAL unsigned int Channel_TopicTime PARAMS(( CHANNEL *Chan ));

1 0

Florian Westphal : use %ld as format specifier for posix data types
by fw＠arthur.barton.de 26 Dec '08

26 Dec '08

Module: ngircd.git Branch: master Commit: d26a283ea9ae86c5c4633a46aaec69b02def7c66 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d26a283e… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Dec 17 23:27:25 2008 +0100 use %ld as format specifier for posix data types in the same vein as the earlier commit: cast posix data types (pid_t, ...) to long and use %ld as format specifier. This will avoid problems when sizeof(int) != sizeof(type). We could also cast to int, but this might truncate the value. --- src/ngircd/log.c | 53 +++++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index d450bd0..5559a2c 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: log.c,v 1.62 2006/08/05 09:16:21 fw Exp $"; - #include "imp.h" #include <assert.h> #include <errno.h> @@ -54,6 +52,22 @@ static char Error_File[FNAME_LEN]; static void Wall_ServerNotice PARAMS(( char *Msg )); +static void +Log_Message(int Level, const char *msg) +{ + if (!Is_Daemon) { + /* log to console */ + fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level, + (long)time(NULL) - NGIRCd_Start, msg); + fflush(stdout); + } +#ifdef SYSLOG + else { + syslog(Level, "%s", msg); + } +#endif +} + GLOBAL void Log_Init( bool Daemon_Mode ) @@ -248,25 +262,12 @@ va_dcl vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - if (!Is_Daemon) { - /* log to console */ - fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level, - time(NULL) - NGIRCd_Start, msg); - fflush(stdout); - } -#ifdef SYSLOG - else - { - /* Syslog */ - syslog( Level, "%s", msg ); - } -#endif + Log_Message(Level, msg); - if( Level <= LOG_CRIT ) - { + if (Level <= LOG_CRIT) { /* log critical messages to stderr */ - fprintf( stderr, "%s\n", msg ); - fflush( stderr ); + fprintf(stderr, "%s\n", msg); + fflush(stderr); } if (snotice) { @@ -285,7 +286,7 @@ Log_Init_Resolver( void ) openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); #endif #ifdef DEBUG - Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( )); + Log_Resolver(LOG_DEBUG, "Resolver sub-process starting, PID %ld.", (long)getpid()); #endif } /* Log_Init_Resolver */ @@ -294,7 +295,7 @@ GLOBAL void Log_Exit_Resolver( void ) { #ifdef DEBUG - Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( )); + Log_Resolver(LOG_DEBUG, "Resolver sub-process %ld done.", (long)getpid()); #endif #ifdef SYSLOG closelog( ); @@ -335,15 +336,7 @@ va_dcl vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - if (!Is_Daemon) { - /* Output to console */ - fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level, - time(NULL) - NGIRCd_Start, msg); - fflush(stdout); - } -#ifdef SYSLOG - else syslog( Level, "%s", msg ); -#endif + Log_Message(Level, msg); } /* Log_Resolver */

1 0

Tag rel-13: Alexander Barton : ngIRCd release 13
by alex＠arthur.barton.de 26 Dec '08

26 Dec '08

Module: ngircd.git Branch: refs/tags/rel-13 Tag: e457ccf88462ba4598a84588086f37acdadf6275 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=e457ccf8846… Tagger: Alexander Barton <alex(a)barton.de> Date: Thu Dec 25 23:34:47 2008 +0100 ngIRCd release 13

1 0

Alexander Barton : ngIRCd release 13
by alex＠arthur.barton.de 25 Dec '08

25 Dec '08

Module: ngircd.git Branch: master Commit: 4b83a23d9d3aa4644dc497f14eaca2bd7f1cc347 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4b83a23d… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 25 23:18:29 2008 +0100 ngIRCd release 13 --- ChangeLog | 5 ++++- NEWS | 2 +- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4abfca5..8d730bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,10 @@ -- ChangeLog -- -ngIRCd Release 13 +ngIRCd Release 13 (2008-12-25) + + - Updated documentation, especially doc/Services.txt and doc/SSL.txt. + - Make the test suite work on OpenSolaris. ngIRCd 13~rc1 (2008-11-21): - New version numer scheme :-) diff --git a/NEWS b/NEWS index bef4e7d..92a6b35 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ -- NEWS -- -ngIRCd Release 13 +ngIRCd Release 13 (2008-12-25) ngIRCd 13~rc1 (2008-11-21): - New version numer scheme :-) diff --git a/configure.in b/configure.in index 7cc8536..be03945 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 13~rc1) +AC_INIT(ngircd, 13) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 6daf595..1e1b0e0 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (13-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 13. + + -- Alexander Barton <alex(a)barton.de> Thu, 25 Dec 2008 23:09:58 +0100 + ngircd (13~rc1-0ab1) unstable; urgency=low * New "upstream" release candidate 1 for ngIRCd Release 13. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 74992e4..be6a9c0 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 13~rc1 +%define version 13 %define release 1 %define prefix %{_prefix}

1 0

Florian Westphal : don't print pid_t type with %ld format specifier
by fw＠arthur.barton.de 17 Dec '08

17 Dec '08

Module: ngircd.git Branch: master Commit: 8a94ec9728cef27c0b1e3a7df62f5530c6394308 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8a94ec97… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Dec 17 22:55:20 2008 +0100 don't print pid_t type with %ld format specifier Reported by Christoph Biedl: ngircd[21581]: Running as user irc(39), group irc(39), with PID 140733193409613. cast pid_t to long to avoid this. While we are there, cast uid_t and gid_t, too. --- src/ngircd/ngircd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 1f7969d..b564295 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -828,9 +828,9 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) pwd = getpwuid( Conf_UID ); grp = getgrgid( Conf_GID ); - Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", - pwd ? pwd->pw_name : "unknown", Conf_UID, - grp ? grp->gr_name : "unknown", Conf_GID, pid); + Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", + pwd ? pwd->pw_name : "unknown", (long)Conf_UID, + grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); if (chrooted) { Log(LOG_INFO, "Running with root directory \"%s\".",

1 0