ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Florian Westphal : doc: change path names in sample-ngircd. conf depending on sysconfdir
by fw＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 4a197638688d4e39d57f201ac735a38c9fc5a260 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a197638… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Nov 1 23:47:04 2010 +0100 doc: change path names in sample-ngircd.conf depending on sysconfdir --- doc/Makefile.am | 9 ++++++++- ...{sample-ngircd.conf => sample-ngircd.conf.tmpl} | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 1e5773e..51fab0e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,6 +10,13 @@ # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. # +.tmpl: + sed \ + -e s@:ETCDIR:@${sysconfdir}@ \ + <$< >$@ + +SUFFIXES = .tmpl + SUBDIRS = src EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ @@ -22,7 +29,7 @@ maintainer-clean-local: documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ ../NEWS ../README -install-data-hook: +install-data-hook: $(documents) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf.tmpl similarity index 97% rename from doc/sample-ngircd.conf rename to doc/sample-ngircd.conf.tmpl index fe34dff..c6dde60 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf.tmpl @@ -42,7 +42,7 @@ ;AdminInfo1 = Description ;AdminInfo2 = Location ;AdminEMail = admin(a)irc.server - + # Ports on which the server should listen. There may be more than # one port, separated with ",". (Default: 6667) ;Ports = 6667, 6668, 6669 @@ -51,16 +51,16 @@ ;SSLPorts = 6697, 9999 # SSL Server Key - ;SSLKeyFile = /usr/local/etc/ngircd/ssl/server-key.pem + ;SSLKeyFile = :ETCDIR:ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) ;SSLKeyFilePassword = secret # SSL Server Key Certificate - ;SSLCertFile = /usr/local/etc/ngircd/ssl/server-cert.pem + ;SSLCertFile = :ETCDIR:ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = /usr/local/etc/ngircd/ssl/dhparams.pem + ;SSLDHFile = :ETCDIR:ssl/dhparams.pem # comma separated list of IP addresses on which the server should # listen. Default values are: @@ -77,7 +77,7 @@ # Text file with the "message of the day" (MOTD). This message will # be shown to all users connecting to the server: - ;MotdFile = /usr/local/etc/ngircd.motd + ;MotdFile = :ETCDIR:ngircd.motd # A simple Phrase (<256 chars) if you don't want to use a motd file. ;MotdPhrase = "Hello world!" @@ -270,7 +270,7 @@ # Key file, syntax for each line: "<user>:<nick>:<key>". # Default: none. - ;KeyFile = /etc/ngircd/#chan.key + ;KeyFile = :ETCDIR:#chan.key # maximum users per channel (mode l) ;MaxUsers = 23

1 0

Tag rel-17-rc3: Alexander Barton : ngIRCd Release 17~rc3
by alex＠arthur.barton.de 27 Okt '10

27 Okt '10

Module: ngircd.git Branch: refs/tags/rel-17-rc3 Tag: 741f738028f3b89a793e135c6a163fd19ef6193f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=741f738028f… Tagger: Alexander Barton <alex(a)barton.de> Date: Wed Oct 27 22:31:47 2010 +0200 ngIRCd Release 17~rc3

1 0

Alexander Barton : ngIRCd Release 17~rc3
by alex＠arthur.barton.de 27 Okt '10

27 Okt '10

Module: ngircd.git Branch: master Commit: bdcf3f0e246c5aa3072c4f82dd9cd0541f4e79aa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bdcf3f0e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 27 22:31:05 2010 +0200 ngIRCd Release 17~rc3 --- ChangeLog | 10 ++++++++++ contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07e77a9..6cd1e96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,16 @@ ngIRCd Release 17 + ngIRCd 17~rc3 (2010-10-27) + - Xcode builds: detect version number correctly, updateed project file + to use the Mac OS X 10.5.x SDK, disable pam_fail_delay() because it + is only available starting with Mac OS X 10.6, and generate a default + PAM configuration for the Mac OS X Installer.app package of ngIRCd. + - Debian: updated standards version to 3.9.1, added libpam0g-dev to the + dependencies, and install a default /etc/pam.d/ngircd allowing all logins. + - Make contrib/platformtest.sh more portable. + - Fix connect attempts to further IP addresses of outgoing server links. + ngIRCd 17~rc2 (2010-10-25) - ZeroConf: include header files missing since commit a988bbc86a. - Generate ngIRCd version number from GIT tag. diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 395c17a..000392b 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (17~rc3-0ab1) unstable; urgency=low + + * New "upstream" release candidate 3 for ngIRCd Release 17. + + -- Alexander Barton <alex(a)barton.de> Wed, 27 Oct 2010 22:30:08 +0200 + ngircd (17~rc2-0ab2) unstable; urgency=low * Install /etc/pam.d/ngircd including "auth required pam_permit.so" when diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 719eac4..c960ad4 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 17~rc2 +%define version 17~rc3 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Fix connect attempts to further IP addresses of outgoing server links
by alex＠arthur.barton.de 27 Okt '10

27 Okt '10

Module: ngircd.git Branch: master Commit: d7ad956a06af2bde1cfcf2ed8194b6a84d69d968 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d7ad956a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 27 21:59:51 2010 +0200 Fix connect attempts to further IP addresses of outgoing server links If a hostname resolves to more than one IP address (round-robin DNS, IPv4 and IPv6) and an attempt to connect to the first address fails, ngIRCd should try to connect to the 2nd address, 3rd address etc. But because of a wrong variable used in the call to New_Server(), the wrong server structure has been used in further connection attemps which possibly lead to connection attempts to already connected servers. --- src/ngircd/conn.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index bbb186e..2d5e129 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -207,7 +207,7 @@ cb_connserver(int sock, UNUSED short what) if (ng_ipaddr_af(&Conf_Server[server].dst_addr[0])) { /* more addresses to try... */ - New_Server(res, &Conf_Server[server].dst_addr[0]); + New_Server(server, &Conf_Server[server].dst_addr[0]); /* connection to dst_addr[0] is now in progress, so * remove this address... */ Conf_Server[server].dst_addr[0] =

1 0

Alexander Barton : Debian: Install default /etc/pam.d/ ngircd allowing all logins
by alex＠arthur.barton.de 27 Okt '10

27 Okt '10

Module: ngircd.git Branch: master Commit: e2c92900300604c000af86008dad086527a04345 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2c92900… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 27 00:43:02 2010 +0200 Debian: Install default /etc/pam.d/ngircd allowing all logins This is required for backwards compatibility when installing the -full or -full-dbg package variant: PAM is enabled now but no configuration present, so all login attempts would be denied ... Creating /etc/pam.d/ngircd including "auth required pam_permit.so" restores the old behaviour of allowing all connections. --- contrib/Debian/Makefile.am | 4 ++-- contrib/Debian/changelog | 7 +++++++ contrib/Debian/ngircd.pam | 4 ++++ contrib/Debian/rules | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/Makefile.am b/contrib/Debian/Makefile.am index b20da99..dd7c753 100644 --- a/contrib/Debian/Makefile.am +++ b/contrib/Debian/Makefile.am @@ -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 @@ -10,7 +10,7 @@ # EXTRA_DIST = rules changelog compat control copyright \ - ngircd.init ngircd.default ngircd.postinst + ngircd.init ngircd.default ngircd.pam ngircd.postinst maintainer-clean-local: rm -f Makefile Makefile.in diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index f81854c..395c17a 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,10 @@ +ngircd (17~rc2-0ab2) unstable; urgency=low + + * Install /etc/pam.d/ngircd including "auth required pam_permit.so" when + installing -full or -full-dbg variant to keep backwards compatibility. + + -- Alexander Barton <alex(a)barton.de> Tue, 26 Oct 2010 23:34:56 +0200 + ngircd (17~rc2-0ab1) unstable; urgency=low * New "upstream" release candidate 2 for ngIRCd Release 17. diff --git a/contrib/Debian/ngircd.pam b/contrib/Debian/ngircd.pam new file mode 100644 index 0000000..4468e56 --- /dev/null +++ b/contrib/Debian/ngircd.pam @@ -0,0 +1,4 @@ +# /etc/pam.d/ngircd + +# allow all connections to ngIRCd +auth required pam_permit.so diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 25f4828..868a042 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -163,6 +163,8 @@ install-ngircd-full: build-ngircd-full sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \ >$(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.conf touch $(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.motd + mkdir -p $(CURDIR)/debian/ngircd-full/etc/pam.d + cp $(CURDIR)/debian/ngircd.pam $(CURDIR)/debian/ngircd-full/etc/pam.d/ngircd install-ngircd-full-dbg: build-ngircd-full-dbg dh_testdir @@ -183,6 +185,8 @@ install-ngircd-full-dbg: build-ngircd-full-dbg sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \ >$(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.conf touch $(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.motd + mkdir -p $(CURDIR)/debian/ngircd-full-dbg/etc/pam.d + cp $(CURDIR)/debian/ngircd.pam $(CURDIR)/debian/ngircd-full-dbg/etc/pam.d/ngircd # Build architecture-independent files here. binary-indep:

1 0

Alexander Barton : Debian: update standards to 3.9.1; add libpam0g-dev dependency
by alex＠arthur.barton.de 26 Okt '10

26 Okt '10

Module: ngircd.git Branch: master Commit: 5edde9a760e1e46eeeddd6b228e3a2ea4ca971db URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5edde9a7… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 26 22:56:01 2010 +0200 Debian: update standards to 3.9.1; add libpam0g-dev dependency --- contrib/Debian/control | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/control b/contrib/Debian/control index 13163ce..bccbcb9 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -2,8 +2,8 @@ Source: ngircd Section: net Priority: optional Maintainer: Alexander Barton <alex(a)barton.de> -Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap0-dev, libident-dev, libgnutls-dev -Standards-Version: 3.8.0 +Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap0-dev, libident-dev, libgnutls-dev, libpam0g-dev +Standards-Version: 3.9.1 Package: ngircd Architecture: any

1 0

Alexander Barton : Make contrib/platformtest.sh more portable
by alex＠arthur.barton.de 26 Okt '10

26 Okt '10

Module: ngircd.git Branch: master Commit: 864f3df575eafc91f4f97ef48b34c27afd08999e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=864f3df5… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 26 22:18:30 2010 +0200 Make contrib/platformtest.sh more portable --- contrib/platformtest.sh | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index d476595..432243a 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -52,15 +52,15 @@ if [ $? -ne 0 ]; then fi echo "$NAME: Checking for ./autogen.sh script ..." -if [ -e ./autogen.sh ]; then +if [ -r ./autogen.sh ]; then echo "$NAME: Running ./autogen.sh ..." [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null fi -if [ -e ./configure ]; then +if [ -r ./configure ]; then echo "$NAME: Running \"./configure\" script ..." [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null - if [ $? -eq 0 -a -e ./Makefile ]; then + if [ $? -eq 0 -a -r ./Makefile ]; then CONFIGURE=1 echo "$NAME: Running \"make\" ..." [ -n "$VERBOSE" ] && make || make >/dev/null @@ -96,9 +96,16 @@ if [ -r "Makefile" ]; then CC=$(grep "^CC = " Makefile | cut -d' ' -f3) $CC --version 2>&1 | grep -i "GCC" >/dev/null if [ $? -eq 0 ]; then - COMPILER=$($CC --version | head -n 1 | awk "{ print \$3 }" \ + COMPILER=$($CC --version | head -1 | awk "{ print \$3 }" \ | cut -d'-' -f1) COMPILER="gcc $COMPILER" + else + case "$CC" in + gcc*) + v="`$CC --version 2>/dev/null | head -1`" + [ -n "$v" ] && COMPILER="gcc $v" + ;; + esac fi fi @@ -137,7 +144,13 @@ echo " ./configure works --+ | | echo " | | | |" echo "Platform Compiler ngIRCd Date Tester C M T R See" echo "--------------------------- ------------ ---------- -------- ------ - - - - ---" -printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \ - "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ - "$C" "$M" "$T" "$R" "$COMMENT" +type printf >/dev/null 2>&1 +if [ $? -eq 0 ]; then + printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \ + "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +else + echo "$PLATFORM $COMPILER $VERSION $DATE $USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +fi echo; echo

1 0

Alexander Barton : Xcode builds ("make xcode"): detect version number correctly
by alex＠arthur.barton.de 26 Okt '10

26 Okt '10

Module: ngircd.git Branch: master Commit: a4de27deee264714099c652cb87b3b8519cbb739 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a4de27de… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 26 15:09:01 2010 +0200 Xcode builds ("make xcode"): detect version number correctly --- Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index bea1cfc..e1d8d60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 @@ -38,7 +38,7 @@ have-xcodebuild: || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 ) xcode: have-xcodebuild - rel=`grep AC_INIT configure.in | cut -d' ' -f2 | cut -d')' -f1`; \ + rel=`git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'`; \ def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \ xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \ -configuration Default $$def build

1 0

Alexander Barton : Xcode: update project file, use 10.5.x SDK
by alex＠arthur.barton.de 26 Okt '10

26 Okt '10

Module: ngircd.git Branch: master Commit: 3dd91923e442cef439744636f6abd80cde85792f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3dd91923… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 26 15:10:14 2010 +0200 Xcode: update project file, use 10.5.x SDK This is required for universal 32 bit and 64 bit builds: now code for ppc, i386, and x86_64 is generated (which requires 10.5 or newer). --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 5263c9e..98437c1 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -650,7 +650,14 @@ isa = PBXProject; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; compatibilityVersion = "Xcode 3.0"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* ngIRCd */; projectDirPath = ""; projectReferences = ( @@ -733,7 +740,6 @@ GCC_WARN_UNUSED_VALUE = YES; INSTALL_PATH = /usr/local/bin; PRODUCT_NAME = ngIRCd; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Default; }; @@ -746,29 +752,28 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Default; }; FAB0570C105D917F006AF9E2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_DEBUGGING_SYMBOLS = full; GCC_OPTIMIZATION_LEVEL = 0; GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + SDKROOT = ""; }; name = Debug; }; FAB0570D105D917F006AF9E2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; @@ -788,9 +793,7 @@ GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VALUE = YES; INSTALL_PATH = /usr/local/bin; - ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = ngIRCd; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Debug; };

1 0

Alexander Barton : Xcode builds ("make xcode"): disable pam_fail_delay()
by alex＠arthur.barton.de 26 Okt '10

26 Okt '10

Module: ngircd.git Branch: master Commit: 76f40bdb988440a73431eb14a27f30aeaa18ebe5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=76f40bdb… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 26 15:13:24 2010 +0200 Xcode builds ("make xcode"): disable pam_fail_delay() disable pam_fail_delay() only is available starting with Mac OS X 10.6; but we use the 10.5 SDK for campatibility, so don't use this function at all when building using Xcode. --- contrib/MacOSX/config.h | 2 ++ src/ngircd/pam.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 0da178d..ba5e7e6 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -115,6 +115,8 @@ #define HAVE_PAM_AUTHENTICATE 1 /* Define to 1 if you have the <pam/pam_appl.h> header file. */ #define HAVE_PAM_PAM_APPL_H 1 +/* Mac OS X <10.6 doesn't have pam_fail_delay() */ +#define NO_PAM_FAIL_DELAY 1 #endif /* -eof- */ diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c index e6d25bc..0d4f27f 100644 --- a/src/ngircd/pam.c +++ b/src/ngircd/pam.c @@ -111,7 +111,7 @@ PAM_Authenticate(CLIENT *Client) { pam_set_item(pam, PAM_RUSER, Client_User(Client)); pam_set_item(pam, PAM_RHOST, Client_Hostname(Client)); -#ifdef HAVE_PAM_FAIL_DELAY +#if defined(HAVE_PAM_FAIL_DELAY) && !defined(NO_PAM_FAIL_DELAY) pam_fail_delay(pam, 0); #endif

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates