Module: ngircd.git
Branch: master
Commit: f1267ca375b0b754bb466e6c95713566072d3345
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1267ca3…
Author: Alexander Barton <alex(a)barton.de>
Date: Sun Oct 24 13:41:51 2010 +0200
Don't use PARAMS() macro for function implementations
The PARAMS() macro is only needed for function prototypes;
don't use it for the actual implementations.
---
src/ngircd/irc-info.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 905799e..8f86e80 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1337,7 +1337,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
* See <http://www.irc.org/tech_docs/005.html> for details.
*/
GLOBAL bool
-IRC_Send_ISUPPORT PARAMS((CLIENT * Client))
+IRC_Send_ISUPPORT(CLIENT * Client)
{
if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client),
Conf_MaxJoins))
Module: ngircd.git
Branch: master
Commit: ccb175dce6dc257c9baf561e8a9f704f26e49f17
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ccb175dc…
Author: Alexander Barton <alex(a)barton.de>
Date: Tue Oct 19 22:19:18 2010 +0200
Added m68k/apple/aux3.0.1 (gcc 2.7.2) to doc/Platforms.txt
---
doc/Platforms.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/doc/Platforms.txt b/doc/Platforms.txt
index ce06e27..32cb8c1 100644
--- a/doc/Platforms.txt
+++ b/doc/Platforms.txt
@@ -57,6 +57,7 @@ i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1)
i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1)
i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1)
i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1)
+m68k/apple/aux3.0.1 gcc 2.7.2 17~rc1 10-10-12 alex Y Y Y Y
m68k/apple/aux3.1.1 Orig. A/UX 0.7.x-CVS 03-04-22 alex Y Y Y Y (2)
m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y
m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ?
Module: ngircd.git
Branch: master
Commit: 5f2bc55d36810499a4533589acb45839f4721c84
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5f2bc55d…
Author: Alexander Barton <alex(a)barton.de>
Date: Tue Oct 19 22:13:12 2010 +0200
Only use "__attribute__ ((unused))" if GCC >=2.8 is used
At least GCC 2.7.2 doesn't support this attribute.
---
src/portab/portab.h | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/portab/portab.h b/src/portab/portab.h
index 56d4249..d2f769f 100644
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -1,6 +1,6 @@
/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 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
@@ -8,8 +8,6 @@
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: portab.h,v 1.22 2005/07/31 20:13:11 alex Exp $
- *
* Portability functions and declarations (header for libngbportab).
*/
@@ -48,7 +46,7 @@
/* compiler features */
-#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
+#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7))
# define PUNUSED(x) __attribute__ ((unused)) x
# define UNUSED __attribute__ ((unused))
#else
Module: ngircd.git
Branch: master
Commit: d00a0f1e7c8b7e247f26a8fc265ca8217eaace8b
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d00a0f1e…
Author: Alexander Barton <alex(a)barton.de>
Date: Mon Oct 11 23:25:48 2010 +0200
ngIRCd release 17~rc1
---
ChangeLog | 1 +
NEWS | 2 ++
configure.in | 2 +-
contrib/Debian/changelog | 6 ++++++
contrib/ngircd.spec | 2 +-
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de87b29..00e8c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
ngIRCd Release 17
+ ngIRCd 17~rc1 (2010-10-11)
- New configuration option "NoZeroConf" to disable service registration at
runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using
Howl, Avahi or on Mac OS X).
diff --git a/NEWS b/NEWS
index 3ab5ae9..3b71765 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@
ngIRCd Release 17
+ ngIRCd 17~rc1 (2010-10-11)
- New configuration option "NoZeroConf" to disable service registration at
runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using
Howl, Avahi or on Mac OS X).
@@ -35,6 +36,7 @@ ngIRCd Release 17
- New configuration option "NoPAM" to disable PAM.
- Implement asynchronous user authentication using PAM, please see the
file doc/PAM.txt for details.
+ - Add some documentation for using BOPM with ngIRCd, see doc/Bopm.txt.
- Implement user mode "c": receive connect/disconnect NOTICEs. Note that
this new mode requires the user to be an IRC operator.
- Show SSL status in WHOIS output, numeric 275.
diff --git a/configure.in b/configure.in
index 897d424..cd08ef6 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@
# -- Initialisation --
AC_PREREQ(2.50)
-AC_INIT(ngircd, 17-dev)
+AC_INIT(ngircd, 17~rc1)
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 a337686..d7c2d5a 100644
--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,3 +1,9 @@
+ngircd (17~rc1-0ab1) unstable; urgency=low
+
+ * New "upstream" release candidate 1 for ngIRCd Release 17.
+
+ -- Alexander Barton <alex(a)barton.de> Mon, 11 Oct 2010 16:57:47 +0200
+
ngircd (16-0ab1) unstable; urgency=low
* New "upstream" release: ngIRCd 16.
diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec
index 4ecc152..6b4821a 100644
--- a/contrib/ngircd.spec
+++ b/contrib/ngircd.spec
@@ -1,5 +1,5 @@
%define name ngircd
-%define version 16
+%define version 17~rc1
%define release 1
%define prefix %{_prefix}
Module: ngircd.git
Branch: master
Commit: a988bbc86aed404b7bcfdbceafc030ea4bc5ecab
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a988bbc8…
Author: Alexander Barton <alex(a)barton.de>
Date: Mon Oct 11 16:54:49 2010 +0200
New configuration option "NoZeroConf" to disable ZeroConf registration
If ngIRCd is compiled to register its services using ZeroConf (e.g. using
Howl, Avahi or on Mac OS X) this parameter can be used to disable service
registration at runtime.
---
ChangeLog | 3 +++
NEWS | 3 +++
doc/sample-ngircd.conf | 4 ++++
man/ngircd.conf.5.tmpl | 6 ++++++
src/ngircd/conf.c | 7 +++++++
src/ngircd/conf.h | 3 +++
src/ngircd/rendezvous.c | 8 ++++++--
7 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4402f06..de87b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
ngIRCd Release 17
+ - New configuration option "NoZeroConf" to disable service registration at
+ runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using
+ Howl, Avahi or on Mac OS X).
- New configuration option "SyslogFacility" to define the syslog "facility"
(the "target"), to which ngIRCd should send its log messages.
Possible values are system dependant, but most probably "auth", "daemon",
diff --git a/NEWS b/NEWS
index 61e8331..3ab5ae9 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@
ngIRCd Release 17
+ - New configuration option "NoZeroConf" to disable service registration at
+ runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using
+ Howl, Avahi or on Mac OS X).
- New configuration option "SyslogFacility" to define the syslog "facility"
(the "target"), to which ngIRCd should send its log messages.
Possible values are system dependant, but most probably "auth", "daemon",
diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf
index a2694f8..fe34dff 100644
--- a/doc/sample-ngircd.conf
+++ b/doc/sample-ngircd.conf
@@ -144,6 +144,10 @@
# Don't use PAM, even if ngIRCd has been compiled with support for it.
;NoPAM = no
+ # Don't use ZeroConf service registration, even if ngIRCd has been
+ # compiled with support for it (e.g. Howl, Avahi, Mac OS X).
+ ;NoZeroConf = no
+
# try to connect to other irc servers using ipv4 and ipv6, if possible
;ConnectIPv6 = yes
;ConnectIPv4 = yes
diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl
index f4f7f6e..2645729 100644
--- a/man/ngircd.conf.5.tmpl
+++ b/man/ngircd.conf.5.tmpl
@@ -222,6 +222,12 @@ to the PAM library at runtime; all users connecting without password are
allowed to connect, all passwords given will fail.
Default: no.
.TP
+\fBNoZeroConf\fR
+If ngIRCd is compiled to register its services using ZeroConf (e.g. using
+Howl, Avahi or on Mac OS X) this parameter can be used to disable service
+registration at runtime.
+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 usage of ngIRCd in IPv6-only setups.
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index acb4010..f8b470f 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -338,6 +338,7 @@ Conf_Test( void )
printf(" NoDNS = %s\n", yesno_to_str(Conf_NoDNS));
printf(" NoIdent = %s\n", yesno_to_str(Conf_NoIdent));
printf(" NoPAM = %s\n", yesno_to_str(Conf_NoPAM));
+ printf(" NoZeroConf = %s\n", yesno_to_str(Conf_NoZeroConf));
#ifdef WANT_IPV6
printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
@@ -587,6 +588,7 @@ Set_Defaults(bool InitServers)
Conf_NoDNS = false;
Conf_NoIdent = false;
Conf_NoPAM = false;
+ Conf_NoZeroConf = false;
Conf_Oper_Count = 0;
Conf_Channel_Count = 0;
@@ -1048,6 +1050,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
Conf_NoPAM = Check_ArgIsTrue(Arg);
return;
}
+ if(strcasecmp(Var, "NoZeroConf") == 0) {
+ /* don't register services using ZeroConf */
+ Conf_NoZeroConf = Check_ArgIsTrue(Arg);
+ return;
+ }
#ifdef WANT_IPV6
/* the default setting for all the WANT_IPV6 special options is 'true' */
if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) {
diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index ff67dc7..47a499a 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -152,6 +152,9 @@ GLOBAL bool Conf_NoIdent;
/* Disable all usage of PAM, even when compiled with support for it */
GLOBAL bool Conf_NoPAM;
+/* Disable service registration using "ZeroConf" */
+GLOBAL bool Conf_NoZeroConf;
+
/*
* try to connect to remote systems using the ipv6 protocol,
* if they have an ipv6 address? (default yes)
diff --git a/src/ngircd/rendezvous.c b/src/ngircd/rendezvous.c
index 7c10629..2d9ae69 100644
--- a/src/ngircd/rendezvous.c
+++ b/src/ngircd/rendezvous.c
@@ -144,12 +144,16 @@ GLOBAL void Rendezvous_Exit( void )
} /* Rendezvous_Exit */
+/**
+ * Register ZeroConf service
+ */
GLOBAL bool Rendezvous_Register( char *Name, char *Type, UINT16 Port )
{
- /* Register new service */
-
int i;
+ if (Conf_NoZeroConf)
+ return;
+
/* Search free port structure */
for( i = 0; i < MAX_RENDEZVOUS; i++ ) if( ! My_Rendezvous[i].Desc[0] ) break;
if( i >= MAX_RENDEZVOUS )
Module: ngircd.git
Branch: master
Commit: f5790436710adcbe0fd399d4b5ba3a8603876413
URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f5790436…
Author: Alexander Barton <alex(a)barton.de>
Date: Thu Oct 7 13:20:30 2010 +0200
doc/Platforms.txt: added NetBSD 5.0.2
---
doc/Platforms.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/doc/Platforms.txt b/doc/Platforms.txt
index e113c04..ce06e27 100644
--- a/doc/Platforms.txt
+++ b/doc/Platforms.txt
@@ -48,6 +48,7 @@ i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y (3)
i386/unknown/netbsdelf1.6.1 gcc 2.95.3 CVSHEAD 04-02-24 alex 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 17-dev 10-10-05 alex Y Y Y Y (3)
+i386/unknown/netbsdelf5.0.2 gcc 4.1.3 17-dev 10-10-07 alex 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)
i586/pc/interix3.5 gcc 3.3 15 10-01-22 alex Y Y N Y