ngIRCd 0.8.3

Fixed a bug that could case a root exploit when the daemon is compiled
to do IDENT lookups and is logging to syslog. Bug discovered by CoKi, <coki@nosystem.com.ar>, thanks a lot! [from HEAD.] (http://www.nosystem.com.ar/advisories/advisory-11.txt)
2025-09-20 03:04:03 +00:00 · 2005-02-03 10:16:25 +00:00 · 2005-02-03 09:27:09 +00:00 · 2005-02-03 09:20:58 +00:00 · 2005-01-27 00:15:15 +00:00 · 2005-01-27 00:01:10 +00:00
190 changed files with 10415 additions and 23368 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-ansi2knr.1
-ansi2knr.c
-ansi2knr.h
-autom4te.cache
-build-stamp-ngircd*
-config.log
-config.status
-configure
-configure.lineno
-cscope.out
-debian
-depcomp
-install-sh
-missing
-ngircd.dest
-.deps
-*.a
-*.o
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +0,0 @@
-# mailmap file for git-[short]log and git-blame
-
-Alexander Barton <anonymous>
-Ali Shemiran <ashemira@ucsd.edu>
--- a/30
+++ b/30
@@ -1,41 +1,27 @@

                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/

-               (c)2001-2011 Alexander Barton and Contributors.
+                        (c)2001-2005 Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
               ngIRCd is free software and published under the
                   terms of the GNU General Public License.

                       -- AUTHORS and CONTRIBUTORS --


-Note: If you have critics, patches or something else, please feel free to
-post a mail to the ngIRCd mailing list: <ngircd-ml@arthur.ath.cx> (please see
-<http://ngircd.barton.de/#ml> for details). Don't mail the contributors
-directly, if possible!
-
-
 Main Authors
 ~~~~~~~~~~~~
 Alexander Barton, <alex@barton.de> (alex)
-Florian Westphal, <fw@strlen.de>


 Contributors
 ~~~~~~~~~~~~
-Ali Shemiran, <ashemira@ucsd.edu>
-Ask Bjørn Hansen, <ask@develooper.com>
+Goetz Hoffart, <goetz@hoffart.de> (goetz)
+Ilja Osthoff, <i.osthoff@gmx.net> (ilja)
 Benjamin Pineau, <ben@zouh.org>
-Brandon Beresini, <beresini@google.com>
-Bryan Caldwell, <bcaldwel@ucsd.edu>
-Dana Dahlstrom, <dana+ngIRCd@cs.ucsd.edu>
-Eric Grunow, <egrunow@ucsd.edu>
-Goetz Hoffart, <goetz@hoffart.de>
-Ilja Osthoff, <i.osthoff@gmx.net>
-Jari Aalto, <jari.aalto@cante.net>
-Rolf Eike Beer, <eike@sf-mail.de>
-Scott Perry, <scperry@ucsd.edu>
 Sean Reifschneider, <jafo-rpms@tummy.com>
+Florian Westphal, <westphal@foo.fh-furtwangen.de>


 Code snippets
@@ -43,3 +29,7 @@ Code snippets
 J. Kercheval: pattern matching functions
 Patrick Powell, <papowell@astart.com>: snprintf()-function
 Andrew Tridgell & Martin Pool: strl{cpy|cat}()-functions
+
+
+-- 
+$Id: AUTHORS,v 1.8.2.2 2005/01/26 13:26:41 alex Exp $
--- a/589
+++ b/589
@@ -1,592 +1,27 @@

                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/

-               (c)2001-2011 Alexander Barton and Contributors.
+                       (c)2001-2005 Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
               ngIRCd is free software and published under the
                   terms of the GNU General Public License.

                               -- ChangeLog --


-ngIRCd Release 18
-
-  ngIRCd 18~rc2 (2011-06-29)
-  - Update documentation, fix some wording, and use a spellchecker :-)
-  - ngircd.conf.5: strip "SSL" prefix from variables in [SSL] section.
-  - ngircd.8: document debugging options.
-  - GnuTLS: use 1024 bits as minimum size of the DH prime. This enables
-    ngIRCd to accept incoming connections from other servers and clients
-    that "only" use at least 1024 bits again, like ngIRCd 17 did (and no
-    longer requires 2048 bits for incoming connections).
-
-  ngIRCd 18~rc1 (2011-06-27)
-  - PAM warning message: make clear which "Password" config option is ignored.
-  - New configuration option "MorePrivacy" to "censor" some user information.
-    When enabled, signon time and idle time is left out. Part and quit
-    messages are made to look the same. WHOWAS requests are silently dropped.
-    All of this is useful if one wish to conceal users that access the ngircd
-    servers from TOR or I2P.
-  - New configuration option "ScrubCTCP" to scrub incoming CTCP commands. If
-    activated, the server silently drops incoming CTCP requests from both
-    other servers and from users. The server that scrubs CTCP will not forward
-    the CTCP requests to other servers in the network either, which can spell
-    trouble if not every oper knows about the CTCP-scrubbing. Scrubbing CTCP
-    commands also means that it is not possible to send files between users.
-    There is one exception to the CTCP scrubbing performed: ACTION ("/me
-    commands") requests are not scrubbed.
-  - Display configuration errors more prominent on "--configtest".
-  - Restructure ngIRCd configuration file: introduce new [Limits], [Options],
-    and [SSL] sections. The intention of this restructuring is to make the
-    [Global] section much cleaner, so that it only contains variables that
-    most installations must adjust to the local requirements. All the optional
-    variables are moved to [Limits], for configurable limits and timers of
-    ngIRCd, and [Options], for optional features. All SSL-related variables
-    are moved to [SSL] and the "SSL"-prefix is stripped. The old variables in
-    the [Global] section are deprecated now, but are still recognized.
-    => Don't forget to check your configuration, use "ngircd --configtest"!
-  - New documentation "how to contribute": doc/Contributing.txt.
-  - Slightly fix error handling when connecting to remote servers.
-  - GnuTLS: bump DH-bitsize to 2048: this solves the problem that some clients
-    refuse to connect to severs that only offer 1024. For interoperability it
-    would be best to just use 4096 bits, but that takes minutes, even on
-    current hardware ...
-  - contrib/platformtest.sh: fix gcc version detection.
-  - Avoid needlessly scary 'buffer overflow' messages: When the write buffer
-    space grows too large, ngIRCd has to disconnect the client to avoid
-    wasting too much memory, which is logged with a scary 'write buffer
-    overflow' message. Change this to a more descriptive wording.
-  - Require server prefixes for most commands on RFC2812 links. RFC1459 links
-    (often used by services, for example) are not affected.
-  - Mac OS X: update installer functionality, texts, and add our logo :-)
-  - New configuration option "RequireAuthPing": PING-PONG on login. When
-    enabled, this configuration option lets ngIRCd send a PING with an numeric
-    "token" to clients logging in; and it will not become registered in the
-    network until the client responds with the correct PONG.
-  - New configuration option "NoticeAuth": send NOTICE AUTH on connect. When
-    active, ngircd will send "NOTICE AUTH" messages on client connect time
-    like e.g. snircd (QuakeNet) does.
-  - Generate WALLOPS message on SQUIT from IRC operators; so SQUIT now behaves
-    like CONNECT and DISCONNECT commands, when called by an IRC operator.
-  - Allow servers to send more commands in the first 10 seconds ("burst"). This
-    helps to speed up server login and network synchronization.
-  - Add support for up to 3 targets in WHOIS queries, also allow up to one
-    wildcard query from local hosts. Follows ircd 2.10 implementation rather
-    than RFC 2812. At most 10 entries are returned per wildcard expansion.
-  - ngircd.conf(5) manual page: describe types of configuration variables
-    (booleans, text strings, integer numbers) and add type information to each
-    variable description.
-  - Don't use "the.net" in sample-ngircd.conf, use "example.net".
-  - Terminate incoming connections on HTTP commands "GET" and "POST".
-  - New configuration option "CloakHost": when set, this hostname is used for
-    every client instead of the real DNS hostname (or IP address).
-  - New configuration option "CloakUserToNick": when enabled, ngIRCd sets
-    every clients' user name to their nick name and hides the user name
-    supplied by the IRC client.
-  - doc/Protocol.txt: Update description of the CHANINFO and WEBIRC commands.
-  - Doxygen'ify (document) much more source files; code cleanup ...
-  - Make write buffers bigger, but flush early. Before this change, a client
-    got disconnected if the buffer flushing at 4k failed, now regular clients
-    can store up to 32k and servers up 64k even if flushing is not possible at
-    the moment. This enhances reliability on slow links.
-  - Don't access possibly free'd CLIENT structure. Ooops.
-  - Allow "Port = 0" in [Server] blocks. Port number 0 marks remote servers
-    that try to connect to this daemon, but where this daemon never tries to
-    establish a connection on its own: only incoming connections are allowed.
-  - Configuration: fix 'Value of "..." is not a number!' for negative values.
-  - Enable WHOIS command to return information about services.
-  - Implement channel mode 'O': "IRC operators only". This channel mode is
-    used on DALnet (bahamut), for example.
-  - Remove support for ZeroConf/Bonjour/Rendezvous service registration
-    including the "[No]ZeroConf" configuration option.
-  - TOPIC command: test for channel admin rights correctly: this enables other
-    servers, services and IRC operators to change channel topics, even when
-    the client is not joined to this channel.
-  - Deprecate NoXX-Options in ngircd.conf and move new variants into our new
-    [Options] section: 'NoDNS=no' => 'DNS=yes', 'NoIdent=no' => 'Ident=yes',
-    'NoPAM=no' => 'PAM=yes', and 'NoZeroConf=no' => 'ZeroConf=yes' (and
-    vice-versa). The defaults are adjusted accordingly and the old variables
-    in [Global] are still accepted, so there is no functional change.
-  - Fix confusing "adding to invite list" debug messages: adding entries to
-    ban list produced 'invite list' debug output ...
-  - Don't throttle services and servers being registered.
-  - Xcode: correctly sort files :-)
-  - Don't assert() when searching a client for an invalid server token (this is
-    only relevant when a trusted server on a server-server link sends invalid
-    commands).
-
-ngIRCd Release 17.1 (2010-12-19)
-
-  - --configtest: remember if MOTD is configured by file or phrase
-  - Enhance log messages when establishing server links a little bit
-  - Reset ID of outgoing server link on DNS error correctly
-  - Don't log critical (or worse) messages to stderr
-  - Manual page ngircd(8): add SIGNALS section
-  - Manual pages: update and simplify AUTHORS section
-  - Remove "error file" when compiled with debug code enabled
-  - README: Updated list of implemented commands
-  - add doc/README-Interix.txt and doc/Bopm.txt to distribution tarball
-  - Merge branch 'numeric-329'
-  - add doc/PAM.txt to distribution tarball
-  - New numeric 329: get channel creation time on "MODE #chan" commands
-  - Save channel creation time; new function Channel_CreationTime()
-
-ngIRCd Release 17 (2010-11-07)
-
-  - doc: change path names in sample-ngircd.conf depending on sysconfdir
-  - Fix up generation and distribution of sample-ngircd.conf
-  - contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa
-  - contrib/platformtest.sh: make command name quoting consistent
-
-  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.
-  - Make sourcecode compatible with ansi2knr again. This allows to compile
-    ngIRCd using a pre-ANSI K&R C compiler again.
-  - ./configure: check if C compiler can compile ISO Standard C.
-  - ./configure: check support for C prototypes again.
-  - Don't use PARAMS() macro for function implementations.
-  - Added m68k/apple/aux3.0.1 (gcc 2.7.2) to doc/Platforms.txt.
-  - Only try to set FD_CLOEXEC if this flag is defined.
-  - Only use "__attribute__ ((unused))" if GCC >=2.8 is used.
-  - doc/Makefile.am: don't set docdir, automake handles it already.
-
-  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).
-  - 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",
-    "user" and "local1" through "local7" are possible values; see syslog(3).
-    Default is "local5" for historical reasons.
-  - Dump the "internal server state" (configured servers, established
-    connections and known clients) to the console or syslog when receiving
-    the SIGUSR2 signal and debug mode is enabled.
-  - Enable the daemon to disable and enable "debug mode" on runtime using
-    signal SIGUSR1, when debug code is compiled in, not only on startup
-    using the command line parameters.
-  - Signal handler: added new 'delayed' signal handlers, including fallback
-    to deprecated sysv API. And removed global NGIRCd_SignalRehash variable.
-  - IO: add io_cloexec() to set close-on-exec flag.
-  - ng_ipaddr.h: include required assert.h header.
-  - Conn_SyncServerStruct(): test all connections; and work case insensitive
-  - configure script: correctly indent IPv6 yes/no summary output.
-  - Don't reset My_Connections[Idx].lastping when reading data, so the
-    client lag debug-output is working again.
-  - Implement user mode "x": hostname cloaking (closes: #102).
-  - Make configure switch "--docdir" work (closes: #108).
-  - Reformat and update FAQ.txt a little bit.
-  - INSTALL: mention SSL, IPv6, and changed handling of MotdFile.
-  - Change MOTD file handling: ngIRCd now caches the contens of the MOTD
-    file, so the daemon now requires a HUP signal or REHASH command to
-    re-read the MOTD file when its content changed.
-  - Startup: open /dev/null before chroot'ing the daemon.
-  - Allow IRC ops to change channel modes even without OperServerMode set.
-  - Allow IRC operators to use MODE command on any channel (closes: #100).
-  - Added mailmap file for git-[short]log and git-blame.
-  - Authenticated users should be registered without the "~" mark.
-  - Set NoPAM=yes in configuration files used for the testsuite.
-  - New configuration option "NoPAM" to disable PAM.
-  - Implement asynchronous user authentication using PAM, please see the
-    file doc/PAM.txt for details.
-  - Resolver: Implement signal handler and catch TERM signals.
-  - Don't set a penalty time when doing DNS lookups.
-  - 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.
-  - ngircd.init: require "$network" and "$remote_fs" when stopping ngircd.
-  - Show SSL status in WHOIS output, numeric 275.
-  - Include correct header files when testing for arpa/inet.h (Closes: #105).
-  - Don't access already freed memory in IRC_KILL().
-  - Fix "beeing" typo ...
-  - SSL/TLS: fix bogus "socket closed" error message.
-
-ngIRCd Release 16 (2010-05-02)
-
-  - doc/SSL: remove line continuation marker
-
-  ngIRCd 16~rc2 (2010-04-25)
-  - Updated some more copyright notices, it's 2010 already :-)
-  - Only compile in Get_Error() if really needed
-  - Fix gcc warning "ignoring return value of ..."
-  - Include netinet/in_systm.h alongside netinet/ip.h
-  - Include netinet/{in.h, in_systm.h} when checking for netinet/ip.h
-  - Only include <netinet/in_systm.h> if it exists
-  - Updated doc/Platforms.txt
-  - Enhace connection statistics counters: display total number of served
-    connections on daemon shutdown and when a new client connects using
-    the new numeric RPL_STATSCONN (250).
-
-  ngIRCd 16~rc1 (2010-03-25)
-  - Various fixes to the build system and code cleanups.
-  - contrib/platformtest.sh: Only show latest commit.
-  - Updatet doc/Platforms.txt, added new README-Interix.txt documenting
-    how to tun ngIRCd on Microsoft Services for UNIX (MS SFU, MS SUA).
-  - Updated links to the ngIRCd homepage (bug tracker, mailing list).
-  - Added missing modes to USERMODES #define
-  - Show our name (IRCD=ngIRCd) in ISUPPORT (005) numeric
-  - Quote received messages of ERROR commands in log output.
-  - ngircd.conf manual page: document missing "Password" variable.
-  - Implement WEBIRC command used by some Web-IRC frontends. The password
-    required to secure this command must be configured using the new
-    "WebircPassword" variable in the ngircd.conf file.
-  - Don't use port 6668 as example for both "Ports" and "SSLPorts".
-  - Remove limit on max number of configured irc operators.
-  - Only link "nsl" library when really needed.
-  - A new channel mode "secure connections only" (+z) has been implemented:
-    Only clients using a SSL encrypted connection to the server are allowed
-    to join such a channel.
-    But please note three things: a) already joined clients are not checked
-    when setting this mode, b) IRC operators are always allowed to join
-    every channel, and c) remote clients using a server not supporting this
-    mode are not checked either and therefore always allowed to join.
-
-ngIRCd Release 15 (2009-11-07)
-
-  - "ngircd --configtest": print SSL configuration options even when unset.
-
-  ngIRCd 15~rc1 (2009-10-15)
-  - Do not add default listening port (6667) if SSL ports were specified, so
-    ngIRCd can be configured to only accept SSL-encrypted connections now.
-  - Enable IRC operators to use the IRC command SQUIT (insted of the already
-    implemented but non-standard DISCONNECT command).
-  - New configuration option "AllowRemoteOper" (disabled by default) that
-    enables remote IRC operators to use the IRC commands SQUIT and CONNECT
-    on the local server.
-  - Mac OS X: fix test for packagemaker(1) tool in Makefile and use gcc 4.0
-    for Mac OS X 10.4 compatibility in the Xcode project file.
-  - Fix --with-{openssl|gnutls} to accept path names.
-  - Fix LSB header of Debian init script.
-  - Updated doc/Platforms.txt and include new script contrib/platformtest.sh
-    to ease generating platform reports.
-  - Fix connection information for already registered connections.
-  - Enforce upper limit on maximum number of handled commands. This implements
-    a throttling scheme: an IRC client can send up to 3 commands or 256 bytes
-    per second before a one second pause is enforced.
-  - Fix connection counter.
-  - Fix a few error handling glitches for SSL/TLS connections.
-  - Minor fixes to manual pages and documentation.
-
-ngIRCd Release 14.1 (2009-05-05)
-
-  - Security: fix remotely triggerable crash in SSL/TLS code.
-  - BSD start script contrib/ngircd.sh has been renamed to ngircd-bsd.sh.
-  - New start/stop script for RedHat-based distributions:
-    contrib/ngircd-redhat.init, thanks to Naoya Nakazawa <naoya@sanow.net>.
-  - Doxygen: update source code repository link to GIT.
-  - Debian: build ngircd-full-dbg package.
-  - Allow ping timeout quit messages to show the timeout value.
-  - Fix error handling on compressed links.
-  - Fix server list announcement.
-  - Do not remove hostnames from info text.
-
-ngIRCd Release 14 (2009-04-20)
-
-  - Display IPv6 addresses as "[<addr>]" when accepting connections.
-
-  ngIRCd 14~rc1 (2009-03-29)
-  - Updated Debian/Linux init script (see contrib/Debian/ngircd.init).
-  - Allow creation of persistent modeless channels.
-  - The INFO command reports the compile time now (if available).
-  - Spell check and enhance ngIRCd manual pages.
-  - Channel mode changes: break on syntax errors in MODE command.
-  - Support individual channel keys for pre-defined channels: introduce
-    new configuration variable "KeyFile" in [Channel] sections in ngircd.conf,
-    here a file can be configured for each pre-defined channel which contains
-    individual channel keys for different users.
-  - Remove limit on maximum number of predefined channels in ngircd.conf.
-  - Updated ngircd.spec file for building RPM packages.
-  - Add new and missing files to Mac OS X Xcode project, and update project.
-  - Reject masks with wildcard after last dot.
-  - TLS/SSL: remove useless error message when ssl connection is closed.
-  - Fix memory leak when a encrypted and compressed server link goes down.
-    (closes bug #95, reported by Christoph, fiesh@fiesh.homeip.net)
-  - Fix handling of channels containing dots.
-    (closes ug #93, reported by Gonosz Csiga)
-
-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 number scheme :-)
-  - Initial support for IRC services, using a RFC1459 style interface,
-    tested with IRCServices (http://www.ircservices.za.net/) version 5.1.13.
-    For this to work, ngIRCd now supports server-server links conforming
-    to RFC 1459. New ngircd.conf(5) option: ServiceMask.
-  - Support for SSL-encrypted server-server and client-server links using
-    OpenSSL (configure: --with-openssl) or GNUTLS (configure: --with-gnutls).
-    New ngircd.conf(5) options: SSLPorts, SSLKeyFile, SSLKeyFilePassword,
-    SSLCertFile, SSLDHFile, and SSLConnect.
-  - Server local channels have been implemented, prefix "&", that are only
-    visible to users of the same server and are not visible in the network.
-    In addition ngIRCd creates a "special" channel &SERVER on startup and logs
-    all the messages to it that a user with mode +s receives.
-  - New make target "osxpkg" to build a Mac OS X installer package.
-  - Debug mode: enable support for GNU libc memory tracing (see mtrace(3)).
-  - SysV init script: use LSB logging functions, if available.
-  - Added some more FAQ entries (regarding logging and IRC operators).
-  - Allow IRC operators to overwrite channel limits.
-  - Support for enhanced PRIVMSG and NOTICE message targets.
-  - More tests have been added to the test-suite ("make check"), and two
-    servers are started for testing server-server linking.
-  - Added a timestamp to log messages to the console.
-  - New configuration option "NoIdent" to disable IDENT lookups even if the
-    daemon is compiled with IDENT support.
-
-ngIRCd 0.12.1 (2008-07-09)
-
-  - Allow mixed line terminations (CR+LF/CR/LF) in non-RFC-compliant mode
-  - Don't allow stray \r or \n in command parameters
-  - --configtest: return non-zero exit code if there are errors
-  - Update ngIRCd manual pages
-  - Add option aliases -V (for --version) and -h (for --help).
-  - Fix 'no-ipv6' compile error.
-  - Make Listen parameter a comma-separated list of addresses. This also
-    obsoletes ListenIPv4 and ListenIPv6 options. If Listen is unset, it
-    is treated as Listen="::,0.0.0.0".
-    Note: ListenIPv4 and ListenIPv6 options are still recognized,
-    but ngircd will print a warning if they are used in the config file.
-
-ngIRCd 0.12.0 (2008-05-13)
-
-  - Fix Bug: 85: "WHO #SecretChannel" that user is not a member of now returns
-    proper RPL_ENDOFWHO_MSG instead of nothing. (Ali Shemiran)
-  - Fix compile on FreeBSD 5.4 and AIX.
-  - If bind() fails, also print IP address and not just the port number.
-
-  ngIRCd 0.12.0-pre2 (2008-04-29)
-  - IPv6: Add config options to disable ipv4/ipv6 support.
-  - Don't include doc/CVS.txt in distribution archive, use doc/GIT.txt now!
-  - Documentation: get rid of some more references to CVS, switch to GIT.
-  - Get rid of cvs-version.* and CVSDATE definition.
-  - Report ERR_NOTONCHANNEL when trying to part a channel one is not member of.
-  - Testsuite: remove erroneous ConfUID setting in config file.
-
-  ngIRCd 0.12.0-pre1 (2008-04-20)
-  - Include Mac OS X Xcode project in distribution archives.
-  - Do not exit on SIGHUP or /REHASH if the config file cannot opened.
-  - Add IPv6 support.
-  - Install a LaunchDaemon script to start/stop ngIRCd on Mac OS X.
-  - Implemented IRC commands INFO, SUMMON (dummy), and USERS (dummy) and
-    enhanced test suite to check these commands. (Dana Dahlstrom)
-  - RPL_WHOREPLY messages generated by IRC_WHO didn't include flags (*,@,+).
-    (Dana Dahlstrom)
-  - IRC_WHO now supports search patterns and will test this against user
-    nickname/servername/hostname, etc. as required by RFC 2812, Section 3.6.1.
-    (reported by Dana Dahlstrom)
-  - Add test cases for "WHO" command. (Dana Dahlstrom)
-  - Implement RFC 2812 handling of "0" argument to 'JOIN': must be treated
-    as if the user had sent PART commands for all channels the user is a
-    member of. (Dana Dahlstrom)
-  - Allow NOTICEs to be sent to a channel. (Fabian Schlager)
-
-ngIRCd 0.11.1 (2008-02-26)
-
-  - Fix sending of JOIN commands between servers when remote server appended
-    mode flags. (Rolf Eike Beer) [from HEAD]
-  - Send "G" instead of "H" flag in WHO replies. (reported by Dana Dahlstrom)
-  - Under some circumstances ngIRCd issued channel MODE message with a
-    trailing space. (Dana Dahlstrom) [from HEAD]
-
-ngIRCd 0.11.0 (2008-01-15)
-
-  ngIRCd 0.11.0-pre2 (2008-01-07)
-  - SECURITY: IRC_PART could reference invalid memory, causing
-    ngircd to crash [from HEAD]. (CVE-2008-0285)
-  
-  ngIRCd 0.11.0-pre1 (2008-01-02)
-  - Use dotted-decimal IP address if hostname is >= 64.
-  - Add support for /STAT u (server uptime) command.
-  - New [Server] configuration Option "Bind" allows to specify
-    the source IP address to use when connecting to remote server.
-  - New configuration option "MaxNickLength" to specify the allowed maximum
-    length of user nick names. Note: must be unique in an IRC network!
-  - Enhanced the IRC+ protocol to support an enhanced "server handshake" and
-    enable server to recognize numeric 005 (ISUPPORT) and 376 (ENDOFMOTD).
-    See doc/Protocol.txt for details.
-  - Re-added doc/SSL.txt to distribution -- got lost somewhere!?
-  - Fixes the wrong logging output when nested servers are introduced
-    to the network as well as the wrong output of the LINKS command.
-  - Update Mac OS X Xcode project file for Xcode 3.
-  - Adjust test suite to be usable on HP/UX 11.11 :-)
-  - Fix code to compile using K&R C compiler and ansi2kr again.
-  - New config option NoDNS: Disables DNS lookups when clients connect.
-  - Fixed propagation of channel mode 'P' on server links.
-  - Numeric 317: implemented "signon time" (displayed in WHOIS result).
-  - Fixed code that prevented GCC 2.95 to compile ngIRCd.
-  - Adjust path names in manual pages according to "./configure" settings.
-  - Added new server configuration option "Passive" for "Server" blocks to
-    disable automatic outgoing connections (similar to -p option to ngircd,
-    but only for the specified server). (Tassilo Schweyer)
-  - Don't connect to a server if a connection to another server within the
-    same group is already in progress.
-  - Added support for the WALLOPS command. Usage is restricted to IRC
-    operators.
-
-ngIRCd 0.10.4 (2008-01-07)
-
-  - SECURITY: IRC_PART could reference invalid memory, causing
-    ngircd to crash [from HEAD]. (CVE-2008-0285)
-  
-ngIRCd 0.10.3 (2007-08-01)
-
-  - SECURITY: Fixed a severe bug in handling JOIN commands, which could
-    cause the server to crash. Thanks to Sebastian Vesper, <net@veoson.net>.
-    (CVE-2007-6062)
-
-ngIRCd 0.10.2 (2007-06-08)
-
-  ngIRCd 0.10.2-pre2 (2007-05-19)
-  - Server links are allowed to use larger write buffers now (up to 50 KB).
-
-  ngIRCd 0.10.2-pre1 (2007-05-05)
-  - Fix compressed server links (broken since 0.10.0).
-  - Predefined Channel configuration now allows specification of channel key
-    (mode k) and maximum user count (mode l).
-  - When using epoll() IO interface, compile in the select() interface as
-    well and fall back to it when epoll() isn't available on runtime.
-  - New configure option "--without-select" to disable select() IO API
-    (even when using epoll(), see above).
-  - Added support for IO APIs "poll()" and "/dev/poll".
-  - Reorganized internal handling of invite and ban lists.
-
-ngIRCd 0.10.1 (2006-12-17)
-
-  - Fixed validation of server names containing digits.
-  - Update the "info text" of the local server after re-reading configuration.
-  - Changed Numerics 265 and 266 to follow ircd 2.11.x "standards".
-  - Allow PASS syntax defined in RFC 1459 for server links, too.
-  - Enhanced ISUPPORT message (005 numeric).
-  - New configuration option "PredefChannelsOnly": if set, clients can only
-    join predefined channels.
-  - Code cleanups: use "LogDebug(...)" instead of "Log(LOG_DEBUG, ...)", use
-    "strcspn()", unsigned vs. signed, use "const", fix whitespaces, ...
-
-ngIRCd 0.10.0 (2006-10-01)
-
-  - Fixed file handle leak when daemon is not able to send MOTD to a client.
-
-  ngIRCd 0.10.0-pre2 (2006-09-09)
-  - Fixed build problems with GCC option -fstack-protector.
-  - Minor documentation updates.
-
-  ngIRCd 0.10.0-pre1 (2006-08-02)
-  - Validate "ServerName" (see RFC 2812, section 2.3.1).
-  - Enhanced DIE to accept a single parameter ("comment text") which is sent
-    to all locally connected clients before the server goes down.
-  - The ngIRCd handles time shifts backwards more gracefully now (the
-    timeout handling doesn't disconnect clients by mistake any more).
-  - Internal: Restructured connection handling (the connection ID is equal
-    to the file descriptor of the connection).
-  - Internal: Simplified resolver code.
-  - JOIN now supports more than one channel key at a time.
-  - Implemented numeric "333": Time and user name who set a channel topic.
-  - Enhanced the handler for PING and PONG commands: fix forwarding and enable
-    back-passing of a client supplied additional argument of PING.
-  - Changed handling of timeouts for unregistered connections: don't reset
-    the counter if data is received and disconnect clients earlier.
-  - Removed unnecessary #define of "LOCAL", now use plain C "static" instead.
-  - Channel topics are no longer limited to 127 characters: now the only limit
-    is the maximum length of an IRC command, i. e. 512 bytes (in practice, this
-    limits the topic to about 490 characters due to protocol overhead).
-  - Reverse DNS lookup code now checks the result by doing an additional
-    lookup to prevent spoofing.
-  - Added new IO layer which (optionally) supports epoll() and kqueue() in
-    addition to the select() interface.
-
-ngIRCd 0.9.2 (2005-10-15)
-
-  - Fixed a bug that could cause the daemon to crash when outgoing server
-    connections can't be established.
-  - Fixed a bug that caused the daemon to leak file descriptors when no
-    resolver subprocesses could be created.
-  - Fixed server NOTICEs to users with "s" mode ("server messages").
-  - Fixed a format string bug in "connection statistics" messages to clients.
-
-ngIRCd 0.9.1 (2005-08-03)
-
-  - The KILL command killed much more than desired (including server links!)
-    when the target user is connected to a remote server. Bug introduced in
-    ngIRCd 0.9.0 ...  Reported by <qssl@fastmail.fm>, Thanks!
-  - Changed some constants to be "signed" (instead of unsigned) to solve
-    problems with old (pre-ANSI) compilers.
-
-ngIRCd 0.9.0 (2005-07-24)
-
-  ngIRCd 0.9.0-pre1 (2005-07-09)
-  - Fixed maximum length of user names, now allow up to 9 characters.
-  - Cut off oversized IRC messages that should be sent to the network instead
-    of shutting down the (wrong) connection.
-  - Don't generate error messages for unknown commands received before the
-    client is registered with the server (like the original ircd).
-  - Never run with root privileges but always switch the user ID.
-  - Make "netsplit" messages RFC compliant.
-  - Fix handling of QUIT Messages: send only one message, even if the client
-    is member of multiple channels.
-  - Don't exit server if closing of a socket fails; instead ignore it and
-    pray that this will be "the right thing" ...
-  - Implemented the IRC function "WHOWAS".
-  - Don't enable assert() calls when not ./configure'd with --enable-debug.
-  - Fixed ./configure test for TCP Wrappers: now it runs on Mac OS X as well.
-  - Enhanced configure script: now you can pass an (optional) search path
-    to all --with-XXX parameters, e. g. "--with-ident=/opt/ident".
-  - Removed typedefs for the native C datatypes.
-    Use stdbool.h / inttypes.h if available.
-  - New configuration option "OperServerMode" to enable a workaround needed
-    when running an network with ircd2 servers and "OperCanUseMode" enabled
-    to prevent the ircd2 daemon to drop mode changes of IRC operators.
-    Patch by Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Implemented support for "secret channels" (channel mode "s").
-  - New configuration option "Mask" for [Operator] sections to limit OPER
-    commands to users with a specific IRC mask. Patch from Florian Westphal.
-  - Write "error file" (/tmp/ngircd-XXX.err) only if compiled with debug
-    code ("--enable-debug") and running as daemon process.
-  - Don't create version information string each time a client connects
-    but instead on server startup. By Florian Westphal.
-  - New configuration variable "PidFile", section "[Global]": if defined,
-    the server writes its process ID (PID) to this file. Default: off.
-    Idea of Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Code cleanups from Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Raised the maximum length of passwords to 20 characters.
-  - Fixed a memory leak when resizing the connection pool and realloc()
-    failed. Now we don't fall back to malloc(), which should be sane anyway.
-    Patch from Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Added support for the Howl (http://www.porchdogsoft.com/products/howl/)
-    Rendezvous API, in addition to the API of Apple (Mac OS X). The available
-    API will be autodetected when you call "./configure --with-rendezvous".
-  - Made ngIRCd compile on HP/UX 10.20 with native HP pre-ANSI C compiler and
-    most probably other older C compilers on other systems.
-  - When the daemon should switch to another user ID (ServerID is defined in
-    the configuration file) and is not running in a chroot environment, it
-    changes its working directory to the home directory of this user. This
-    should enable the system to write proper core files when not running with
-    root privileges ...
-
 ngIRCd 0.8.3 (2005-02-03)

  - Fixed a bug that could case a root exploit when the daemon is compiled
    to do IDENT lookups and is logging to syslog. Bug discovered by CoKi,
    <coki@nosystem.com.ar>, thanks a lot!
-    (CVE-2005-0226; http://www.nosystem.com.ar/advisories/advisory-11.txt)
+    (http://www.nosystem.com.ar/advisories/advisory-11.txt)

 ngIRCd 0.8.2 (2005-01-26)

  - Added doc/SSL.txt to distribution.
  - Fixed a buffer overflow that could cause the daemon to crash. Bug found
-    by Florian Westphal, <westphal@foo.fh-furtwangen.de>. (CVE-2005-0199)
+    by Florian Westphal, <westphal@foo.fh-furtwangen.de>.
  - Fixed a possible buffer underrun when reading the MOTD file. Thanks
    to Florian Westphal, <westphal@foo.fh-furtwangen.de>.
  - Fixed detection of IRC lines which are too long to send. Detected by
@@ -596,12 +31,12 @@ ngIRCd 0.8.2 (2005-01-26)
    It has only been used when the system didn't implement strlcpy by itself,
    not on "modern" systems. Florian Westphal, <westphal@foo.fh-furtwangen.de>.

-ngIRCd 0.8.1 (2004-12-25)
+nIRCd 0.8.1 (2004-12-25)

  - Autoconf: Updated config.guess and config.sub
  - Added some more debug code ...
  - Fixed wrong variable names in output of "ngircd --configtest".
-  - Debian: Fixed the name of the "default file" in the init script for
+  - Debian: Fxied the name of the "default file" in the init script for
    ngircd-full packages. And do the test if the binary is executable after
    reading this file.
  - Enhanced the "test suite": please have a look at src/testsuite/README!
@@ -610,11 +45,11 @@ ngIRCd 0.8.0 (2004-06-26)

  - Fixed wrong buffer size calculation for results of the resolver.

-  ngircd 0.8.0-pre2 (2004-05-16)
+  ngIRCd 0.8.0-pre2 (2004-05-16)
  - Enhanced logging to console when running in "no-detached mode": added
    PID and log messages of resolver sub-processes.
  - Fixed host name lookups when using IDENT user lookups.
-  - "make clean" and "make maintainer-clean" remove more files now.
+  - "make clean" and "make maintainer-clean" remove more files mow.

  ngIRCd 0.8.0-pre1 (2004-05-07)
  - Two new configuration options: "ChrootDir" and "MotdPhrase", thanks to
@@ -744,7 +179,7 @@ ngIRCd 0.7.0 (2003-05-01)
  - Better error reporting to clients on connect.
  - Enhanced manual pages ngircd(8) and ngircd.conf(5).
  - Documentation is now installed in $(datadir)/doc/ngircd.
-  - Enhanced handling of NJOIN in case of nick collisions.
+  - Enhanced hanling of NJOIN in case of nick collisions.

 ngIRCd 0.6.1, 2003-01-21

@@ -1123,3 +558,7 @@ ngIRCd 0.0.2, 06.01.2002
 ngIRCd 0.0.1, 31.12.2001

  - erste oeffentliche Version von ngIRCd als "public preview" :-)
+
+
+-- 
+$Id: ChangeLog,v 1.233.2.20 2005/02/03 10:16:25 alex Exp $
--- a/170
+++ b/170
@@ -1,71 +1,19 @@

                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/

-               (c)2001-2011 Alexander Barton and Contributors.
+                      (c)2001-2004 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
               ngIRCd is free software and published under the
                   terms of the GNU General Public License.

                                -- INSTALL --

+                         

 I. Upgrade Information
 ~~~~~~~~~~~~~~~~~~~~~~

-Differences to version 17
-
- Support for ZeroConf/Bonjour/Rendezvous service registration has been
-  removed. The configuration option "NoZeroconf" is no longer available.
-
- The structure of ngircd.conf has been cleaned up and three new configuration
-  sections have been introduced: [Limits], [Options], and [SSL].
-  Lots of configuration variables stored in the [Global] section are now
-  deprecated there and should be stored in one of these new sections (but
-  still work in [Global]):
-    "AllowRemoteOper"    -> [Options]
-    "ChrootDir"          -> [Options]
-    "ConnectIPv4"        -> [Options]
-    "ConnectIPv6"        -> [Options]
-    "ConnectRetry"       -> [Limits]
-    "MaxConnections"     -> [Limits]
-    "MaxConnectionsIP"   -> [Limits]
-    "MaxJoins"           -> [Limits]
-    "MaxNickLength"      -> [Limits]
-    "NoDNS"              -> [Options], and renamed to "DNS"
-    "NoIdent"            -> [Options], and renamed to "Ident"
-    "NoPAM"              -> [Options], and renamed to "PAM"
-    "OperCanUseMode"     -> [Options]
-    "OperServerMode"     -> [Options]
-    "PingTimeout"        -> [Limits]
-    "PongTimeout"        -> [Limits]
-    "PredefChannelsOnly" -> [Options]
-    "SSLCertFile"        -> [SSL], and renamed to "CertFile"
-    "SSLDHFile"          -> [SSL], and renamed to "DHFile"
-    "SSLKeyFile"         -> [SSL], and renamed to "KeyFile"
-    "SSLKeyFilePassword" -> [SSL], and renamed to "KeyFilePassword"
-    "SSLPorts"           -> [SSL], and renamed to "Ports"
-    "SyslogFacility"     -> [Options]
-    "WebircPassword"     -> [Options]
-  You should adjust your ngircd.conf and run "ngircd --configtest" to make
-  sure that your settings are correct and up to date!
-
-Differences to version 16
-
- Changes to the "MotdFile" specified in ngircd.conf now require a ngircd
-  configuration reload to take effect (HUP signal, REHASH command).
-
-Differences to version 0.9.x
-
- The option of the configure script to enable support for Zeroconf/Bonjour/
-  Rendezvous/WhateverItIsNamedToday has been renamed:
-    --with-rendezvous  ->  --with-zeroconf
-
-Differences to version 0.8.x
-
- The maximum length of passwords has been raised to 20 characters (instead
-  of 8 characters). If your passwords are longer than 8 characters then they
-  are cut at an other position now.
-
 Differences to version 0.6.x

 - Some options of the configure script have been renamed:
@@ -91,9 +39,9 @@ on modern UNIX-like systems that are supported by GNU autoconf and GNU
 automake ("configure") should be no problem.

 The normal installation procedure after getting (and expanding) the source
-files (using a distribution archive or GIT) is as following:
+files (using a distribution archive or CVS) is as following:

-  1) ./autogen.sh	[only necessary when using GIT]
+  1) ./autogen.sh	[only necessary when using CVS]
  2) ./configure
  3) make
  4) make install
@@ -105,8 +53,7 @@ location, /usr/local/sbin/.

 The next step is to configure and afterwards starting the daemon. Please
 have a look at the ngircd(8) and ngircd.conf(5) manual pages for details
-and all possible options -- and don't forget to run "ngircd --configtest"
-to validate your configuration file!
+and all possible options.

 If no previous version of the configuration file exists (the standard name
 is /usr/local/etc/ngircd.conf), a sample configuration file containing all
@@ -118,7 +65,7 @@ doc/ directory: sample-ngircd.conf.

 The first step, autogen.sh, is only necessary if the configure-script isn't
 already generated. This never happens in official ("stable") releases in
-tar.gz-archives, but when using GIT.
+tar.gz-archives, but when using CVS.

 This step is therefore only interesting for developers.

@@ -134,7 +81,7 @@ Again: "end users" do not need this step!

 The configure-script is used to detect local system dependencies.

-In the perfect case, configure should recognize all needed libraries, header
+In the perfect case, configure should recognise all needed libraries, header
 files and so on. If this shouldn't work, "./configure --help" shows all
 possible options.

@@ -161,84 +108,14 @@ the local system. Normally, root privileges are necessary to complete this
 step. If there is already an older configuration file present, it won't be
 overwritten.

-These files and folders will be installed by default:
+This files will be installed by default:

 - /usr/local/sbin/ngircd: executable server
 - /usr/local/etc/ngircd.conf: sample configuration (if not already present)
 - /usr/local/share/doc/ngircd/: documentation
- /usr/local/share/man/: manual pages


-III. Additional features
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-The following optional features can be compiled into the daemon by passing
-options to the "configure" script. Most options can handle a <path> argument
-which will be used to search for the required libraries and header files in
-the given paths ("<path>/lib/...", "<path>/include/...") in addition to the
-standard locations.
-
-* Syslog Logging (autodetected by default): 
-  --with-syslog[=<path>] / --without-syslog
-
-  Enable (disable) support for logging to "syslog", which should be
-  available on most modern UNIX-like operating systems by default.
-
-* ZLib Compression (autodetected by default):
-  --with-zlib[=<path>] / --without-zlib
-
-  Enable (disable) support for compressed server-server links.
-  The Z compression library ("libz") is required for this option.
-  
-* IO Backend (autodetected by default):
-  --with-select[=<path>] / --without-select
-  --with-poll[=<path>] / --without-poll
-  --with-devpoll[=<path>] / --without-devpoll
-  --with-epoll[=<path>] / --without-epoll
-  --with-kqueue[=<path>] / --without-kqueue  
-
-  ngIRCd can use different IO "backends": the "old school" select() and poll()
-  API which should be supported by most UNIX-like operating systems, or the
-  more efficient and flexible epoll() (Linux >=2.6), kqueue() (BSD) and
-  /dev/poll APIs.
-  By default the IO backend is autodetected, but you can use "--without-xxx"
-  to disable a more enhanced API.
-  When using the epoll() API, support for select() is compiled in as well by
-  default to enable the binary to run on older Linux kernels (<2.6), too.
-
-* IDENT-Support:
-  --with-ident[=<path>]
-
-  Include support for IDENT ("AUTH") lookups. The "ident" library is
-  required for this option.
-
-* TCP-Wrappers:
-  --with-tcp-wrappers[=<path>] 
-
-  Include support for Wietse Venemas "TCP Wrappers" to limit client access
-  to the daemon, for example by using "/etc/hosts.{allow|deny}".
-  The "libwrap" is required for this option.
-
-* PAM:
-  --with-pam[=<path>]
-
-  Enable support for PAM, the Pluggable Authentication Modules library.
-  See doc/PAM.txt for details.
-
-* SSL:
-  --with-openssl[=<path>]
-  --with-gnutls[=<path>]
-
-  Enable support for SSL/TLS using OpenSSL or gnutls libraries.
-  See doc/SSL.txt for details.
-
-* IPv6:
-  --enable-ipv6
-
-  Adds support for version 6 of the Internet Protocol.
-
-
-IV. Useful make-targets
+II. Useful make-targets
 ~~~~~~~~~~~~~~~~~~~~~~~

 The Makefile produced by the configure-script contains always these useful
@@ -254,29 +131,28 @@ targets:
   next step: -> ./autogen.sh


-V. Sample configuration file ngircd.conf
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+III. Sample configuration file ngircd.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 In the sample configuration file, there are comments beginning with "#" OR
 ";" -- this is only for the better understanding of the file.

-The file is separated in five blocks: [Global], [Features], [Operator],
-[Server], and [Channel].
+The file is separated in four blocks: [Global], [Operator], [Server], and
+[Channel].

 In the [Global] section, there is the main configuration like the server
-name and the ports, on which the server should be listening. Options in
-the [Features] section enable or disable functionality in the daemon.
-IRC operators of this server are defined in [Operator] blocks, remote
-servers are configured in [Server] sections, and [Channel] blocks are
-used to configure pre-defined ("persistent") IRC channels.
+name and the ports, on which the server should be listening. IRC operators
+of this server are defined in [Operator] blocks. [Server] is the section
+where server links are configured. And [Channel] blocks are used to
+configure pre-defined ("persistent") IRC channels.

 The meaning of the variables in the configuration file is explained in the 
 "doc/sample-ngircd.conf", which is used as sample configuration file in
 /usr/local/etc after running "make install" (if you don't already have one)
-and in the ngircd.conf(5) manual page.
+and in the "ngircd.conf" manual page.


-VI. Command line options
+IV. Command line options
 ~~~~~~~~~~~~~~~~~~~~~~~~

 These parameters could be passed to the ngIRCd:
@@ -299,4 +175,6 @@ Use "--help" to see a short help text describing all available parameters
 the server understands, with "--version" the ngIRCd shows its version
 number. In both cases the server exits after the output.

-Please see the ngircd(8) manual page for complete details!
+
+-- 
+$Id: INSTALL,v 1.18.2.2 2004/09/03 20:02:02 alex Exp $
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2003 by Alexander Barton (alex@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,6 +8,8 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
+# $Id: Makefile.am,v 1.14.2.1 2004/05/11 00:38:17 alex Exp $
+#

 AUTOMAKE_OPTIONS = gnu

@@ -15,7 +17,6 @@ SUBDIRS = doc src man contrib

 clean-local:
 	rm -f build-stamp*
-	rm -rf ngircd.dest

 maintainer-clean-local:
 	rm -rf autom4te.cache
@@ -23,65 +24,14 @@ maintainer-clean-local:
 	rm -f mkinstalldirs missing depcomp install-sh
 	rm -f config.log debian

-testsuite:
-	make -C src/testsuite check
-
 lint:
 	make -C src/ngircd lint

-srcdoc:
-	make -C doc srcdoc
-
-have-xcodebuild:
-	@xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
-	 >/dev/null 2>&1 \
-	 || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 )
-
-have-packagemaker:
-	@packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \
-	 || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2)
-
-xcode: have-xcodebuild
-	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
-
-xcode-clean: have-xcodebuild
-	xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \
-	 -configuration Default clean
-	rm -fr contrib/MacOSX/build
-
 rpm: distcheck
 	rpm -ta ngircd-*.tar.gz

 deb:
 	[ -f debian/rules ] || ln -s contrib/Debian debian
-	dpkg-buildpackage -rfakeroot -i
-
-osxpkg: have-packagemaker osxpkg-dest
-	cd contrib/MacOSX && packagemaker \
-	 --doc ngIRCd.pmdoc \
-	 --out ../../$(distdir).mpkg
-	rm -f $(distdir).mpkg.zip
-	zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
-	rm -rf ngircd.dest $(distdir).mpkg
-
-osxpkg-dest: have-xcodebuild clean
-	./configure --prefix=/opt/ngircd
-	make xcode
-	make -C contrib/MacOSX de.barton.ngircd.plist
-	mkdir -p ngircd.dest/opt/ngircd/sbin
-	DESTDIR="$$PWD/ngircd.dest" make -C doc install
-	DESTDIR="$$PWD/ngircd.dest" make -C contrib install
-	DESTDIR="$$PWD/ngircd.dest" make -C man install
-	cp contrib/MacOSX/build/Default/ngIRCd \
-	 ngircd.dest/opt/ngircd/sbin/ngircd
-	rm ngircd.dest/opt/ngircd/etc/ngircd.conf
-	echo "Have a nice day IRCing!" >ngircd.dest/opt/ngircd/etc/ngircd.motd
-	chmod -R a-s,og-w,a+rX ngircd.dest
-
-.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-dest rpm \
-	srcdoc testsuite xcode xcode-clean
+	dpkg-buildpackage -rfakeroot

 # -eof-
--- a/285
+++ b/285
@@ -1,289 +1,14 @@

                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/

-               (c)2001-2011 Alexander Barton and Contributors.
+                      (c)2001-2004 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
               ngIRCd is free software and published under the
                   terms of the GNU General Public License.

                                  -- NEWS --

-ngIRCd Release 18
-
-  ngIRCd 18~rc2 (2011-06-29)
-  - GnuTLS: use 1024 bits as minimum size of the DH prime. This enables
-    ngIRCd to accept incoming connections from other servers and clients
-    that "only" use at least 1024 bits again, like ngIRCd 17 did (and no
-    longer requires 2048 bits for incoming connections).
-
-  ngIRCd 18~rc1 (2011-06-27)
-  - New configuration option "MorePrivacy" to "censor" some user information.
-    When enabled, signon time and idle time is left out. Part and quit
-    messages are made to look the same. WHOWAS requests are silently dropped.
-    All of this is useful if one wish to conceal users that access the ngircd
-    servers from TOR or I2P.
-  - New configuration option "ScrubCTCP" to scrub incoming CTCP commands. If
-    activated, the server silently drops incoming CTCP requests from both
-    other servers and from users. The server that scrubs CTCP will not forward
-    the CTCP requests to other servers in the network either, which can spell
-    trouble if not every oper knows about the CTCP-scrubbing. Scrubbing CTCP
-    commands also means that it is not possible to send files between users.
-    There is one exception to the CTCP scrubbing performed: ACTION ("/me
-    commands") requests are not scrubbed.
-  - Restructure ngIRCd configuration file: introduce new [Limits], [Options],
-    and [SSL] sections. The intention of this restructuring is to make the
-    [Global] section much cleaner, so that it only contains variables that
-    most installations must adjust to the local requirements. All the optional
-    variables are moved to [Limits], for configurable limits and timers of
-    ngIRCd, and [Options], for optional features. All SSL-related variables
-    are moved to [SSL] and the "SSL"-prefix is stripped. The old variables in
-    the [Global] section are deprecated now, but are still recognized.
-    => Don't forget to check your configuration, use "ngircd --configtest"!
-  - New documentation "how to contribute": doc/Contributing.txt.
-  - Avoid needlessly scary 'buffer overflow' messages: When the write buffer
-    space grows too large, ngIRCd has to disconnect the client to avoid
-    wasting too much memory, which is logged with a scary 'write buffer
-    overflow' message. Change this to a more descriptive wording.
-  - New configuration option "RequireAuthPing": PING-PONG on login. When
-    enabled, this configuration option lets ngIRCd send a PING with an numeric
-    "token" to clients logging in; and it will not become registered in the
-    network until the client responds with the correct PONG.
-  - New configuration option "NoticeAuth": send NOTICE AUTH on connect. When
-    active, ngircd will send "NOTICE AUTH" messages on client connect time
-    like e.g. snircd (QuakeNet) does.
-  - Add support for up to 3 targets in WHOIS queries, also allow up to one
-    wildcard query from local hosts. Follows ircd 2.10 implementation rather
-    than RFC 2812. At most 10 entries are returned per wildcard expansion.
-  - ngircd.conf(5) manual page: describe types of configuration variables
-    (booleans, text strings, integer numbers) and add type information to each
-    variable description.
-  - Terminate incoming connections on HTTP commands "GET" and "POST".
-  - New configuration option "CloakHost": when set, this hostname is used for
-    every client instead of the real DNS hostname (or IP address).
-  - New configuration option "CloakUserToNick": when enabled, ngIRCd sets
-    every clients' user name to their nick name and hides the user name
-    supplied by the IRC client.
-  - Make write buffers bigger, but flush early. Before this change, a client
-    got disconnected if the buffer flushing at 4k failed, now regular clients
-    can store up to 32k and servers up 64k even if flushing is not possible at
-    the moment. This enhances reliability on slow links.
-  - Allow "Port = 0" in [Server] blocks. Port number 0 marks remote servers
-    that try to connect to this daemon, but where this daemon never tries to
-    establish a connection on its own: only incoming connections are allowed.
-  - Enable WHOIS command to return information about services.
-  - Implement channel mode 'O': "IRC operators only". This channel mode is
-    used on DALnet (bahamut), for example.
-  - Remove support for ZeroConf/Bonjour/Rendezvous service registration
-    including the "[No]ZeroConf" configuration option.
-  - Deprecate NoXX-Options in ngircd.conf and move new variants into our new
-    [Options] section: 'NoDNS=no' => 'DNS=yes', 'NoIdent=no' => 'Ident=yes',
-    'NoPAM=no' => 'PAM=yes', and 'NoZeroConf=no' => 'ZeroConf=yes' (and
-    vice-versa). The defaults are adjusted accordingly and the old variables
-    in [Global] are still accepted, so there is no functional change.
-
-ngIRCd Release 17.1 (2010-12-19)
-
-  - Don't log critical (or worse) messages to stderr
-  - Remove "error file" when compiled with debug code enabled
-  - New numeric 329: get channel creation time on "MODE #chan" commands
-
-ngIRCd Release 17 (2010-11-07)
-
-  - doc: change path names in sample-ngircd.conf depending on sysconfdir
-
-  ngIRCd 17~rc2 (2010-10-25)
-  - Generate ngIRCd version number from GIT tag.
-  - Make sourcecode compatible with ansi2knr again. This allows to compile
-    ngIRCd using a pre-ANSI K&R C compiler again.
-
-  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).
-  - 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",
-    "user" and "local1" through "local7" are possible values; see syslog(3).
-    Default is "local5" for historical reasons.
-  - Dump the "internal server state" (configured servers, established
-    connections and known clients) to the console or syslog when receiving
-    the SIGUSR2 signal and debug mode is enabled.
-  - Enable the daemon to disable and enable "debug mode" on runtime using
-    signal SIGUSR1, when debug code is compiled in, not only on startup
-    using the command line parameters.
-  - Implement user mode "x": hostname cloaking (closes: #102).
-  - Change MOTD file handling: ngIRCd now caches the contens of the MOTD
-    file, so the daemon now requires a HUP signal or REHASH command to
-    re-read the MOTD file when its content changed.
-  - Allow IRC ops to change channel modes even without OperServerMode set.
-  - Allow IRC operators to use MODE command on any channel (closes: #100).
-  - 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.
-
-ngIRCd Release 16 (2010-05-02)
-
-  ngIRCd 16~rc2 (2010-04-25)
-  - Enhace connection statistics counters: display total number of served
-    connections on daemon shutdown and when a new client connects using
-    the new numeric RPL_STATSCONN (250).
-
-  ngIRCd 16~rc1 (2010-03-25)
-  - Implement WEBIRC command used by some Web-IRC frontends. The password
-    required to secure this command must be configured using the new
-    "WebircPassword" variable in the ngircd.conf file.
-  - Remove limit on max number of configured irc operators.
-  - A new channel mode "secure connections only" (+z) has been implemented:
-    Only clients using a SSL encrypted connection to the server are allowed
-    to join such a channel.
-    But please note three things: a) already joined clients are not checked
-    when setting this mode, b) IRC operators are always allowed to join
-    every channel, and c) remote clients using a server not supporting this
-    mode are not checked either and therefore always allowed to join.
-
-ngIRCd Release 15 (2009-11-07)
-
-  ngIRCd 15~rc1 (2009-10-15)
-  - Do not add default listening port (6667) if SSL ports were specified, so
-    ngIRCd can be configured to only accept SSL-encrypted connections now.
-  - Enable IRC operators to use the IRC command SQUIT (insted of the already
-    implemented but non-standard DISCONNECT command).
-  - New configuration option "AllowRemoteOper" (disabled by default) that
-    enables remote IRC operators to use the IRC commands SQUIT and CONNECT
-    on the local server.
-  - Enforce upper limit on maximum number of handled commands. This implements
-    a throttling scheme: an IRC client can send up to 3 commands or 256 bytes
-    per second before a one second pause is enforced.
-
-ngIRCd Release 14.1 (2009-05-05)
-
-  - Security: fix remotely triggerable crash in SSL/TLS code.
-  - Debian: build ngircd-full-dbg package.
-  - Allow ping timeout quit messages to show the timeout value.
-
-ngIRCd Release 14 (2009-04-20)
-
-  ngIRCd 14~rc1 (2009-03-29)
-  - Allow creation of persistent modeless channels.
-  - The INFO command reports the compile time now (if available).
-  - Support individual channel keys for pre-defined channels: introduce
-    new configuration variable "KeyFile" in [Channel] sections in ngircd.conf,
-    here a file can be configured for each pre-defined channel which contains
-    individual channel keys for different users.
-  - Remove limit on maximum number of predefined channels in ngircd.conf.
-
-ngIRCd Release 13 (2008-12-25)
-
-  ngIRCd 13~rc1 (2008-11-21):
-  - New version number scheme :-)
-  - Initial support for IRC services, using a RFC1459 style interface,
-    tested with IRCServices (http://www.ircservices.za.net/) version 5.1.13.
-    For this to work, ngIRCd now supports server-server links conforming
-    to RFC 1459. New ngircd.conf(5) option: ServiceMask.
-  - Support for SSL-encrypted server-server and client-server links using
-    OpenSSL (configure: --with-openssl) or GNUTLS (configure: --with-gnutls).
-    New ngircd.conf(5) options: SSLPorts, SSLKeyFile, SSLKeyFilePassword,
-    SSLCertFile, SSLDHFile, and SSLConnect.
-  - Server local channels have been implemented, prefix "&", that are only
-    visible to users of the same server and are not visible in the network.
-    In addition ngIRCd creates a "special" channel &SERVER on startup and logs
-    all the messages to it that a user with mode +s receives.
-  - New make target "osxpkg" to build a Mac OS X installer package.
-  - New configuration option "NoIdent" to disable IDENT lookups even if the
-    daemon is compiled with IDENT support.
-
-ngIRCd 0.12.1 (2008-07-09)
-
-  - Add option aliases -V (for --version) and -h (for --help).
-  - Make Listen parameter a comma-separated list of addresses. This also
-    obsoletes ListenIPv4 and ListenIPv6 options. If Listen is unset, it
-    is treated as Listen="::,0.0.0.0".
-    Note: ListenIPv4 and ListenIPv6 options are still recognized,
-    but ngircd will print a warning if they are used in the config file.
-
-ngIRCd 0.12.0 (2008-05-13)
-
-  ngIRCd 0.12.0-pre2 (2008-04-29)
-  - IPv6: Add config options to disable ipv4/ipv6 support.
-
-  ngIRCd 0.12.0-pre1 (2008-04-20)
-  - Add IPv6 support.
-  - Install a LaunchDaemon script to start/stop ngIRCd on Mac OS X.
-  - Implemented IRC commands INFO, SUMMON (dummy), and USERS (dummy) and
-    enhanced test suite to check these commands. (Dana Dahlstrom)
-  - IRC_WHO now supports search patterns and will test this against user
-    nickname/servername/hostname, etc. as required by RFC 2812, Section 3.6.1.
-    (reported by Dana Dahlstrom)
-  - Implement RFC 2812 handling of "0" argument to 'JOIN': must be treated
-    as if the user had sent PART commands for all channels the user is a
-    member of. (Dana Dahlstrom)
-  - Allow NOTICEs to be sent to a channel. (Fabian Schlager)
-
-ngIRCd 0.11.0 (2008-01-15)
-
-  - Add support for /STAT u (server uptime) command.
-  - New [Server] configuration Option "Bind" allows to specify
-    the source IP address to use when connecting to remote server.
-  - New configuration option "MaxNickLength" to specify the allowed maximum
-    length of user nick names. Note: must be unique in an IRC network!
-  - Numeric 317: implemented "signon time" (displayed in WHOIS result).
-  - Added new server configuration option "Passive" for "Server" blocks to
-    disable automatic outgoing connections (similar to -p option to ngircd,
-    but only for the specified server). (Tassilo Schweyer)
-  - Added support for the WALLOPS command. Usage is restricted to IRC
-    operators.
-
-ngIRCd 0.10.2 (2007-06-08)
-
-  - Predefined channel configuration now allows specification of channel key
-    (mode k) and maximum user count (mode l): variables "Key" and "MaxUsers".
-  - When using the epoll() IO interface, compile in the select() interface as
-    well and fall back to it when epoll() isn't available on runtime.
-  - Added support for IO APIs "poll()" and "/dev/poll".
-
-ngIRCd 0.10.1 (2006-12-17)
-
-  - Allow PASS syntax defined in RFC 1459 for server links, too.
-  - New configuration option "PredefChannelsOnly": if set, clients can only
-    join predefined channels.
-
-ngIRCd 0.10.0 (2006-10-01)
-
-  ngIRCd 0.10.0-pre1 (2006-08-02)
-  - Enhanced DIE to accept a single parameter ("comment text") which is sent
-    to all locally connected clients before the server goes down.
-  - JOIN now supports more than one channel key at a time.
-  - Implemented numeric "333": Time and user name who set a channel topic.
-  - Channel topics are no longer limited to 127 characters: now the only limit
-    is the maximum length of an IRC command, i. e. 512 bytes (in practice, this
-    limits the topic to about 490 characters due to protocol overhead).
-  - Reverse DNS lookup code now checks the result by doing an additional
-    lookup to prevent spoofing.
-  - Added new IO layer which (optionally) supports epoll() and kqueue() in
-    addition to the select() interface.
-
-ngIRCd 0.9.0 (2005-07-24)
-
-  - Never run with root privileges but always switch the user ID.
-  - Make "netsplit" messages RFC compliant.
-  - Implemented the IRC function "WHOWAS".
-  - New configuration option "OperServerMode" to enable a workaround needed
-    when running an network with ircd2 servers and "OperCanUseMode" enabled
-    to prevent the ircd2 daemon to drop mode changes of IRC operators.
-    Patch by Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Implemented support for "secret channels" (channel mode "s").
-  - New configuration option "Mask" for [Operator] sections to limit OPER
-    commands to users with a specific IRC mask. Patch from Florian Westphal.
-  - New configuration variable "PidFile", section "[Global]": if defined,
-    the server writes its process ID (PID) to this file. Default: off.
-    Idea of Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - Added support for the Howl (http://www.porchdogsoft.com/products/howl/)
-    Rendezvous API, in addition to the API of Apple (Mac OS X). The available
-    API will be autodetected when you call "./configure --with-rendezvous".

 ngIRCd 0.8.0 (2004-06-26)

@@ -327,7 +52,7 @@ ngIRCd 0.7.0 (2003-05-01)
  - Added support for TCP Wrappers library: pass "--with-tcp-wrappers" to
    configure to enable it.
  - Changed some configure options to use "--with"/"--without" as prefix
-    instead of "--enable"/"--disable": "--without-syslog", "--without-zlib",
+    insetead of "--enable"/"--disable": "--without-syslog", "--without-zlib",
    "--with-tcp-wrappers", and "--with-rendezvous".
  - Enhanced manual pages ngircd(8) and ngircd.conf(5).
  - Documentation is now installed in $(datadir)/doc/ngircd.
@@ -464,4 +189,4 @@ ngIRCd 0.0.1, 31.12.2001


 -- 
-$Id: NEWS,v 1.88 2008/02/26 22:05:42 fw Exp $
+$Id: NEWS,v 1.64.2.3 2004/06/26 09:12:38 alex Exp $
--- a/57
+++ b/57
@@ -1,43 +1,39 @@

                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/

-               (c)2001-2011 Alexander Barton and Contributors.
+                      (c)2001-2004 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
               ngIRCd is free software and published under the
                   terms of the GNU General Public License.

                                -- README --
+                           
+                      Ilja Osthoff, <ilja@glide.ath.cx>


 I. Introduction
 ~~~~~~~~~~~~~~~

-ngIRCd is an Open Source server for the Internet Relay Chat (IRC), which
+ngIRCd is an Open-Source server for the Internet Relay Chat (IRC), which
 is developed and published under the terms of the GNU General Public
 Licence (URL: http://www.gnu.org/licenses/gpl.html). ngIRCd means "next
 generation IRC daemon", it's written from scratch and not deduced from the
 "grandfather of IRC daemons", the daemon of the IRCNet.

-Please see the INSTALL document for installation and upgrade information!
-

 II. Status
 ~~~~~~~~~~~

-It is not the goal of ngIRCd to implement all the nasty behaviours of the
-original ircd, but to implement most of the useful commands and semantics
-specified by the RFCs.
+At present, the ngIRCd is under active development, some features are not
+implemented, some only partly.

-In the meantime ngIRCd should be quite feature complete and stable to be
-used in real IRC networks.
+Till today (more or less complete) implemented IRC-commands:

-Implemented IRC-commands are:
-
-ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INFO, INVITE,
-ISON, JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN,
+ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INVITE, ISON,
+JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN,
 NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER,
-SERVICE, SERVLIST, SQUERY, SQUIT,  STATS, SUMMON, TIME, TOPIC, TRACE, USER,
-USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, WHOIS, WHOWAS.
+SQUIT, STATS, TIME, TOPIC, TRACE, USER, USERHOST, VERSION, WHO, WHOIS.


 III. Features (or: why use ngIRCd?)
@@ -47,28 +43,30 @@ III. Features (or: why use ngIRCd?)
 - simple, easy understandable configuration file,
 - freely published open-source C source code,
 - ngIRCd will be developed on in the future.
- wide field of supported platforms, including AIX, A/UX, FreeBSD, HP-UX,
-  IRIX, Linux, Mac OS X, NetBSD, OpenBSD, Solaris, and Windows with Cygwin.
+- supported platforms (tested versions): AIX (3.2.5), A/UX (3.0.1), FreeBSD
+  (4.5), HP-UX (10.20), IRIX (6.5), Linux (2.x), Mac OS X (10.x), NetBSD
+  (1.5.2/i386, 1.5.3/m68k), Solaris (2.5.1, 2.6), Windows with Cygwin, and
+  OpenBSD (3.4/i386).


 IV. Documentation
 ~~~~~~~~~~~~~~~~~

 More documentation can be found in the "doc/" directory and the homepage of
-the ngIRCd: <http://ngircd.barton.de/>.
+the ngIRCd: <http://arthur.ath.cx/~alex/ngircd/>.


 V. Download
 ~~~~~~~~~~~

-The homepage of the ngIRCd is: <http://ngircd.barton.de/>; you will find
-the newest information about the ngIRCd and the most recent ("stable")
-releases there.
+The homepage of the ngIRCd is: <http://arthur.ath.cx/~alex/ngircd>; you
+will find the newest information about the ngIRCd and the most recent
+("stable") releases there.

 If you are interested in the latest development versions (which are not
-always stable), then please read the section about "GIT" on the homepage and
-the file "doc/GIT.txt" which describes the use of GIT, the version control
-system used by ngIRCd (homepage: http://git.or.cz/).
+always stable), then please read the section "CVS" on the homepage and
+the file "doc/CVS.txt" which describes the use of CVS, the "Concurrent
+Versioning System".


 VI. Bugs
@@ -77,10 +75,13 @@ VI. Bugs
 If you find bugs in the ngIRCd (which might be there :-), please report
 them at the following URL:

-<http://ngircd.barton.de/bugtracker.php>
+<http://arthur.ath.cx/~alex/ngircd/#bugs>

 There you can read about known bugs and limitations, too.

 If you have critics, patches or something else, please feel free to post a
-mail to the ngIRCd mailing list: <ngircd-ml@arthur.ath.cx> (please see
-<http://ngircd.barton.de/support.php#ml> for details).
+mail to: <alex@barton.de> or <alex@arthur.ath.cx>
+
+
+-- 
+$Id: README,v 1.18.2.1 2004/05/07 11:24:17 alex Exp $
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2004 Alexander Barton <alex@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
@@ -9,8 +9,11 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# Usage:
-#   [VAR=<value>] ./autogen.sh [<configure-args>]
+# $Id: autogen.sh,v 1.12 2004/04/05 12:02:21 alex Exp $
+#
+
+#
+# Usage: [VAR=<value>] ./autogen.sh [<configure-args>]
 #
 # This script generates the ./configure script using GNU automake and
 # GNU autoconf. It tries to be smart in finding the correct/usable/available
@@ -82,7 +85,7 @@ Search()
 			fi
 			$EXIST "${name}-${major}.${minor}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
-				echo "${name}-${major}.${minor}"
+				echo "${name}-${major}.${minor}" >/dev/null 2>&1
 				return 0
 			fi
 		done
@@ -121,8 +124,13 @@ if [ -z "$EXIST" ]; then
 fi
 [ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."

+# We want to use GNU automake 1.7, if available (WANT_AUTOMAKE is used by
+# the wrapper scripts of Gentoo Linux):
+WANT_AUTOMAKE=1.7
+export WANT_AUTOMAKE
+
 # Try to detect the needed tools when no environment variable already
-# specifies one:
+# spezifies one:
 echo "Searching tools ..."
 [ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
 [ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
@@ -138,35 +146,32 @@ echo "Searching tools ..."
 [ -z "$GO" -a $# -gt 0 ] && GO=1

 # Verify that all tools have been found
-[ -z "$ACLOCAL" ] && Notfound aclocal
+[ -z "$AUTOCONF" ] && Notfound autoconf
 [ -z "$AUTOHEADER" ] && Notfound autoheader
 [ -z "$AUTOMAKE" ] && Notfound automake
 [ -z "$AUTOCONF" ] && Notfound autoconf

-export ACLOCAL AUTOHEADER AUTOMAKE AUTOCONF
+export AUTOCONF AUTOHEADER AUTOMAKE AUTOCONF

 # Generate files
 echo "Generating files ..."
 $ACLOCAL && \
 	$AUTOHEADER && \
 	$AUTOMAKE --add-missing && \
-	$AUTOCONF --force
+	$AUTOCONF

 if [ $? -eq 0 -a -x ./configure ]; then
 	# Success: if we got some parameters we call ./configure and pass
 	# all of them to it.
-	NAME=`grep PACKAGE_STRING= configure | cut -d"'" -f2`
 	if [ "$GO" = "1" ]; then
 		[ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
 		[ -n "$*" ] && a=" $*" || a=""
 		c="./configure${p}${a}"
-		echo "Okay, autogen.sh for $NAME done."
 		echo "Calling \"$c\" ..."
 		$c
 		exit $?
 	else
-		echo "Okay, autogen.sh for $NAME done."
-		echo "Now run the \"./configure\" script."
+		echo "Okay, autogen.sh done; now run the \"configure\" script."
 		exit 0
 	fi
 else
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

-timestamp='2008-01-16'
+timestamp='2004-11-30'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -22,15 +21,14 @@ timestamp='2008-01-16'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -72,8 +70,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -85,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
    --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
@@ -101,7 +99,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
       echo $1
-       exit ;;
+       exit 0;;

    * )
       break ;;
@@ -120,9 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -173,10 +170,6 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -193,10 +186,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,16 +230,14 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -259,7 +246,6 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -268,24 +254,20 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| mt \
 	| msp430 \
-	| nios | nios2 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -296,9 +278,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -318,20 +297,20 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
+	| avr-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -340,7 +319,6 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -349,34 +327,27 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| mt-* \
 	| msp430-* \
-	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -447,14 +418,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -487,8 +450,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
-		basic_machine=cr16-unknown
+	cr16c)
+		basic_machine=cr16c-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -680,14 +643,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -703,10 +658,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -732,9 +683,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -810,8 +758,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
+		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -833,14 +782,6 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -850,12 +791,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -912,10 +847,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -942,10 +873,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -957,9 +884,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1049,10 +973,6 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1166,10 +1086,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1242,23 +1165,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1276,7 +1196,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1410,12 +1330,6 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1425,9 +1339,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1453,9 +1367,6 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1474,9 +1385,6 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1648,7 +1556,7 @@ case $basic_machine in
 esac

 echo $basic_machine$os
-exit
+exit 0

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2005 Alexander Barton <alex@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,20 +8,18 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-
-define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n))
+# $Id: configure.in,v 1.102.2.7 2005/02/03 10:16:25 alex Exp $
+#

 # -- Initialisation --

 AC_PREREQ(2.50)
-AC_INIT(ngircd, VERSION_ID)
+AC_INIT(ngircd, 0.8.3)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(src/config.h)

-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
 # -- Templates for config.h --

 AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
@@ -32,10 +30,8 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
 AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
-AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled])
+AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
 AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
-AH_TEMPLATE([PAM], [Define if PAM should be used])
-AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists])

 AH_TEMPLATE([TARGET_OS], [Target operating system name])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -44,8 +40,6 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 # -- C Compiler --

 AC_PROG_CC
-AC_PROG_CC_STDC
-AC_C_PROTOTYPES

 # -- Helper programs --

@@ -59,30 +53,12 @@ AC_PROG_RANLIB

 AM_C_PROTOTYPES
 AC_C_CONST
-AC_C_INLINE

 # -- Hard coded system and compiler dependencies/features/options ... --

-AC_DEFUN([GCC_STACK_PROTECT_CC],[
-  ssp_cc=yes
-  # we use -fstack-protector-all for the test to enfoce the use of the guard variable 
-  AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
-  ssp_old_cflags="$CFLAGS"
-  CFLAGS="$CFLAGS -fstack-protector-all"
-  AC_TRY_LINK(,,, ssp_cc=no)
-  echo $ssp_cc
-  CFLAGS="$ssp_old_cflags"
-  if test "X$ssp_cc" = "Xyes"; then
-      CFLAGS="$CFLAGS -fstack-protector"
-      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
-  fi
-])
-
 if test "$GCC" = "yes"; then
 	# We are using the GNU C compiler. Good!
 	CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
-
-	GCC_STACK_PROTECT_CC
 fi

 case "$target_os" in
@@ -105,31 +81,18 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT

 AC_CHECK_HEADERS([ \
-	ctype.h errno.h fcntl.h netdb.h netinet/in.h netinet/in_systm.h \
-	stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h \
+	ctype.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h \
+	strings.h sys/socket.h sys/time.h unistd.h \
 	],,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 \
-	],[],[],[[
-	#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
-	]]
-)
+AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])

 # -- Datatypes --

 AC_MSG_CHECKING(whether socklen_t exists)
 AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
+	#include <sys/socket.h>
+	#include <sys/types.h>
 	],[
 	socklen_t a, b;
 	a = 2; b = 4; a += b;
@@ -142,16 +105,11 @@ AC_TRY_COMPILE([
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T

-AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
- [#include <arpa/inet.h>])
-
 # -- 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 --

@@ -159,25 +117,22 @@ AC_FUNC_FORK
 AC_FUNC_STRFTIME

 AC_CHECK_FUNCS([ \
-	bind gethostbyaddr gethostbyname gethostname inet_ntoa \
-	setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!]))
+	bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
+	memset realloc setsid setsockopt socket strcasecmp strchr strerror \
+	strstr waitpid],,AC_MSG_ERROR([required function missing!]))

-AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf \
- vsnprintf strdup strlcpy strlcat strtok_r)
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat)
+
+AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
+	AC_MSG_ERROR([required function select() is missing!])
+)

 # -- Configuration options --

-# use syslog?
-
 x_syslog_on=no
 AC_ARG_WITH(syslog,
 	[  --without-syslog        disable syslog (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
+	[	if test "$withval" = "yes"; then
 			AC_CHECK_LIB(be, syslog)
 			AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
 				AC_MSG_ERROR([Can't enable syslog!])
@@ -191,20 +146,13 @@ AC_ARG_WITH(syslog,
 )
 if test "$x_syslog_on" = "yes"; then
 	AC_DEFINE(SYSLOG, 1)
-	AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
+	AC_CHECK_HEADERS(syslog.h)
 fi

-# use zlib compression?
-
 x_zlib_on=no
 AC_ARG_WITH(zlib,
 	[  --without-zlib          disable zlib compression (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
+	[	if test "$withval" = "yes"; then
 			AC_CHECK_LIB(z, deflate)
 			AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
 				AC_MSG_ERROR([Can't enable zlib!])
@@ -217,187 +165,20 @@ AC_ARG_WITH(zlib,
 )
 if test "$x_zlib_on" = "yes"; then
 	AC_DEFINE(ZLIB, 1)
-	AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
+	AC_CHECK_HEADERS(zlib.h)
 fi

-# detect which IO API to use:
-
-x_io_backend=none
-
-AC_ARG_WITH(select,
-	[  --without-select        disable select IO support (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_FUNCS(select, x_io_select=yes,
-				AC_MSG_ERROR([Can't enable select IO support!])
-			)
-		fi
-	],
-	[
-		AC_CHECK_FUNCS(select, x_io_select=yes)
-	]
-)
-
-AC_ARG_WITH(poll,
-	[  --without-poll          disable poll support (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
-				AC_MSG_ERROR([Can't enable poll IO support!])
-			)
-		fi
-	],
-	[
-		AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
-	]
-)
-
-AC_ARG_WITH(devpoll,
-	[  --without-devpoll       disable /dev/poll IO support (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-
-				AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
-		fi
-	],
-	[
-		AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll)
-	]
-)
-
-AC_ARG_WITH(epoll,
-	[  --without-epoll         disable epoll IO support (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes,
-				AC_MSG_ERROR([Can't enable epoll IO support!])
-			)
-		fi
-	],
-	[
-		AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
-	]
-)
-
-AC_ARG_WITH(kqueue,
-	[  --without-kqueue        disable kqueue IO support (autodetected by default)],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
-				AC_MSG_ERROR([Can't enable kqueue IO support!])
-			)
-		fi
-	],
-	[
-		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
-	]
-)
-
-if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then
-	# when epoll() and select() are available, we'll use both!
-	x_io_backend="epoll(), select()"
-else
-	if test "$x_io_epoll" = "yes"; then
-		# we prefere epoll() if it is available
-		x_io_backend="epoll()"
-	else
-		if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then
-			# we'll use select, when available and no "better"
-			# interface has been detected ...
-			x_io_backend="select()"
-		fi
-	fi
-fi
-
-if test "$x_io_backend" = "none"; then
-	AC_MSG_ERROR([No useabe IO API activated/found!?])
-fi
-
-# use SSL?
-
-AC_ARG_WITH(openssl,
-	[  --with-openssl          enable SSL support using OpenSSL],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_LIB(crypto, BIO_s_mem)
-			AC_CHECK_LIB(ssl, SSL_library_init)
-			AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
-				AC_MSG_ERROR([Can't enable openssl])
-			)
-		fi
-	]
-)
-
-AC_ARG_WITH(gnutls,
-	[  --with-gnutls           enable SSL support using gnutls],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_LIB(gnutls, gnutls_global_init)
-			AC_CHECK_FUNCS(gnutls_global_init, x_ssl_gnutls=yes,
-				AC_MSG_ERROR([Can't enable gnutls])
-			)
-		fi
-	]
-)
-
-x_ssl_lib="no"
-if test "$x_ssl_gnutls" = "yes"; then
-	if test "$x_ssl_openssl" = "yes";then
-		AC_MSG_ERROR([Cannot enable both gnutls and openssl])
-	fi
-	x_ssl_lib=gnutls
-fi
-if test "$x_ssl_openssl" = "yes"; then
-	x_ssl_lib=openssl
-fi
-
-# use TCP wrappers?
-
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
 	[  --with-tcp-wrappers     enable TCP wrappers support],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(wrap, tcpd_warn)
 			AC_MSG_CHECKING(for hosts_access)
-			LIBS="-lwrap $LIBS"
 			AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity = 0;
-int deny_severity = 0;
+				#include <tcpd.h>
 				],[
-				tcpd_warn("link test");
+				void *ptr;
+				ptr = hosts_access;
 				],[
 				AC_MSG_RESULT(yes)
 				AC_DEFINE(TCPWRAP, 1)
@@ -410,17 +191,25 @@ int deny_severity = 0;
 	]
 )

-# do IDENT requests using libident?
+x_rendezvous_on=no
+AC_ARG_WITH(rendezvous,
+	[  --with-rendezvous       enable support for "Rendezvous"],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=yes,
+				AC_MSG_ERROR([Can't enable Rendezvous!])
+			)
+		fi
+	]
+)
+if test "$x_rendezvous_on" = "yes"; then
+	AC_DEFINE(RENDEZVOUS, 1)
+	AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h)
+fi

 x_identauth_on=no
 AC_ARG_WITH(ident,
 	[  --with-ident            enable "IDENT" ("AUTH") protocol support],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
+	[	if test "$withval" = "yes"; then
 			AC_CHECK_LIB(ident, ident_id)
 			AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
 				AC_MSG_ERROR([Can't enable IDENT support!])
@@ -430,38 +219,9 @@ AC_ARG_WITH(ident,
 )
 if test "$x_identauth_on" = "yes"; then
 	AC_DEFINE(IDENTAUTH, 1)
-	AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
+	AC_CHECK_HEADERS(ident.h)
 fi

-# compile in PAM support?
-
-x_pam_on=no
-AC_ARG_WITH(pam,
-	[  --with-pam              enable user authentication using PAM],
-	[	if test "$withval" != "no"; then
-			if test "$withval" != "yes"; then
-				CFLAGS="-I$withval/include $CFLAGS"
-				CPPFLAGS="-I$withval/include $CPPFLAGS"
-				LDFLAGS="-L$withval/lib $LDFLAGS"
-			fi
-			AC_CHECK_LIB(pam, pam_authenticate)
-			AC_CHECK_FUNCS(pam_authenticate, x_pam_on=yes,
-				AC_MSG_ERROR([Can't enable PAM support!])
-			)
-		fi
-	]
-)
-if test "$x_pam_on" = "yes"; then
-	AC_DEFINE(PAM, 1)
-	AC_CHECK_HEADERS(security/pam_appl.h,pam_ok=yes)
-	if test "$pam_ok" != "yes"; then
-		AC_CHECK_HEADERS(pam/pam_appl.h,pam_ok=yes,
-			AC_MSG_ERROR([required C header missing!]))
-	fi
-fi
-
-# compile in IRC+ protocol support?
-
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
 	[  --disable-ircplus       disable IRC+ protocol],
@@ -471,23 +231,6 @@ if test "$x_ircplus_on" = "yes"; then
 	AC_DEFINE(IRCPLUS, 1)
 fi

-# enable support for IPv6?
-x_ipv6_on=no
-AC_ARG_ENABLE(ipv6,
-	[  --enable-ipv6           enable IPv6 protocol support],
-	if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
-)
-if test "$x_ipv6_on" = "yes"; then
-	# getaddrinfo() and getnameinfo() are optional when not compiling
-	# with IPv6 support, but are required for IPv6 to work!
-	AC_CHECK_FUNCS([ \
-		getaddrinfo getnameinfo \
-		],,AC_MSG_ERROR([required function missing for IPv6 support!]))
-	AC_DEFINE(WANT_IPV6, 1)
-fi
-
-# compile in IRC "sniffer"?
-
 x_sniffer_on=no; x_debug_on=no
 AC_ARG_ENABLE(sniffer,
 	[  --enable-sniffer        enable IRC traffic sniffer (enables debug mode)],
@@ -497,8 +240,6 @@ AC_ARG_ENABLE(sniffer,
 	fi
 )

-# enable additional debugging code?
-
 AC_ARG_ENABLE(debug,
 	[  --enable-debug          show additional debug output],
 	if test "$enableval" = "yes"; then x_debug_on=yes; fi
@@ -506,11 +247,8 @@ AC_ARG_ENABLE(debug,
 if test "$x_debug_on" = "yes"; then
 	AC_DEFINE(DEBUG, 1)
 	test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
-	AC_CHECK_FUNCS(mtrace)
 fi

-# enable "strict RFC rules"?
-
 x_strict_rfc_on=no
 AC_ARG_ENABLE(strict-rfc,
 	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
@@ -535,10 +273,8 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
-	doc/src/Makefile \
 	src/Makefile \
 	src/portab/Makefile \
-	src/ipaddr/Makefile \
 	src/tool/Makefile \
 	src/ngircd/Makefile \
 	src/testsuite/Makefile \
@@ -546,8 +282,6 @@ AC_OUTPUT([ \
 	contrib/Makefile \
 	contrib/Debian/Makefile \
 	contrib/MacOSX/Makefile \
-	contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
-	contrib/MacOSX/ngIRCd.pmdoc/Makefile \
 ])

 type dpkg >/dev/null 2>&1
@@ -561,7 +295,7 @@ fi
 # -- Result --

 echo
-echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:"
+echo "ngIRCd has been configured with the following options:"
 echo

 # Someone please show me a better way :)  [borrowed by OpenSSH]
@@ -569,7 +303,7 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}`
 S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
 C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
 M=`eval echo ${mandir}` ; M=`eval echo ${M}`
-D=`eval echo ${docdir}` ; D=`eval echo ${D}`
+D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`

 echo "             Target: ${target}"
 test "$target" != "$host" && echo "               Host: ${host}"
@@ -587,8 +321,8 @@ echo

 echo $ECHO_N "     Syslog support: $ECHO_C"
 test "$x_syslog_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "  Enable debug code: $ECHO_C"
 test "$x_debug_on" = "yes" \
 	&& echo "yes" \
@@ -596,8 +330,8 @@ test "$x_debug_on" = "yes" \

 echo $ECHO_N "   zlib compression: $ECHO_C"
 test "$x_zlib_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "        IRC sniffer: $ECHO_C"
 test "$x_sniffer_on" = "yes" \
 	&& echo "yes" \
@@ -605,36 +339,27 @@ test "$x_sniffer_on" = "yes" \

 echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
 test "$x_tcpwrap_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "    Strict RFC mode: $ECHO_C"
 test "$x_strict_rfc_on" = "yes" \
 	&& echo "yes" \
 	|| echo "no"

-echo $ECHO_N "      IDENT support: $ECHO_C"
-test "$x_identauth_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
+echo $ECHO_N " Rendezvous support: $ECHO_C"
+test "$x_rendezvous_on" = "yes"	\
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "      IRC+ protocol: $ECHO_C"
 test "$x_ircplus_on" = "yes" \
 	&& echo "yes" \
 	|| echo "no"

-echo $ECHO_N "      IPv6 protocol: $ECHO_C"
-test "$x_ipv6_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
-echo $ECHO_N "        I/O backend: $ECHO_C"
-	echo "\"$x_io_backend\""
+echo $ECHO_N "      IDENT support: $ECHO_C"
+test "$x_identauth_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"

-echo $ECHO_N "        PAM support: $ECHO_C"
-test "$x_pam_on" = "yes" \
-	&& echo $ECHO_N "yes   $ECHO_C" \
-	|| echo $ECHO_N "no    $ECHO_C"
-echo $ECHO_N "        SSL support: $ECHO_C"
-echo "$x_ssl_lib"
-
-echo
+echo; echo

 # -eof-
--- a/contrib/Debian/.gitignore
+++ b/contrib/Debian/.gitignore
@@ -1,13 +0,0 @@
-*.log
-*.debhelper
-*.substvars
-files
-ngircd/
-ngircd-full/
-ngircd-full.default
-ngircd-full.init
-ngircd-full.postinst
-ngircd-full-dbg/
-ngircd-full-dbg.default
-ngircd-full-dbg.init
-ngircd-full-dbg.postinst
--- a/contrib/Debian/Makefile.am
+++ b/contrib/Debian/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@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,9 +8,11 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
+# $Id: Makefile.am,v 1.3.2.1 2004/05/11 00:38:17 alex Exp $
+#

 EXTRA_DIST = rules changelog compat control copyright \
-	ngircd.init ngircd.default ngircd.pam ngircd.postinst
+	ngircd.init ngircd.postinst

 maintainer-clean-local:
 	rm -f Makefile Makefile.in
@@ -20,10 +22,7 @@ clean-local:
 	 ngircd.prerm.debhelper ngircd.substvars
 	rm -f ngircd-full.postinst.debhelper ngircd-full.postrm.debhelper \
 	 ngircd-full.prerm.debhelper ngircd-full.substvars
-	rm -f ngircd-full-dbg.postinst.debhelper \
-	 ngircd-full-dbg.postrm.debhelper ngircd-full-dbg.prerm.debhelper \
-	 ngircd-full-dbg.substvars
-	rm -rf ngircd ngircd-full ngircd-full-dbg
+	rm -rf ngircd ngircd-full
 	rm -f files

 # -eof-
--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,226 +1,3 @@
-ngircd (18~rc2-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 2 for ngIRCd Release 18.
-
- -- Alexander Barton <alex@barton.de>  Wed, 29 Jun 2011 10:20:51 +0200
-
-ngircd (18~rc1-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 1 for ngIRCd Release 18.
-
- -- Alexander Barton <alex@barton.de>  Mon, 27 Jun 2011 22:58:36 +0200
-
-ngircd (17.1-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 17.1.
-
- -- Alexander Barton <alex@barton.de>  Sun, 19 Dec 2010 15:56:42 +0100
-
-ngircd (17-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 17.
-
- -- Alexander Barton <alex@barton.de>  Sun, 07 Nov 2010 17:23:07 +0100
-
-ngircd (17~rc3-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 3 for ngIRCd Release 17.
-
- -- Alexander Barton <alex@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
-    installing -full or -full-dbg variant to keep backwards compatibility.
-
- -- Alexander Barton <alex@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.
-
- -- Alexander Barton <alex@barton.de>  Mon, 25 Oct 2010 18:51:15 +0200
-
-ngircd (17~rc1-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 1 for ngIRCd Release 17.
-
- -- Alexander Barton <alex@barton.de>  Mon, 11 Oct 2010 16:57:47 +0200
-
-ngircd (16-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 16.
-
- -- Alexander Barton <alex@barton.de>  Sun, 02 May 2010 13:32:41 +0200
-
-ngircd (16~rc2-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 2 for ngIRCd Release 16.
-
- -- Alexander Barton <alex@barton.de>  Sun, 25 Apr 2010 13:12:42 +0200
-
-ngircd (16~rc1-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 1 for ngIRCd Release 16.
-
- -- Alexander Barton <alex@barton.de>  Thu, 25 Mar 2010 15:56:03 +0200
-
-ngircd (15-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 15.
-
- -- Alexander Barton <alex@barton.de>  Thu,  7 Nov 2009 12:07:08 +0200
-
-ngircd (15~rc1-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 1 for ngIRCd Release 15.
-
- -- Alexander Barton <alex@barton.de>  Thu, 15 Oct 2009 10:01:08 +0200
-
-ngircd (14.1-0ab1) unstable; urgency=high
-
-  * New "upstream" release ngIRCd 14.1, fixing a security-related bug.
-
- -- Alexander Barton <alex@barton.de>  Tue,  5 May 2009 13:13:38 +0200
-
-ngircd (14-0ab3) unstable; urgency=low
-
-  * Fixed "Conflicts:" line in debian/control: missing comma.
-
- -- Alexander Barton <alex@barton.de>  Mon,  4 May 2009 11:21:55 +0200
-
-ngircd (14-0ab2) unstable; urgency=low
-
-  * Add new "ngircd-full-dbg" package including degug code and both
-    the --debug and --sniffer options, and containing debug symbols.
-
- -- Alexander Barton <alex@barton.de>  Wed, 29 Apr 2009 01:13:03 +0200
-
-ngircd (14-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 14.
-
- -- Alexander Barton <alex@barton.de>  Mon, 20 Apr 2009 11:09:12 +0200
-
-ngircd (14~rc1-0ab1) unstable; urgency=low
-
-  * New "upstream" release candidate 1 for ngIRCd Release 14.
-
- -- Alexander Barton <alex@barton.de>  Sun, 29 Mar 2009 17:09:17 +0200
-
-ngircd (13-0ab1) unstable; urgency=low
-
-  * New "upstream" release: ngIRCd 13.
-
- -- Alexander Barton <alex@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.
-
- -- Alexander Barton <alex@barton.de>  Fri, 21 Nov 2008 22:04:41 +0100
-
-ngircd (0.12.1-0ab1+dev) unstable; urgency=low
-
-  * Update package for testing the new "upstream" features:
-     - Support for IRC services (see http://www.ircservices.za.net),
-     - Encrypted connections using GNU TLS (ngircd-full),
-     - Support for the IPv6 protocol (ngircd-full).
-
- -- Alexander Barton <alex@barton.de>  Fri, 03 Oct 2008 16:22:55 +0200
-
-ngircd (0.12.1-0ab1) unstable; urgency=low
-
-  * New "upstream" release ngIRCd 0.12.1.
-
- -- Alexander Barton <alex@barton.de>  Wed,  9 Jul 2008 11:27:00 +0200
-
-ngircd (0.12.0-0ab1) unstable; urgency=low
-
-  * New "upstream" release ngIRCd 0.12.0.
-
- -- Alexander Barton <alex@barton.de>  Tue, 13 May 2008 12:30:31 +0200
-
-ngircd (0.12.0-0ab0-pre2) unstable; urgency=low
-
-  * Second prerelease of upcoming new "upstrem" release 0.12.0-pre1.
-
- -- Alexander Barton <alex@barton.de>  Tue, 29 Apr 2008 23:06:14 +0200
-
-ngircd (0.12.0-0ab0-pre1) unstable; urgency=low
-
-  * Prereloease of upcoming new "upstrem" release 0.12.0-pre1.
-
- -- Alexander Barton <alex@barton.de>  Sun, 20 Apr 2008 15:43:34 +0200
-
-ngircd (0.11.0-0ab0-pre2) unstable; urgency=low
-
-  * Second prerelease of upcoming new "upstream release".
-
- -- Alexander Barton <alex@barton.de>  Mon,  7 Jan 2008 15:32:42 +0100
-
-ngircd (0.11.0-0ab0-pre1) unstable; urgency=low
-
-  * Prerelease of upcoming new "upstream release".
-
- -- Alexander Barton <alex@barton.de>  Wed,  2 Jan 2008 21:33:15 +0100
-
-ngircd (0.10.4-0ab1) unstable; urgency=high
-
-  * New "upstream" release: 0.10.4 - fixing a security bug.
-
- -- Alexander Barton <alex@barton.de>  Mon,  7 Jan 2008 22:04:44 +0100
-
-ngircd (0.10.0-0ab1) unstable; urgency=low
-
-  * New "upstream" release: 0.10.0
-
- -- Alexander Barton <alex@barton.de>  Sun,  1 Oct 2006 18:14:21 +0200
-
-ngircd (0.10.0-0ab0-pre2-1) unstable; urgency=low
-
-  * Bumped standards version to 3.7.2.1.
-  * Added "Provides: ircd" to Debian control file.
-
- -- Alexander Barton <alex@barton.de>  Sun,  1 Oct 2006 16:25:33 +0200
-
-ngircd (0.10.0-0ab0-pre2) unstable; urgency=low
-
-  * Second "upstream" prerelease of upcoming 0.10.0 release.
-
- -- Alexander Barton <alex@barton.de>  Sat,  9 Sep 2006 20:57:52 +0200
-
-ngircd (0.10.0-0ab0-pre1) unstable; urgency=low
-
-  * Prerelease of upcoming new "upstream release".
-
- -- Alexander Barton <alex@barton.de>  Wed,  2 Aug 2006 12:01:07 +0200
-
-ngircd (0.9.2-0ab1) unstable; urgency=low
-
-  * New "upstream release" fixing a few bugs in 0.9.1.
-
- -- Alexander Barton <alex@barton.de>  Sat, 15 Oct 2005 14:10:34 +0200
-
-ngircd (0.9.1-0ab1) unstable; urgency=medium
-
-  * New "upstream release" addressing two problems in ngIRCd 0.9.0.
-
- -- Alexander Barton <alex@barton.de>  Wed,  3 Aug 2005 15:10:41 +0200
-
-ngircd (0.9.0-0ab2) unstable; urgency=medium
-
-  * Init script: fixed a problem with symbolic links in runlevel directories
-    that could prevent the init script from working correctly.
-
- -- Alexander Barton <alex@barton.de>  Tue, 26 Jul 2005 21:31:18 +0200
-
-ngircd (0.9.0-0ab1) unstable; urgency=low
-
-  * New "upstream release".
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sat,  24 Jul 2005 23:30:00 +0200
-
 ngircd (0.8.3-0ab1) unstable; urgency=high

  * New "upstream release", including security fixes.
@@ -252,13 +29,6 @@ ngircd (0.8.0-0ab1) unstable; urgency=low

 -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 26 Jun 2004 11:25:59 +0200

-ngircd (0.7.7+HEAD-0ab6) unstable; urgency=low
-
-  * Incorporated actual CVS HEAD version which includes all features of
-    version 0.8.0-pre1 and patches for the resolver and logger.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Tue, 11 May 2004 02:18:50 +0200
-
 ngircd (0.7.7+HEAD-0ab5) unstable; urgency=low

  * Updates from CVS HEAD branch, most notably: "INVITE- and BAN-lists
--- a/contrib/Debian/control
+++ b/contrib/Debian/control
@@ -2,22 +2,19 @@ Source: ngircd
 Section: net
 Priority: optional
 Maintainer: Alexander Barton <alex@barton.de>
-Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap0-dev, libident-dev, libgnutls-dev, libpam0g-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap-dev, libident-dev
+Standards-Version: 3.5.8

 Package: ngircd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ircd
 Description: A lightweight daemon for the Internet Relay Chat (IRC)
 ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
 network. It is written from scratch and is not based upon the original
 IRCd like many others.
 .
 This package contains the "standard distribution", including support for
- syslog logging and compressed server-links using zlib. Please have a look
- at the "ngircd-full" package if you need advanced functionality like support
- for IPv6 or SSL.
+ syslog logging and compressed server-links using zlib.
 .
 Advantages of ngIRCd:
  - no problems with servers using changing/non-static IP addresses.
@@ -31,42 +28,14 @@ Description: A lightweight daemon for the Internet Relay Chat (IRC)
 Package: ngircd-full
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ircd
-Conflicts: ngircd, ngircd-dbg
+Conflicts: ngircd
 Description: A lightweight daemon for the Internet Relay Chat (IRC)
 ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
 network. It is written from scratch and is not based upon the original
 IRCd like many others.
 .
- In addition to the features of the "standard package", this package
- includes support for TCP wrappers, IDENT requests, the IPv6 protocol and
- SSL encrypted client and server links.
- .
- Advantages of ngIRCd:
-  - no problems with servers using changing/non-static IP addresses.
-  - small and lean configuration file.
-  - free, modern and open source C code.
-  - still under active development.
- .
- ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
- mixed networks.
-
-Package: ngircd-full-dbg
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ircd
-Conflicts: ngircd, ngircd-full
-Description: A lightweight daemon for the Internet Relay Chat (IRC)
- ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
- network. It is written from scratch and is not based upon the original
- IRCd like many others.
- .
- In addition to the features of the "standard package", this package
- includes support for TCP wrappers, IDENT requests, the IPv6 protocol and
- SSL encrypted client and server links.
- .
- And in addition to the "full" variant, the binaries contained in this
- package are build with debug code and contain debug symbols.
+ This package includes support for TCP wrappers and IDENT requests in
+ addition to the features of the "standard package".
 .
 Advantages of ngIRCd:
  - no problems with servers using changing/non-static IP addresses.
--- a/contrib/Debian/ngircd.init
+++ b/contrib/Debian/ngircd.init
@@ -1,175 +1,72 @@
 #!/bin/sh
 #
 # ngIRCd start and stop script for Debian-based systems
-# Copyright 2008-2010 Alexander Barton <alex@barton.de>
 #
-
-### BEGIN INIT INFO
-# Provides:		ngircd
-# Required-Start:	$network $remote_fs
-# Required-Stop:	$network $remote_fs
-# Should-Start:		$syslog $named
-# Should-Stop:		$syslog
-# Default-Start:	2 3 4 5
-# Default-Stop:		0 1 6
-# Short-Description:	Next Generation IRC Server
-# Description:		IRC daemon written from scratch
-### END INIT INFO
+# $Id: ngircd.init,v 1.1.2.1 2004/09/06 00:36:49 alex Exp $
+#

 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/ngircd
 NAME=ngIRCd
+BASENAME=`basename $0`
 DESC="IRC daemon"
 PARAMS=""
-STARTTIME=1
-DIETIME=10

-test -x $DAEMON || exit 5
+test -f /etc/default/$BASENAME && . /etc/default/$BASENAME

-test -h "$0" && me=`readlink $0` || me="$0"
-BASENAME=`basename $me`
-
-test -r /etc/default/$BASENAME && . /etc/default/$BASENAME
-
-# LSB compatibility functions that become used if there is no local
-# include file available.
-log_daemon_msg() {
-	echo -n "$*"
-}
-log_end_msg() {
-	[ "$1" == "0" ] && echo "." || echo " failed!"
-}
-log_failure_msg() {
-	echo "$*"
-}
-log_warning_msg() {
-	log_failure_msg "$*"
-}
-
-# Include LSB functions, if available:
-test -r /lib/lsb/init-functions && . /lib/lsb/init-functions
-
-PIDFILE=`$DAEMON $PARAMS -t | tr -d ' ' | grep "^PidFile=" | cut -d'=' -f2`
-[ -n "$PIDFILE" ] || PIDFILE="/var/run/ircd/ngircd.pid"
-
-r=3
+test -x $DAEMON || exit 0

 Check_Config()
 {
-	# Make sure that the configuration of ngIRCd is valid:
-	$DAEMON $PARAMS --configtest >/dev/null 2>&1
-	[ $? -eq 0 ] && return 0
-	log_end_msg 1
-	log_failure_msg "Configuration of $NAME is not valid, won't (re)start!"
-	log_failure_msg "Run \"$DAEMON --configtest\" and fix it up ..."
-	exit 6
-}
-
-Prepare() {
-	# Make sure the PID file directory exists and is writable:
-	user=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerUID="|cut -d'=' -f2`
-	group=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerGID="|cut -d'=' -f2`
-	piddir=`dirname "$PIDFILE"`
-	[ -d "$piddir" ] || mkdir -p "$piddir" 2>/dev/null
-	chown "$user:$group" "$piddir" 2>/dev/null
-	[ $? -eq 0 ] && return 0
-	log_end_msg 1
-	log_failure_msg "Failed to prepare '$piddir' for user '$user'!"
-	exit 1
-}
-
-Do_Start() {
-	if Do_Status; then
-		log_end_msg 0
-		log_warning_msg "$NAME seems to be already running, nothing to do."
-		exit 0
+	$DAEMON --configtest >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Configuration of $NAME is not valide, won't (re)start!"
+		echo "Please run \"$DAEMON --configtest\" manually and fix it up ..."
+		exit 1
 	fi
-	start-stop-daemon --start \
-		--quiet --exec $DAEMON -- $PARAMS
-	sleep $STARTTIME
-	Do_Status || return 7
-	return 0
 }

-Do_Stop() {
-	if ! Do_Status; then
-		log_end_msg 0
-		log_warning_msg "$NAME seems not to be running, nothing to do."
-		exit 0
+Try_Start()
+{
+	start-stop-daemon --start --quiet --exec $DAEMON -- $PARAMS
+	if [ $? -ne 0 ]; then
+		echo "$NAME failed!"
+		exit 1
 	fi
-	Do_ForceStop
-	return $?
-}
-
-Do_ForceStop() {
-	[ -e $PIDFILE ] \
-		&& pidfile="--pidfile $PIDFILE" \
-		|| pidfile=""
-	start-stop-daemon --stop \
-		--quiet --oknodo --exec $DAEMON $pidfile
-	for i in `seq 1 $DIETIME`; do
-		Do_Status || return 0
-		sleep 1
-	done
-	return 1
-}
-
-Do_Reload() {
-	start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
-	return $?
-}
-
-Do_Status() {
-	[ -e $PIDFILE ] \
-		&& pidfile="--pidfile $PIDFILE" \
-		|| pidfile=""
-	start-stop-daemon --stop \
-		--quiet --signal 0 --exec $DAEMON $pidfile >/dev/null
-	return $?
+	echo "$NAME."
 }

 case "$1" in
  start)
-	log_daemon_msg "Starting $DESC" "$NAME"
 	Check_Config
-	Prepare
-	Do_Start; r=$?
-	log_end_msg $r
+	echo -n "Starting $DESC: "
+	Try_Start
 	;;
  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	Do_Stop; r=$?
-	log_end_msg $r
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --exec $DAEMON \
+	  && echo "$NAME." \
+	  || echo "(none running)"
 	;;
  reload|force-reload)
-	log_daemon_msg "Reloading $DESC" "$NAME"
 	Check_Config
-	Do_Reload; r=$?
-	log_end_msg $r
+	echo "Reloading $DESC configuration files."
+	start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
 	;;
  restart)
-	log_daemon_msg "Restarting $DESC" "$NAME"
 	Check_Config
-	Prepare
-	Do_ForceStop
-	Do_Start; r=$?
-	log_end_msg $r
-	;;
-  status)
-	log_daemon_msg "Checking for $DESC" "$NAME"
-	Do_Status; r=$?
-	log_end_msg $r
-	;;
-  test)
-	Check_Config
-	echo "Configuration of $DAEMON seems to be ok."; r=0
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+	sleep 1
+	Try_Start
 	;;
  *)
-	N=/etc/init.d/$NAME; r=2
-	echo "Usage: $N {start|stop|restart|reload|force-reload|status|test}" >&2
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
 	;;
 esac

-exit $r
+exit 0

 # -eof-
--- a/contrib/Debian/ngircd.pam
+++ b/contrib/Debian/ngircd.pam
@@ -1,4 +0,0 @@
-# /etc/pam.d/ngircd
-
-# allow all connections to ngIRCd
-auth required pam_permit.so
--- a/contrib/Debian/ngircd.postinst
+++ b/contrib/Debian/ngircd.postinst
@@ -1,20 +1,13 @@
 #!/bin/sh
 #
 # Debian post-installation script
-# $Id: ngircd.postinst,v 1.2 2006/12/26 14:44:40 alex Exp $
+# $Id: ngircd.postinst,v 1.1 2003/12/31 17:20:11 alex Exp $
 #

-set -e
-
-case "$1" in
-	configure)
-		if [ -f /etc/ngircd/ngircd.conf ]; then
-			# make sure that the configuration file is not
-			# world-readable, it contains passwords!
-			chmod o= /etc/ngircd/ngircd.conf
-		fi
-		;;
-esac
+if [ -f /etc/ngircd/ngircd.conf ]; then
+	# make sure that configuration file is not world readable
+	chmod o= /etc/ngircd/ngircd.conf
+fi

 #DEBHELPER#

--- a/contrib/Debian/rules
+++ b/contrib/Debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2009 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2003 by Alexander Barton (alex@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
@@ -11,6 +11,8 @@
 #
 # debian/rules for ngIRCd
 #
+# $Id: rules,v 1.2 2004/01/01 22:24:48 alex Exp $
+#
 # Based on the sample debian/rules that uses debhelper,
 # GNU copyright 1997 to 1999 by Joey Hess.
 #
@@ -52,22 +54,7 @@ configure-ngircd-full: configure
 	  --prefix=/usr \
 	  --sysconfdir=/etc/ngircd \
 	  --mandir=\$${prefix}/share/man \
-	  --with-syslog --with-zlib \
-	  --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
-	  --enable-ipv6
-
-configure-ngircd-full-dbg: configure
-	dh_testdir
-
-	# configure "full debug" variant:
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr \
-	  --sysconfdir=/etc/ngircd \
-	  --mandir=\$${prefix}/share/man \
-	  --enable-debug --enable-sniffer \
-	  --with-syslog --with-zlib \
-	  --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
-	  --enable-ipv6
+	  --with-syslog --with-zlib --with-tcp-wrappers --with-ident

 build:
 	dh_clean -k
@@ -92,16 +79,6 @@ build-stamp-ngircd-full: configure-ngircd-full

 	touch build-stamp-ngircd-full

-build-ngircd-full-dbg: build-stamp-ngircd-full-dbg
-build-stamp-ngircd-full-dbg: configure-ngircd-full-dbg
-	dh_testdir
-	rm -f build-stamp-*
-
-	# Add here commands to compile the "full debug" package:
-	$(MAKE)
-
-	touch build-stamp-ngircd-full
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -109,12 +86,9 @@ clean:
 	rm -f $(CURDIR)/debian/ngircd-full.default
 	rm -f $(CURDIR)/debian/ngircd-full.init
 	rm -f $(CURDIR)/debian/ngircd-full.postinst
-	rm -f $(CURDIR)/debian/ngircd-full-dbg.default
-	rm -f $(CURDIR)/debian/ngircd-full-dbg.postinst
-	rm -f $(CURDIR)/debian/ngircd-full-dbg.init

 	# Add here commands to clean up after the build process:
-	[ ! -f Makefile ] || $(MAKE) distclean
+	-$(MAKE) clean

 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -124,7 +98,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 endif
 	dh_clean

-install: install-ngircd install-ngircd-full install-ngircd-full-dbg
+install: install-ngircd install-ngircd-full

 install-ngircd: build-ngircd
 	dh_testdir
@@ -135,14 +109,6 @@ install-ngircd: build-ngircd
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd
 	rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
 	rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
-	mkdir -p $(CURDIR)/debian/ngircd/var/run/ircd
-	cat $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/sample-ngircd.conf | \
-	 sed -e "s/;ServerUID = 65534/ServerUID = irc/g" | \
-	 sed -e "s/;ServerGID = 65534/ServerGID = irc/g" | \
-	 sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-	 sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \
-	 >$(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf
-	touch $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd

 install-ngircd-full: build-ngircd-full
 	dh_testdir
@@ -155,38 +121,6 @@ install-ngircd-full: build-ngircd-full
 	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING*
 	mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \
 	 $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full
-	mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd
-	cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \
-	 sed -e "s/;ServerUID = 65534/ServerUID = irc/g" | \
-	 sed -e "s/;ServerGID = 65534/ServerGID = irc/g" | \
-	 sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-	 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
-	dh_testroot
-	dh_installdirs
-
-	# Add here commands to install the "full" package into debian/ngircd-full:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg
-	rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/INSTALL*
-	rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/COPYING*
-	mv $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd \
-	 $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg
-	mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd
-	cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \
-	 sed -e "s/;ServerUID = 65534/ServerUID = irc/g" | \
-	 sed -e "s/;ServerGID = 65534/ServerGID = irc/g" | \
-	 sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-	 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:
@@ -200,20 +134,13 @@ binary-arch: build install
 	 $(CURDIR)/debian/ngircd-full.init
 	ln -s $(CURDIR)/debian/ngircd.postinst \
 	 $(CURDIR)/debian/ngircd-full.postinst
-
-	ln -s $(CURDIR)/debian/ngircd.default \
-	 $(CURDIR)/debian/ngircd-full-dbg.default
-	ln -s $(CURDIR)/debian/ngircd.init \
-	 $(CURDIR)/debian/ngircd-full-dbg.init
-	ln -s $(CURDIR)/debian/ngircd.postinst \
-	 $(CURDIR)/debian/ngircd-full-dbg.postinst
-
+	
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -a -A ChangeLog
 	dh_installdocs -a
 	dh_installinit -a
-	dh_strip -a --no-package=ngircd-full-dbg
+	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
--- a/contrib/MacOSX/.gitignore
+++ b/contrib/MacOSX/.gitignore
@@ -1,2 +0,0 @@
-build
-de.barton.ngircd.plist
--- a/contrib/MacOSX/Makefile.am
+++ b/contrib/MacOSX/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2004 Alexander Barton <alex@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,43 +8,11 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-
-SUBDIRS = ngIRCd.xcodeproj ngIRCd.pmdoc
-
-EXTRA_DIST = de.barton.ngircd.plist.tmpl config.h preinstall.sh postinstall.sh
-
-SUFFIXES = .tmpl .
-
-.tmpl:
-	sed \
-	    -e s@:SBINDIR:@${sbindir}@ \
-	    <$< >$@
-
-install-data-local:
-	[ `uname -s` != "Darwin" ] || make install-sys-darwin
-
-install-sys-darwin:
-	@if [ `id -u` -eq 0 ]; then \
-	  make install-sys-darwin-root; \
-	else \
-	  echo; \
-	  echo " ** NOTE: Not installing with root privileges, so the LaunchDaemon script"; \
-	  echo " ** \"/Library/LaunchDaemons/de.barton.ngircd.plist\" can't be installed/updated!"; \
-	  echo; \
-	fi
-
-install-sys-darwin-root: de.barton.ngircd.plist
-	install -d -m 755 -o root -g wheel $(DESTDIR)/Library/LaunchDaemons
-	install -c -m 644 -b -o root -g wheel de.barton.ngircd.plist \
-	 $(DESTDIR)/Library/LaunchDaemons/de.barton.ngircd.plist
-	@echo
-	@echo " ** \"/Library/LaunchDaemons/de.barton.ngircd.plist\" has been installed,"
-	@echo " ** but is disabled. Use launchctl(8) to enable/run ngIRCd on Darwin/Mac OS X."
-	@echo
+# $Id: Makefile.am,v 1.1.2.1 2004/05/11 00:38:17 alex Exp $
+#

 clean-local:
 	rm -rf build
-	rm -f de.barton.ngircd.plist

 maintainer-clean-local:
 	rm -f Makefile Makefile.in
--- a/contrib/MacOSX/config.h
+++ b/contrib/MacOSX/config.h
@@ -1,112 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Static configuration file for Mac OS X Xcode project
- */
-
-#define PACKAGE_NAME "ngircd"
-#ifndef VERSION
-#define VERSION "??("__DATE__")"
-#endif
-#define SYSCONFDIR "/etc/ngircd"
-
-#ifndef TARGET_VENDOR
-#define TARGET_VENDOR "apple"
-#define TARGET_OS "darwin"
-#endif
-
-/* -- Build options -- */
-
-/* Define if debug-mode should be enabled */
-#define DEBUG 1
-
-/* Define if the server should do IDENT requests */
-/*#define IDENTAUTH 1*/
-
-/* Define if IRC+ protocol should be used */
-#define IRCPLUS 1
-
-/* Define if IRC sniffer should be enabled */
-/*#define SNIFFER 1*/
-
-/* Define if syslog should be used for logging */
-#define SYSLOG 1
-
-/* Define if TCP wrappers should be used */
-/*#define TCPWRAP 1*/
-
-/* Define if zlib compression should be enabled */
-#define ZLIB 1
-
-/* Define if IPV6 protocol should be enabled */
-#define WANT_IPV6 1
-
-/* Define if PAM should be used */
-#define PAM 1
-
-/* -- Supported features -- */
-
-/* Define if SSP C support is enabled. */
-#define ENABLE_SSP_CC 1
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#define PROTOTYPES 1
-/* Define like PROTOTYPES; this can be used by system headers. */
-#define __PROTOTYPES 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-/* Define to 1 if you have the <netinet/ip.h> header file. */
-#define HAVE_NETINET_IP_H 1
-
-/* Define to 1 if you have the `kqueue' function. */
-#define HAVE_KQUEUE 1
-/* Define to 1 if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA 1
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-/* Define to 1 if you have the `strlcat' function. */
-#define HAVE_STRLCAT 1
-/* Define to 1 if you have the `strlcpy' function. */
-#define HAVE_STRLCPY 1
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-/* Define to 1 if you have the `inet_aton' function. */
-#define HAVE_INET_ATON 1
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define HAVE_GETADDRINFO 1
-/* Define to 1 if you have the `getnameinfo' function. */
-#define HAVE_GETNAMEINFO 1
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define if socklen_t exists */
-#define HAVE_socklen_t 1
-
-#ifdef PAM
-/* Define to 1 if you have the `pam_authenticate' function. */
-#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- */
--- a/contrib/MacOSX/de.barton.ngircd.plist.tmpl
+++ b/contrib/MacOSX/de.barton.ngircd.plist.tmpl
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Disabled</key>
-	<true/>
-	<key>KeepAlive</key>
-	<true/>
-	<key>Label</key>
-	<string>de.barton.ngIRCd</string>
-	<key>ProgramArguments</key>
-	<array>
-		<string>:SBINDIR:/ngircd</string>
-		<string>--nodaemon</string>
-	</array>
-	<key>RunAtLoad</key>
-	<true/>
-	<key>StandardErrorPath</key>
-	<string>/Library/Logs/ngIRCd.log</string>
-	<key>StandardOutPath</key>
-	<string>/Library/Logs/ngIRCd.log</string>
-</dict>
-</plist>
--- a/contrib/MacOSX/ngIRCd.pmdoc/01ngircd-contents.xml
+++ b/contrib/MacOSX/ngIRCd.pmdoc/01ngircd-contents.xml
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="ngircd.dest" o="root" g="admin" p="16877" pt="/Users/alex/Develop/ngircd/alex.git/ngircd.dest" m="false" t="file"><f n="opt" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="16877"><f n="etc" o="root" g="admin" p="16877"><f n="ngircd.motd" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="sbin" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="33261"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="share" o="root" g="admin" p="16877"><f n="doc" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="16877"><f n="AUTHORS" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Bopm.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="ChangeLog" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="COPYING" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="FAQ.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="GIT.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="HowToRelease.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="INSTALL" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="NEWS" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="PAM.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Platforms.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Protocol.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-AUX.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-BeOS.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-Interix.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="RFC.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="sample-ngircd.conf" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Services.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="SSL.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="man" o="root" g="admin" p="16877"><f n="man5" o="root" g="admin" p="16877"><f n="ngircd.conf.5" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="man8" o="root" g="admin" p="16877"><f n="ngircd.8" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></pkg-contents>
--- a/contrib/MacOSX/ngIRCd.pmdoc/01ngircd.xml
+++ b/contrib/MacOSX/ngIRCd.pmdoc/01ngircd.xml
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="46208410-4A1B-48C6-97BD-DE284F13F864"><config><identifier>de.barton.ngircd.daemon.pkg</identifier><version>17.1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom>/Users/alex/Develop/ngircd/alex.git/ngircd.dest</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>extraFiles</mod><mod>installTo</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.preinstall.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>scripts.preupgrade.path</mod><mod>requireAuthorization</mod></config><contents><file-list>02ngircd-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
--- a/contrib/MacOSX/ngIRCd.pmdoc/02de-contents.xml
+++ b/contrib/MacOSX/ngIRCd.pmdoc/02de-contents.xml
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="de.barton.ngircd.plist" o="root" g="wheel" p="33188" pt="/Users/alex/Develop/ngircd/alex.git/contrib/MacOSX/de.barton.ngircd.plist" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>
--- a/contrib/MacOSX/ngIRCd.pmdoc/02de.xml
+++ b/contrib/MacOSX/ngIRCd.pmdoc/02de.xml
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="F0954DA7-0607-4277-AE10-D882AC7C38CA"><config><identifier>de.barton.ngircd.launchscript.pkg</identifier><version>17.1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">de.barton.ngircd.plist</installFrom><installTo mod="true">/Library/LaunchDaemons</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preinstall.path</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.postinstall.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.path</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>requireAuthorization</mod><mod>extraFiles</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">preinstall.sh</preinstall><postinstall relative="true" mod="true">postinstall.sh</postinstall><preupgrade relative="true" mod="true">preinstall.sh</preupgrade><postupgrade relative="true" mod="true">postinstall.sh</postupgrade></scripts><contents><file-list>01de-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
--- a/contrib/MacOSX/ngIRCd.pmdoc/Makefile.am
+++ b/contrib/MacOSX/ngIRCd.pmdoc/Makefile.am
@@ -1,18 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 Alexander Barton <alex@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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-
-EXTRA_DIST = index.xml \
- 01ngircd-contents.xml 01ngircd.xml 02de-contents.xml 02de.xml
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-# -eof-
--- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml
+++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml
@@ -1,238 +0,0 @@
-<pkmkdoc spec="1.12"><properties><title>ngIRCd</title><build>/Users/alex/Desktop/ngIRCd.mpkg</build><organization>de.barton.ngircd</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>ngIRCd – next generation Internet Relay Chat (IRC) server
-  daemon</description><contents><choice title="ngIRCd daemon" id="choicengircd" tooltip="ngIRCd daemon, documentation and manual pages" description="Binaries, documentation and manual pages of the ngIRCd, the next generation IRC (Internet Relay Chat) daemon. This package will be installed into /opt/ngircd." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="de.barton.ngircd.daemon.pkg"/></choice><choice title="Start and stop script" id="choicelaunchscript" tooltip="LaunchDaemon start and stop script" description="Installs the ngIRCd start and stop script for the &quot;launch daemon&quot;. If this is an update/upgrade, and ngIRCd is already running, it will be automatically restarted." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="de.barton.ngircd.launchscript.pkg"/></choice></contents><resources bg-scale="none" bg-align="bottomleft"><locale lang="en"><resource type="background">/Users/alex/Develop/ngircd/alex.git/contrib/ngIRCd-Logo.gif</resource><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-
-\f0\i\fs24 \cf0 ngIRCd -- The Next Generation IRC Daemon\
-Copyright (c)2001-2011 Alexander Barton and Contributors.\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\i0 \cf0 \
-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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \
-\
-Please see below and read the file COPYING, README and AUTHORS for more information.\
-\
-\
-\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-
-\b \cf0 GNU GENERAL PUBLIC LICENSE\
-Version 2, June 1991\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\b0 \cf0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-\cf0 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\
-Everyone is permitted to copy and distribute verbatim copies\
-of this license document, but changing it is not allowed.\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-\cf0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-
-\b \cf0 Preamble\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\b0 \cf0 \
-The licenses for most software are designed to take away your freedom to share and change it.  By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.  This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it.  (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.)  You can apply it to your programs, too.\
-\
-When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\
-\
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\
-\
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have.  You must make sure that they, too, receive or can get the source code.  And you must show them these terms so they know their rights.\
-\
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\
-\
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software.  If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\
-\
-Finally, any free program is threatened constantly by software patents.  We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary.  To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\
-\
-The precise terms and conditions for copying, distribution and modification follow.\
-\page \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-
-\b \cf0 GNU GENERAL PUBLIC LICENSE\
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION\
-AND MODIFICATION\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\b0 \cf0 \
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License.  The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law:\
-that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language.  (Hereinafter, translation is included without limitation in the term "modification".)  Each licensee is addressed as "you".\
-\
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope.  The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the\
-Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\
-\
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\
-\
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\
-\
-  2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1above, provided that you also meet all of these conditions:\
-\
-    a) You must cause the modified files to carry prominent notices\
-    stating that you changed the files and the date of any change.\
-\
-    b) You must cause any work that you distribute or publish, that in\
-    whole or in part contains or is derived from the Program or any\
-    part thereof, to be licensed as a whole at no charge to all third\
-    parties under the terms of this License.\
-\
-    c) If the modified program normally reads commands interactively\
-    when run, you must cause it, when started running for such\
-    interactive use in the most ordinary way, to print or display an\
-    announcement including an appropriate copyright notice and a\
-    notice that there is no warranty (or else, saying that you provide\
-    a warranty) and that users may redistribute the program under\
-    these conditions, and telling the user how to view a copy of this\
-    License.  (Exception: if the Program itself is interactive but\
-    does not normally print such an announcement, your work based on\
-    the Program is not required to print an announcement.)\
-\page \
-These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\
-\
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\
-\
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\
-\
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\
-\
-    a) Accompany it with the complete corresponding machine-readable\
-    source code, which must be distributed under the terms of Sections\
-    1 and 2 above on a medium customarily used for software\
-    interchange; or,\
-\
-    b) Accompany it with a written offer, valid for at least three\
-    years, to give any third party, for a charge no more than your\
-    cost of physically performing source distribution, a complete\
-    machine-readable copy of the corresponding source code, to be\
-    distributed under the terms of Sections 1 and 2 above on a medium\
-    customarily used for software interchange; or,\
-\
-    c) Accompany it with the information you received as to the offer\
-    to distribute corresponding source code.  (This alternative is\
-    allowed only for noncommercial distribution and only if you\
-    received the program in object code or executable form with such\
-    an offer, in accord with Subsection b above.)\
-\
-The source code for a work means the preferred form of the work for making modifications to it.  For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable.  However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\
-\
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not\
-compelled to copy the source along with the object code.\
-\
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License.  Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\
-\
-5. You are not required to accept this License, since you have not signed it.  However, nothing else grants you permission to modify or distribute the Program or its derivative works.  These actions are prohibited by law if you do not accept this License.  Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\
-\
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions.  You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\
-\
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all.  For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\
-\
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\
-\
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices.  Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\
-\
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\
-\page \
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.  In such case, this License incorporates the limitation as if written in the body of this License.\
-\
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\
-\
-Each version is given a distinguishing version number.  If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\
-\
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\
-\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural
-
-\b \cf0 NO WARRANTY
-\b0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-\cf0 \
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\
-\
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fmodern\fcharset0 Courier;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs26 \cf0 Please not:\
-\
-\pard\tx260\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li260\fi-260\ql\qnatural\pardirnatural
-\cf0 \'95	You 
-\b have to adjust the configuration file
-\b0  of ngIRCd, at least if you are installing ngIRCd for the first time on this system (it is preserved while updating, of course).\
-\
-\'95	The daemon is automatically restarted when updating, so your 
-\b users will be disconnected
-\b0 .\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 \
-ngIRCd becomes installed in the (newly created) /opt/ngircd directory on your system volume. Interesting files and directories are:\
-\
-\pard\tx260\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li260\fi-260\ql\qnatural\pardirnatural
-\cf0 \'95	
-\f1 /opt/ngircd/sbin/ngircd
-\f0  \'96 executable daemon\
-\'95	
-\f1 /opt/ngircd/etc/ngircd.conf
-\f0  \'96 configuration file\
-\'95	
-\f1 /opt/ngircd/share/doc/ngircd/\'85
-\f0  \'96 documentation\
-\'95	
-\f1 /opt/ngircd/share/mac/\'85
-\f0  \'96 manual pages}]]></resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs26 \cf0 ngIRCd is a free and open source daemon for the Internet Relay Chat (IRC) protocol, developed under the GNU General Public License (GPL). It is written from scratch, is quite portable and is not based upon the original IRCd like many others.\
-\
-	ngIRCd Homepage: {\field{\*\fldinst{HYPERLINK "http://ngircd.barton.de"}}{\fldrslt http://ngircd.barton.de}}\
-\
-Please see the documentation for details! You can find it online here on the Homepage:\
-\
-	Documentation: {\field{\*\fldinst{HYPERLINK "http://ngircd.barton.de/documentation"}}{\fldrslt http://ngircd.barton.de/documentation}}\
-\
-You will be guided through all steps necessary to install this software on Mac OS X.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fmodern\fcharset0 Courier;}
-{\colortbl;\red255\green255\blue255;}
-{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid101\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0\fs26 \cf0 The daemon has been restarted if it was already running before this installation and you have installed the LaunchDaemon start and stop script (which is the default).\
-\
-If you installed ngIRCd for the first time (or had the LaunchDaemon script disabled before), you can start ngIRCd using the following terminal command:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\fs20 \cf0 \
-\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural\pardirnatural
-\ls1\ilvl0
-\f1\fs26 \cf0 	sudo launchctl load -w \\\
-	 /Library/LaunchDaemons/de.barton.ngircd.plist\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0 \cf0 \
-To disable automatic starting of ngIRCd, use this command:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\fs18 \cf0 \
-\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural\pardirnatural
-\ls2\ilvl0
-\f1\fs26 \cf0 	sudo launchctl unload -w \\\
-	 /Library/LaunchDaemons/de.barton.ngircd.plist\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\f0 \cf0 \
-But don\'92t forget to 
-\b adjust the configuration!
-\b0  By default, it is stored in the following file:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\fs18 \cf0 \
-\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\ql\qnatural\pardirnatural
-
-\f1\fs26 \cf0 	/opt/ngircd/etc/ngircd.conf}]]></resource></locale></resources><flags/><extra-files/><item type="file">02de.xml</item><item type="file">01ngircd.xml</item><mod>extraFiles</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
--- a/contrib/MacOSX/ngIRCd.xcode/project.pbxproj
+++ b/contrib/MacOSX/ngIRCd.xcode/project.pbxproj
--- a/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore
+++ b/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore
@@ -1,2 +0,0 @@
-*.mode1v3
-*.pbxuser
--- a/contrib/MacOSX/ngIRCd.xcodeproj/Makefile.am
+++ b/contrib/MacOSX/ngIRCd.xcodeproj/Makefile.am
@@ -1,17 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 Alexander Barton <alex@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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-
-EXTRA_DIST = project.pbxproj
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-# -eof-
--- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj
+++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj
@@ -1,816 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 44;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		FA2D564A11EA158B00D37A35 /* pam.c in Sources */ = {isa = PBXBuildFile; fileRef = FA2D564911EA158B00D37A35 /* pam.c */; };
-		FA2D567B11EA1AB300D37A35 /* libpam.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA2D567A11EA1AB300D37A35 /* libpam.dylib */; };
-		FA322D350CEF74B1001761B3 /* array.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CD90CEF74B1001761B3 /* array.c */; };
-		FA322D360CEF74B1001761B3 /* channel.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CDB0CEF74B1001761B3 /* channel.c */; };
-		FA322D370CEF74B1001761B3 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CDD0CEF74B1001761B3 /* client.c */; };
-		FA322D380CEF74B1001761B3 /* conf.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CDF0CEF74B1001761B3 /* conf.c */; };
-		FA322D390CEF74B1001761B3 /* conn-func.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CE10CEF74B1001761B3 /* conn-func.c */; };
-		FA322D3A0CEF74B1001761B3 /* conn-zip.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CE30CEF74B1001761B3 /* conn-zip.c */; };
-		FA322D3B0CEF74B1001761B3 /* conn.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CE50CEF74B1001761B3 /* conn.c */; };
-		FA322D3C0CEF74B1001761B3 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CE80CEF74B1001761B3 /* hash.c */; };
-		FA322D3D0CEF74B1001761B3 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CEA0CEF74B1001761B3 /* io.c */; };
-		FA322D3E0CEF74B1001761B3 /* irc-channel.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CEC0CEF74B1001761B3 /* irc-channel.c */; };
-		FA322D3F0CEF74B1001761B3 /* irc-info.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CEE0CEF74B1001761B3 /* irc-info.c */; };
-		FA322D400CEF74B1001761B3 /* irc-login.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CF00CEF74B1001761B3 /* irc-login.c */; };
-		FA322D410CEF74B1001761B3 /* irc-mode.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CF20CEF74B1001761B3 /* irc-mode.c */; };
-		FA322D420CEF74B1001761B3 /* irc-op.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CF40CEF74B1001761B3 /* irc-op.c */; };
-		FA322D430CEF74B1001761B3 /* irc-oper.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CF60CEF74B1001761B3 /* irc-oper.c */; };
-		FA322D440CEF74B1001761B3 /* irc-server.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CF80CEF74B1001761B3 /* irc-server.c */; };
-		FA322D450CEF74B1001761B3 /* irc-write.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CFA0CEF74B1001761B3 /* irc-write.c */; };
-		FA322D460CEF74B1001761B3 /* irc.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CFC0CEF74B1001761B3 /* irc.c */; };
-		FA322D470CEF74B1001761B3 /* lists.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322CFE0CEF74B1001761B3 /* lists.c */; };
-		FA322D480CEF74B1001761B3 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D000CEF74B1001761B3 /* log.c */; };
-		FA322D490CEF74B1001761B3 /* match.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D030CEF74B1001761B3 /* match.c */; };
-		FA322D4A0CEF74B1001761B3 /* ngircd.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D060CEF74B1001761B3 /* ngircd.c */; };
-		FA322D4B0CEF74B1001761B3 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D080CEF74B1001761B3 /* parse.c */; };
-		FA322D4D0CEF74B1001761B3 /* resolve.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D0C0CEF74B1001761B3 /* resolve.c */; };
-		FA322DBE0CEF7766001761B3 /* tool.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D330CEF74B1001761B3 /* tool.c */; };
-		FA322DC10CEF77CB001761B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA322DC00CEF77CB001761B3 /* libz.dylib */; };
-		FA407F2E0DB159F400271AF1 /* ng_ipaddr.c in Sources */ = {isa = PBXBuildFile; fileRef = FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */; };
-		FA85178C0FA061EC006A1F5A /* op.c in Sources */ = {isa = PBXBuildFile; fileRef = FA85178B0FA061EC006A1F5A /* op.c */; };
-		FA99428C10E82A27007F27ED /* proc.c in Sources */ = {isa = PBXBuildFile; fileRef = FA99428B10E82A27007F27ED /* proc.c */; };
-		FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA3D2790F139CDC00B2447E /* conn-ssl.c */; };
-		FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA97C55124A271400D5BBA9 /* sighandlers.c */; };
-		FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */ = {isa = PBXBuildFile; fileRef = FAE5CC2D0CF2308A007D69B6 /* numeric.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		8DD76FAF0486AB0100D96B5E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		FA1A6BBC0D6857BB00AA8F71 /* misc-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "misc-test.e"; sourceTree = "<group>"; };
-		FA1A6BBD0D6857D900AA8F71 /* who-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "who-test.e"; sourceTree = "<group>"; };
-		FA2D564811EA158B00D37A35 /* pam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pam.h; sourceTree = "<group>"; };
-		FA2D564911EA158B00D37A35 /* pam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pam.c; sourceTree = "<group>"; };
-		FA2D567A11EA1AB300D37A35 /* libpam.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpam.dylib; path = usr/lib/libpam.dylib; sourceTree = SDKROOT; };
-		FA322BBA0CEF72E4001761B3 /* ngIRCd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ngIRCd; sourceTree = BUILT_PRODUCTS_DIR; };
-		FA322CD60CEF74B1001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322CD90CEF74B1001761B3 /* array.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = array.c; sourceTree = "<group>"; };
-		FA322CDA0CEF74B1001761B3 /* array.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = array.h; sourceTree = "<group>"; };
-		FA322CDB0CEF74B1001761B3 /* channel.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = channel.c; sourceTree = "<group>"; };
-		FA322CDC0CEF74B1001761B3 /* channel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = channel.h; sourceTree = "<group>"; };
-		FA322CDD0CEF74B1001761B3 /* client.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = client.c; sourceTree = "<group>"; };
-		FA322CDE0CEF74B1001761B3 /* client.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = client.h; sourceTree = "<group>"; };
-		FA322CDF0CEF74B1001761B3 /* conf.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = conf.c; sourceTree = "<group>"; };
-		FA322CE00CEF74B1001761B3 /* conf.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = "<group>"; };
-		FA322CE10CEF74B1001761B3 /* conn-func.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "conn-func.c"; sourceTree = "<group>"; };
-		FA322CE20CEF74B1001761B3 /* conn-func.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "conn-func.h"; sourceTree = "<group>"; };
-		FA322CE30CEF74B1001761B3 /* conn-zip.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "conn-zip.c"; sourceTree = "<group>"; };
-		FA322CE40CEF74B1001761B3 /* conn-zip.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "conn-zip.h"; sourceTree = "<group>"; };
-		FA322CE50CEF74B1001761B3 /* conn.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = conn.c; sourceTree = "<group>"; };
-		FA322CE60CEF74B1001761B3 /* conn.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = conn.h; sourceTree = "<group>"; };
-		FA322CE70CEF74B1001761B3 /* defines.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = defines.h; sourceTree = "<group>"; };
-		FA322CE80CEF74B1001761B3 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = "<group>"; };
-		FA322CE90CEF74B1001761B3 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = "<group>"; };
-		FA322CEA0CEF74B1001761B3 /* io.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
-		FA322CEB0CEF74B1001761B3 /* io.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = "<group>"; };
-		FA322CEC0CEF74B1001761B3 /* irc-channel.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-channel.c"; sourceTree = "<group>"; };
-		FA322CED0CEF74B1001761B3 /* irc-channel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-channel.h"; sourceTree = "<group>"; };
-		FA322CEE0CEF74B1001761B3 /* irc-info.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-info.c"; sourceTree = "<group>"; };
-		FA322CEF0CEF74B1001761B3 /* irc-info.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-info.h"; sourceTree = "<group>"; };
-		FA322CF00CEF74B1001761B3 /* irc-login.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-login.c"; sourceTree = "<group>"; };
-		FA322CF10CEF74B1001761B3 /* irc-login.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-login.h"; sourceTree = "<group>"; };
-		FA322CF20CEF74B1001761B3 /* irc-mode.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-mode.c"; sourceTree = "<group>"; };
-		FA322CF30CEF74B1001761B3 /* irc-mode.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-mode.h"; sourceTree = "<group>"; };
-		FA322CF40CEF74B1001761B3 /* irc-op.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-op.c"; sourceTree = "<group>"; };
-		FA322CF50CEF74B1001761B3 /* irc-op.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-op.h"; sourceTree = "<group>"; };
-		FA322CF60CEF74B1001761B3 /* irc-oper.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-oper.c"; sourceTree = "<group>"; };
-		FA322CF70CEF74B1001761B3 /* irc-oper.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-oper.h"; sourceTree = "<group>"; };
-		FA322CF80CEF74B1001761B3 /* irc-server.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-server.c"; sourceTree = "<group>"; };
-		FA322CF90CEF74B1001761B3 /* irc-server.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-server.h"; sourceTree = "<group>"; };
-		FA322CFA0CEF74B1001761B3 /* irc-write.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "irc-write.c"; sourceTree = "<group>"; };
-		FA322CFB0CEF74B1001761B3 /* irc-write.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "irc-write.h"; sourceTree = "<group>"; };
-		FA322CFC0CEF74B1001761B3 /* irc.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = irc.c; sourceTree = "<group>"; };
-		FA322CFD0CEF74B1001761B3 /* irc.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = irc.h; sourceTree = "<group>"; };
-		FA322CFE0CEF74B1001761B3 /* lists.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = lists.c; sourceTree = "<group>"; };
-		FA322CFF0CEF74B1001761B3 /* lists.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = lists.h; sourceTree = "<group>"; };
-		FA322D000CEF74B1001761B3 /* log.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = log.c; sourceTree = "<group>"; };
-		FA322D010CEF74B1001761B3 /* log.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
-		FA322D020CEF74B1001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D030CEF74B1001761B3 /* match.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = match.c; sourceTree = "<group>"; };
-		FA322D040CEF74B1001761B3 /* match.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = match.h; sourceTree = "<group>"; };
-		FA322D050CEF74B1001761B3 /* messages.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = messages.h; sourceTree = "<group>"; };
-		FA322D060CEF74B1001761B3 /* ngircd.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = ngircd.c; sourceTree = "<group>"; };
-		FA322D070CEF74B1001761B3 /* ngircd.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ngircd.h; sourceTree = "<group>"; };
-		FA322D080CEF74B1001761B3 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = parse.c; sourceTree = "<group>"; };
-		FA322D090CEF74B1001761B3 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = "<group>"; };
-		FA322D0C0CEF74B1001761B3 /* resolve.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = resolve.c; sourceTree = "<group>"; };
-		FA322D0D0CEF74B1001761B3 /* resolve.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = resolve.h; sourceTree = "<group>"; };
-		FA322D100CEF74B1001761B3 /* ansi2knr.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = ansi2knr.1; sourceTree = "<group>"; };
-		FA322D110CEF74B1001761B3 /* ansi2knr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = ansi2knr.c; sourceTree = "<group>"; };
-		FA322D120CEF74B1001761B3 /* exp.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = exp.h; sourceTree = "<group>"; };
-		FA322D130CEF74B1001761B3 /* imp.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imp.h; sourceTree = "<group>"; };
-		FA322D140CEF74B1001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D150CEF74B1001761B3 /* portab.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = portab.h; sourceTree = "<group>"; };
-		FA322D160CEF74B1001761B3 /* portabtest.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = portabtest.c; sourceTree = "<group>"; };
-		FA322D170CEF74B1001761B3 /* splint.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = splint.h; sourceTree = "<group>"; };
-		FA322D180CEF74B1001761B3 /* strdup.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = strdup.c; sourceTree = "<group>"; };
-		FA322D190CEF74B1001761B3 /* strlcpy.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = strlcpy.c; sourceTree = "<group>"; };
-		FA322D1A0CEF74B1001761B3 /* vsnprintf.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = vsnprintf.c; sourceTree = "<group>"; };
-		FA322D1D0CEF74B1001761B3 /* channel-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "channel-test.e"; sourceTree = "<group>"; };
-		FA322D1E0CEF74B1001761B3 /* check-idle.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "check-idle.e"; sourceTree = "<group>"; };
-		FA322D1F0CEF74B1001761B3 /* connect-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "connect-test.e"; sourceTree = "<group>"; };
-		FA322D200CEF74B1001761B3 /* functions.inc */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; path = functions.inc; sourceTree = "<group>"; };
-		FA322D210CEF74B1001761B3 /* getpid.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = getpid.sh; sourceTree = "<group>"; };
-		FA322D220CEF74B1001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D230CEF74B1001761B3 /* mode-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "mode-test.e"; sourceTree = "<group>"; };
-		FA322D250CEF74B1001761B3 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		FA322D260CEF74B1001761B3 /* start-server.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = "start-server.sh"; sourceTree = "<group>"; };
-		FA322D270CEF74B1001761B3 /* stop-server.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = "stop-server.sh"; sourceTree = "<group>"; };
-		FA322D280CEF74B1001761B3 /* stress-A.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "stress-A.e"; sourceTree = "<group>"; };
-		FA322D290CEF74B1001761B3 /* stress-B.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "stress-B.e"; sourceTree = "<group>"; };
-		FA322D2A0CEF74B1001761B3 /* stress-server.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = "stress-server.sh"; sourceTree = "<group>"; };
-		FA322D2B0CEF74B1001761B3 /* test-loop.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = "test-loop.sh"; sourceTree = "<group>"; };
-		FA322D2C0CEF74B1001761B3 /* tests.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = tests.sh; sourceTree = "<group>"; };
-		FA322D2D0CEF74B1001761B3 /* wait-tests.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = "wait-tests.sh"; sourceTree = "<group>"; };
-		FA322D300CEF74B1001761B3 /* ansi2knr.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = ansi2knr.1; sourceTree = "<group>"; };
-		FA322D310CEF74B1001761B3 /* ansi2knr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = ansi2knr.c; sourceTree = "<group>"; };
-		FA322D320CEF74B1001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D330CEF74B1001761B3 /* tool.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = tool.c; sourceTree = "<group>"; };
-		FA322D340CEF74B1001761B3 /* tool.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = tool.h; sourceTree = "<group>"; };
-		FA322D5A0CEF750F001761B3 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = SOURCE_ROOT; };
-		FA322D5B0CEF750F001761B3 /* autogen.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = autogen.sh; path = ../../autogen.sh; sourceTree = SOURCE_ROOT; };
-		FA322D5C0CEF750F001761B3 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = ChangeLog; path = ../../ChangeLog; sourceTree = SOURCE_ROOT; };
-		FA322D5E0CEF750F001761B3 /* config.guess */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = config.guess; path = ../../config.guess; sourceTree = SOURCE_ROOT; };
-		FA322D5F0CEF750F001761B3 /* config.sub */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; name = config.sub; path = ../../config.sub; sourceTree = SOURCE_ROOT; };
-		FA322D600CEF750F001761B3 /* configure.in */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = configure.in; path = ../../configure.in; sourceTree = SOURCE_ROOT; };
-		FA322D610CEF750F001761B3 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = COPYING; path = ../../COPYING; sourceTree = SOURCE_ROOT; };
-		FA322D620CEF750F001761B3 /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = INSTALL; path = ../../INSTALL; sourceTree = SOURCE_ROOT; };
-		FA322D630CEF750F001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = Makefile.am; path = ../../Makefile.am; sourceTree = SOURCE_ROOT; };
-		FA322D640CEF750F001761B3 /* NEWS */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = NEWS; path = ../../NEWS; sourceTree = SOURCE_ROOT; };
-		FA322D650CEF750F001761B3 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = README; path = ../../README; sourceTree = SOURCE_ROOT; };
-		FA322D6A0CEF7523001761B3 /* changelog */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = changelog; sourceTree = "<group>"; };
-		FA322D6B0CEF7523001761B3 /* compat */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = compat; sourceTree = "<group>"; };
-		FA322D6C0CEF7523001761B3 /* control */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = control; sourceTree = "<group>"; };
-		FA322D6D0CEF7523001761B3 /* copyright */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = copyright; sourceTree = "<group>"; };
-		FA322D6E0CEF7523001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D6F0CEF7523001761B3 /* ngircd.default */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngircd.default; sourceTree = "<group>"; };
-		FA322D700CEF7523001761B3 /* ngircd.init */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = ngircd.init; sourceTree = "<group>"; };
-		FA322D710CEF7523001761B3 /* ngircd.postinst */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = ngircd.postinst; sourceTree = "<group>"; };
-		FA322D720CEF7523001761B3 /* rules */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = rules; sourceTree = "<group>"; };
-		FA322D8D0CEF7523001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D8E0CEF7523001761B3 /* ngIRCd.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = ngIRCd.xcodeproj; sourceTree = "<group>"; };
-		FA322D910CEF7523001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D920CEF7523001761B3 /* ngindent */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngindent; sourceTree = "<group>"; };
-		FA322D930CEF7523001761B3 /* ngircd.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = ngircd.sh; sourceTree = "<group>"; };
-		FA322D940CEF7523001761B3 /* ngircd.spec */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngircd.spec; sourceTree = "<group>"; };
-		FA322D950CEF7523001761B3 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		FA322D960CEF7523001761B3 /* systrace.policy */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = systrace.policy; sourceTree = "<group>"; };
-		FA322D9A0CEF752C001761B3 /* FAQ.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = FAQ.txt; sourceTree = "<group>"; };
-		FA322D9B0CEF752C001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322D9C0CEF752C001761B3 /* Platforms.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Platforms.txt; sourceTree = "<group>"; };
-		FA322D9D0CEF752C001761B3 /* Protocol.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Protocol.txt; sourceTree = "<group>"; };
-		FA322D9E0CEF752C001761B3 /* README-AUX.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-AUX.txt"; sourceTree = "<group>"; };
-		FA322D9F0CEF752C001761B3 /* README-BeOS.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-BeOS.txt"; sourceTree = "<group>"; };
-		FA322DA00CEF752C001761B3 /* RFC.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = RFC.txt; sourceTree = "<group>"; };
-		FA322DA40CEF752C001761B3 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; };
-		FA322DA50CEF752C001761B3 /* footer.inc.html */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.html; path = footer.inc.html; sourceTree = "<group>"; };
-		FA322DA60CEF752C001761B3 /* header.inc.html */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.html; path = header.inc.html; sourceTree = "<group>"; };
-		FA322DA70CEF752C001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322DA80CEF752C001761B3 /* ngircd-doc.css */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.css; path = "ngircd-doc.css"; sourceTree = "<group>"; };
-		FA322DA90CEF752C001761B3 /* SSL.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = SSL.txt; sourceTree = "<group>"; };
-		FA322DAD0CEF7538001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FA322DAE0CEF7538001761B3 /* ngircd.8.tmpl */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngircd.8.tmpl; sourceTree = "<group>"; };
-		FA322DAF0CEF7538001761B3 /* ngircd.conf.5.tmpl */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngircd.conf.5.tmpl; sourceTree = "<group>"; };
-		FA322DB10CEF7565001761B3 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		FA322DC00CEF77CB001761B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
-		FA407F2B0DB159F400271AF1 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = Makefile.am; path = ipaddr/Makefile.am; sourceTree = "<group>"; };
-		FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ng_ipaddr.c; path = ipaddr/ng_ipaddr.c; sourceTree = "<group>"; };
-		FA407F2D0DB159F400271AF1 /* ng_ipaddr.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = ng_ipaddr.h; path = ipaddr/ng_ipaddr.h; sourceTree = "<group>"; };
-		FA407F380DB15AC700271AF1 /* GIT.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = GIT.txt; sourceTree = "<group>"; };
-		FA77849A133FB9FF00740057 /* sample-ngircd.conf.tmpl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "sample-ngircd.conf.tmpl"; sourceTree = "<group>"; };
-		FA85178A0FA061EC006A1F5A /* op.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = op.h; sourceTree = "<group>"; };
-		FA85178B0FA061EC006A1F5A /* op.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = op.c; sourceTree = "<group>"; };
-		FA99428A10E82A27007F27ED /* proc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proc.h; sourceTree = "<group>"; };
-		FA99428B10E82A27007F27ED /* proc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = proc.c; sourceTree = "<group>"; };
-		FAA3D2700F139CB300B2447E /* invite-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "invite-test.e"; sourceTree = "<group>"; };
-		FAA3D2710F139CB300B2447E /* join-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "join-test.e"; sourceTree = "<group>"; };
-		FAA3D2720F139CB300B2447E /* kick-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "kick-test.e"; sourceTree = "<group>"; };
-		FAA3D2730F139CB300B2447E /* message-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "message-test.e"; sourceTree = "<group>"; };
-		FAA3D2740F139CB300B2447E /* ngircd-test1.conf */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "ngircd-test1.conf"; sourceTree = "<group>"; };
-		FAA3D2750F139CB300B2447E /* ngircd-test2.conf */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "ngircd-test2.conf"; sourceTree = "<group>"; };
-		FAA3D2760F139CB300B2447E /* opless-channel-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "opless-channel-test.e"; sourceTree = "<group>"; };
-		FAA3D2770F139CB300B2447E /* server-link-test.e */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "server-link-test.e"; sourceTree = "<group>"; };
-		FAA3D2780F139CDC00B2447E /* conf-ssl.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "conf-ssl.h"; sourceTree = "<group>"; };
-		FAA3D2790F139CDC00B2447E /* conn-ssl.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = "conn-ssl.c"; sourceTree = "<group>"; };
-		FAA3D27A0F139CDC00B2447E /* conn-ssl.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = "conn-ssl.h"; sourceTree = "<group>"; };
-		FAA3D27C0F139CF800B2447E /* strtok_r.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = strtok_r.c; sourceTree = "<group>"; };
-		FAA3D27D0F139CF800B2447E /* waitpid.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = waitpid.c; sourceTree = "<group>"; };
-		FAA3D2800F139D1500B2447E /* Services.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Services.txt; sourceTree = "<group>"; };
-		FAA3D2820F139D2E00B2447E /* 01ngircd-contents.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = "01ngircd-contents.xml"; sourceTree = "<group>"; };
-		FAA3D2830F139D2E00B2447E /* 01ngircd.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = 01ngircd.xml; sourceTree = "<group>"; };
-		FAA3D2840F139D2E00B2447E /* 02de-contents.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = "02de-contents.xml"; sourceTree = "<group>"; };
-		FAA3D2850F139D2E00B2447E /* 02de.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = 02de.xml; sourceTree = "<group>"; };
-		FAA3D2860F139D2E00B2447E /* index.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = index.xml; sourceTree = "<group>"; };
-		FAA3D2880F139D2E00B2447E /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-		FAA3D28A0F139D2E00B2447E /* postinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = postinstall.sh; sourceTree = "<group>"; };
-		FAA3D28B0F139D2E00B2447E /* preinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = preinstall.sh; sourceTree = "<group>"; };
-		FAA97C55124A271400D5BBA9 /* sighandlers.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = sighandlers.c; sourceTree = "<group>"; };
-		FAA97C56124A271400D5BBA9 /* sighandlers.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = sighandlers.h; sourceTree = "<group>"; };
-		FAE5CC2C0CF2308A007D69B6 /* numeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = numeric.h; sourceTree = "<group>"; };
-		FAE5CC2D0CF2308A007D69B6 /* numeric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numeric.c; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8DD76FAD0486AB0100D96B5E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FA322DC10CEF77CB001761B3 /* libz.dylib in Frameworks */,
-				FA2D567B11EA1AB300D37A35 /* libpam.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* ngIRCd */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D970CEF752C001761B3 /* doc */,
-				FA322D660CEF7523001761B3 /* contrib */,
-				FA322DAB0CEF7538001761B3 /* man */,
-				FA322CD40CEF74B0001761B3 /* src */,
-				FA322D5A0CEF750F001761B3 /* AUTHORS */,
-				FA322D610CEF750F001761B3 /* COPYING */,
-				FA322D620CEF750F001761B3 /* INSTALL */,
-				FA322D640CEF750F001761B3 /* NEWS */,
-				FA322D650CEF750F001761B3 /* README */,
-				FA322D5B0CEF750F001761B3 /* autogen.sh */,
-				FA322D5C0CEF750F001761B3 /* ChangeLog */,
-				FA322D5E0CEF750F001761B3 /* config.guess */,
-				FA322D5F0CEF750F001761B3 /* config.sub */,
-				FA322D600CEF750F001761B3 /* configure.in */,
-				FA322D630CEF750F001761B3 /* Makefile.am */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-				FA322DC00CEF77CB001761B3 /* libz.dylib */,
-				FA2D567A11EA1AB300D37A35 /* libpam.dylib */,
-			);
-			name = ngIRCd;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				FA322BBA0CEF72E4001761B3 /* ngIRCd */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		FA322CD40CEF74B0001761B3 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				FA322CD70CEF74B1001761B3 /* ngircd */,
-				FA407F270DB1598D00271AF1 /* ipaddr */,
-				FA322D0E0CEF74B1001761B3 /* portab */,
-				FA322D1B0CEF74B1001761B3 /* testsuite */,
-				FA322D2E0CEF74B1001761B3 /* tool */,
-				FA322CD60CEF74B1001761B3 /* Makefile.am */,
-			);
-			name = src;
-			path = ../../src;
-			sourceTree = SOURCE_ROOT;
-		};
-		FA322CD70CEF74B1001761B3 /* ngircd */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D2780F139CDC00B2447E /* conf-ssl.h */,
-				FAA3D2790F139CDC00B2447E /* conn-ssl.c */,
-				FAA3D27A0F139CDC00B2447E /* conn-ssl.h */,
-				FA322CD90CEF74B1001761B3 /* array.c */,
-				FA322CDA0CEF74B1001761B3 /* array.h */,
-				FA322CDB0CEF74B1001761B3 /* channel.c */,
-				FA322CDC0CEF74B1001761B3 /* channel.h */,
-				FA322CDD0CEF74B1001761B3 /* client.c */,
-				FA322CDE0CEF74B1001761B3 /* client.h */,
-				FA322CDF0CEF74B1001761B3 /* conf.c */,
-				FA322CE00CEF74B1001761B3 /* conf.h */,
-				FA322CE10CEF74B1001761B3 /* conn-func.c */,
-				FA322CE20CEF74B1001761B3 /* conn-func.h */,
-				FA322CE30CEF74B1001761B3 /* conn-zip.c */,
-				FA322CE40CEF74B1001761B3 /* conn-zip.h */,
-				FA322CE50CEF74B1001761B3 /* conn.c */,
-				FA322CE60CEF74B1001761B3 /* conn.h */,
-				FA322CE70CEF74B1001761B3 /* defines.h */,
-				FA322CE80CEF74B1001761B3 /* hash.c */,
-				FA322CE90CEF74B1001761B3 /* hash.h */,
-				FA322CEA0CEF74B1001761B3 /* io.c */,
-				FA322CEB0CEF74B1001761B3 /* io.h */,
-				FA322CEC0CEF74B1001761B3 /* irc-channel.c */,
-				FA322CED0CEF74B1001761B3 /* irc-channel.h */,
-				FA322CEE0CEF74B1001761B3 /* irc-info.c */,
-				FA322CEF0CEF74B1001761B3 /* irc-info.h */,
-				FA322CF00CEF74B1001761B3 /* irc-login.c */,
-				FA322CF10CEF74B1001761B3 /* irc-login.h */,
-				FA322CF20CEF74B1001761B3 /* irc-mode.c */,
-				FA322CF30CEF74B1001761B3 /* irc-mode.h */,
-				FA322CF40CEF74B1001761B3 /* irc-op.c */,
-				FA322CF50CEF74B1001761B3 /* irc-op.h */,
-				FA322CF60CEF74B1001761B3 /* irc-oper.c */,
-				FA322CF70CEF74B1001761B3 /* irc-oper.h */,
-				FA322CF80CEF74B1001761B3 /* irc-server.c */,
-				FA322CF90CEF74B1001761B3 /* irc-server.h */,
-				FA322CFA0CEF74B1001761B3 /* irc-write.c */,
-				FA322CFB0CEF74B1001761B3 /* irc-write.h */,
-				FA322CFC0CEF74B1001761B3 /* irc.c */,
-				FA322CFD0CEF74B1001761B3 /* irc.h */,
-				FA322CFE0CEF74B1001761B3 /* lists.c */,
-				FA322CFF0CEF74B1001761B3 /* lists.h */,
-				FA322D000CEF74B1001761B3 /* log.c */,
-				FA322D010CEF74B1001761B3 /* log.h */,
-				FA322D020CEF74B1001761B3 /* Makefile.am */,
-				FA322D030CEF74B1001761B3 /* match.c */,
-				FA322D040CEF74B1001761B3 /* match.h */,
-				FA322D050CEF74B1001761B3 /* messages.h */,
-				FA322D060CEF74B1001761B3 /* ngircd.c */,
-				FA322D070CEF74B1001761B3 /* ngircd.h */,
-				FAE5CC2D0CF2308A007D69B6 /* numeric.c */,
-				FAE5CC2C0CF2308A007D69B6 /* numeric.h */,
-				FA85178B0FA061EC006A1F5A /* op.c */,
-				FA85178A0FA061EC006A1F5A /* op.h */,
-				FA322D080CEF74B1001761B3 /* parse.c */,
-				FA322D090CEF74B1001761B3 /* parse.h */,
-				FA99428B10E82A27007F27ED /* proc.c */,
-				FA99428A10E82A27007F27ED /* proc.h */,
-				FA322D0C0CEF74B1001761B3 /* resolve.c */,
-				FA322D0D0CEF74B1001761B3 /* resolve.h */,
-				FAA97C55124A271400D5BBA9 /* sighandlers.c */,
-				FAA97C56124A271400D5BBA9 /* sighandlers.h */,
-				FA2D564811EA158B00D37A35 /* pam.h */,
-				FA2D564911EA158B00D37A35 /* pam.c */,
-			);
-			path = ngircd;
-			sourceTree = "<group>";
-		};
-		FA322D0E0CEF74B1001761B3 /* portab */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D27C0F139CF800B2447E /* strtok_r.c */,
-				FAA3D27D0F139CF800B2447E /* waitpid.c */,
-				FA322D100CEF74B1001761B3 /* ansi2knr.1 */,
-				FA322D110CEF74B1001761B3 /* ansi2knr.c */,
-				FA322D120CEF74B1001761B3 /* exp.h */,
-				FA322D130CEF74B1001761B3 /* imp.h */,
-				FA322D140CEF74B1001761B3 /* Makefile.am */,
-				FA322D150CEF74B1001761B3 /* portab.h */,
-				FA322D160CEF74B1001761B3 /* portabtest.c */,
-				FA322D170CEF74B1001761B3 /* splint.h */,
-				FA322D180CEF74B1001761B3 /* strdup.c */,
-				FA322D190CEF74B1001761B3 /* strlcpy.c */,
-				FA322D1A0CEF74B1001761B3 /* vsnprintf.c */,
-			);
-			path = portab;
-			sourceTree = "<group>";
-		};
-		FA322D1B0CEF74B1001761B3 /* testsuite */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D2700F139CB300B2447E /* invite-test.e */,
-				FAA3D2710F139CB300B2447E /* join-test.e */,
-				FAA3D2720F139CB300B2447E /* kick-test.e */,
-				FAA3D2730F139CB300B2447E /* message-test.e */,
-				FAA3D2740F139CB300B2447E /* ngircd-test1.conf */,
-				FAA3D2750F139CB300B2447E /* ngircd-test2.conf */,
-				FAA3D2760F139CB300B2447E /* opless-channel-test.e */,
-				FAA3D2770F139CB300B2447E /* server-link-test.e */,
-				FA322D1D0CEF74B1001761B3 /* channel-test.e */,
-				FA322D1E0CEF74B1001761B3 /* check-idle.e */,
-				FA322D1F0CEF74B1001761B3 /* connect-test.e */,
-				FA322D200CEF74B1001761B3 /* functions.inc */,
-				FA322D210CEF74B1001761B3 /* getpid.sh */,
-				FA322D220CEF74B1001761B3 /* Makefile.am */,
-				FA1A6BBC0D6857BB00AA8F71 /* misc-test.e */,
-				FA322D230CEF74B1001761B3 /* mode-test.e */,
-				FA322D250CEF74B1001761B3 /* README */,
-				FA322D260CEF74B1001761B3 /* start-server.sh */,
-				FA322D270CEF74B1001761B3 /* stop-server.sh */,
-				FA322D280CEF74B1001761B3 /* stress-A.e */,
-				FA322D290CEF74B1001761B3 /* stress-B.e */,
-				FA322D2A0CEF74B1001761B3 /* stress-server.sh */,
-				FA322D2B0CEF74B1001761B3 /* test-loop.sh */,
-				FA322D2C0CEF74B1001761B3 /* tests.sh */,
-				FA322D2D0CEF74B1001761B3 /* wait-tests.sh */,
-				FA1A6BBD0D6857D900AA8F71 /* who-test.e */,
-			);
-			path = testsuite;
-			sourceTree = "<group>";
-		};
-		FA322D2E0CEF74B1001761B3 /* tool */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D300CEF74B1001761B3 /* ansi2knr.1 */,
-				FA322D310CEF74B1001761B3 /* ansi2knr.c */,
-				FA322D320CEF74B1001761B3 /* Makefile.am */,
-				FA322D330CEF74B1001761B3 /* tool.c */,
-				FA322D340CEF74B1001761B3 /* tool.h */,
-			);
-			path = tool;
-			sourceTree = "<group>";
-		};
-		FA322D660CEF7523001761B3 /* contrib */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D680CEF7523001761B3 /* Debian */,
-				FA322D730CEF7523001761B3 /* MacOSX */,
-				FA322D910CEF7523001761B3 /* Makefile.am */,
-				FA322D920CEF7523001761B3 /* ngindent */,
-				FA322D930CEF7523001761B3 /* ngircd.sh */,
-				FA322D940CEF7523001761B3 /* ngircd.spec */,
-				FA322D950CEF7523001761B3 /* README */,
-				FA322D960CEF7523001761B3 /* systrace.policy */,
-			);
-			name = contrib;
-			path = ..;
-			sourceTree = SOURCE_ROOT;
-		};
-		FA322D680CEF7523001761B3 /* Debian */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D6A0CEF7523001761B3 /* changelog */,
-				FA322D6B0CEF7523001761B3 /* compat */,
-				FA322D6C0CEF7523001761B3 /* control */,
-				FA322D6D0CEF7523001761B3 /* copyright */,
-				FA322D6E0CEF7523001761B3 /* Makefile.am */,
-				FA322D6F0CEF7523001761B3 /* ngircd.default */,
-				FA322D700CEF7523001761B3 /* ngircd.init */,
-				FA322D710CEF7523001761B3 /* ngircd.postinst */,
-				FA322D720CEF7523001761B3 /* rules */,
-			);
-			path = Debian;
-			sourceTree = "<group>";
-		};
-		FA322D730CEF7523001761B3 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D2810F139D2E00B2447E /* ngIRCd.pmdoc */,
-				FAA3D28A0F139D2E00B2447E /* postinstall.sh */,
-				FAA3D28B0F139D2E00B2447E /* preinstall.sh */,
-				FA322D750CEF7523001761B3 /* build */,
-				FA322D8D0CEF7523001761B3 /* Makefile.am */,
-				FA322D8E0CEF7523001761B3 /* ngIRCd.xcodeproj */,
-				FA322DB10CEF7565001761B3 /* config.h */,
-			);
-			path = MacOSX;
-			sourceTree = "<group>";
-		};
-		FA322D750CEF7523001761B3 /* build */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D760CEF7523001761B3 /* ngIRCd.build */,
-			);
-			path = build;
-			sourceTree = "<group>";
-		};
-		FA322D760CEF7523001761B3 /* ngIRCd.build */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D770CEF7523001761B3 /* Default */,
-				FA322D7F0CEF7523001761B3 /* ngIRCd.pbxindex */,
-			);
-			path = ngIRCd.build;
-			sourceTree = "<group>";
-		};
-		FA322D770CEF7523001761B3 /* Default */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D780CEF7523001761B3 /* ngIRCd.build */,
-			);
-			path = Default;
-			sourceTree = "<group>";
-		};
-		FA322D780CEF7523001761B3 /* ngIRCd.build */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D7A0CEF7523001761B3 /* Objects-normal */,
-			);
-			path = ngIRCd.build;
-			sourceTree = "<group>";
-		};
-		FA322D7A0CEF7523001761B3 /* Objects-normal */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D7B0CEF7523001761B3 /* i386 */,
-				FA322D7D0CEF7523001761B3 /* ppc */,
-			);
-			path = "Objects-normal";
-			sourceTree = "<group>";
-		};
-		FA322D7B0CEF7523001761B3 /* i386 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = i386;
-			sourceTree = "<group>";
-		};
-		FA322D7D0CEF7523001761B3 /* ppc */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = ppc;
-			sourceTree = "<group>";
-		};
-		FA322D7F0CEF7523001761B3 /* ngIRCd.pbxindex */ = {
-			isa = PBXGroup;
-			children = (
-				FA322D880CEF7523001761B3 /* strings.pbxstrings */,
-			);
-			path = ngIRCd.pbxindex;
-			sourceTree = "<group>";
-		};
-		FA322D880CEF7523001761B3 /* strings.pbxstrings */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = strings.pbxstrings;
-			sourceTree = "<group>";
-		};
-		FA322D8F0CEF7523001761B3 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		FA322D970CEF752C001761B3 /* doc */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D2800F139D1500B2447E /* Services.txt */,
-				FA407F380DB15AC700271AF1 /* GIT.txt */,
-				FA322D9A0CEF752C001761B3 /* FAQ.txt */,
-				FA322D9B0CEF752C001761B3 /* Makefile.am */,
-				FA322D9C0CEF752C001761B3 /* Platforms.txt */,
-				FA322D9D0CEF752C001761B3 /* Protocol.txt */,
-				FA322D9E0CEF752C001761B3 /* README-AUX.txt */,
-				FA322D9F0CEF752C001761B3 /* README-BeOS.txt */,
-				FA322DA00CEF752C001761B3 /* RFC.txt */,
-				FA77849A133FB9FF00740057 /* sample-ngircd.conf.tmpl */,
-				FA322DA20CEF752C001761B3 /* src */,
-				FA322DA90CEF752C001761B3 /* SSL.txt */,
-			);
-			name = doc;
-			path = ../../doc;
-			sourceTree = SOURCE_ROOT;
-		};
-		FA322DA20CEF752C001761B3 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				FA322DA40CEF752C001761B3 /* Doxyfile */,
-				FA322DA50CEF752C001761B3 /* footer.inc.html */,
-				FA322DA60CEF752C001761B3 /* header.inc.html */,
-				FA322DA70CEF752C001761B3 /* Makefile.am */,
-				FA322DA80CEF752C001761B3 /* ngircd-doc.css */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		FA322DAB0CEF7538001761B3 /* man */ = {
-			isa = PBXGroup;
-			children = (
-				FA322DAD0CEF7538001761B3 /* Makefile.am */,
-				FA322DAE0CEF7538001761B3 /* ngircd.8.tmpl */,
-				FA322DAF0CEF7538001761B3 /* ngircd.conf.5.tmpl */,
-			);
-			name = man;
-			path = ../../man;
-			sourceTree = SOURCE_ROOT;
-		};
-		FA407F270DB1598D00271AF1 /* ipaddr */ = {
-			isa = PBXGroup;
-			children = (
-				FA407F2B0DB159F400271AF1 /* Makefile.am */,
-				FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */,
-				FA407F2D0DB159F400271AF1 /* ng_ipaddr.h */,
-			);
-			name = ipaddr;
-			sourceTree = "<group>";
-		};
-		FAA3D2810F139D2E00B2447E /* ngIRCd.pmdoc */ = {
-			isa = PBXGroup;
-			children = (
-				FAA3D2820F139D2E00B2447E /* 01ngircd-contents.xml */,
-				FAA3D2830F139D2E00B2447E /* 01ngircd.xml */,
-				FAA3D2840F139D2E00B2447E /* 02de-contents.xml */,
-				FAA3D2850F139D2E00B2447E /* 02de.xml */,
-				FAA3D2860F139D2E00B2447E /* index.xml */,
-				FAA3D2880F139D2E00B2447E /* Makefile.am */,
-			);
-			path = ngIRCd.pmdoc;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8DD76FA90486AB0100D96B5E /* ngIRCd */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "ngIRCd" */;
-			buildPhases = (
-				8DD76FAB0486AB0100D96B5E /* Sources */,
-				8DD76FAD0486AB0100D96B5E /* Frameworks */,
-				8DD76FAF0486AB0100D96B5E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ngIRCd;
-			productInstallPath = "$(HOME)/bin";
-			productName = ngIRCd;
-			productReference = FA322BBA0CEF72E4001761B3 /* ngIRCd */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			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 = (
-				{
-					ProductGroup = FA322D8F0CEF7523001761B3 /* Products */;
-					ProjectRef = FA322D8E0CEF7523001761B3 /* ngIRCd.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				8DD76FA90486AB0100D96B5E /* ngIRCd */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8DD76FAB0486AB0100D96B5E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FA322D350CEF74B1001761B3 /* array.c in Sources */,
-				FA322D360CEF74B1001761B3 /* channel.c in Sources */,
-				FA322D370CEF74B1001761B3 /* client.c in Sources */,
-				FA322D380CEF74B1001761B3 /* conf.c in Sources */,
-				FA322D390CEF74B1001761B3 /* conn-func.c in Sources */,
-				FA322D3A0CEF74B1001761B3 /* conn-zip.c in Sources */,
-				FA322D3B0CEF74B1001761B3 /* conn.c in Sources */,
-				FA322D3C0CEF74B1001761B3 /* hash.c in Sources */,
-				FA322D3D0CEF74B1001761B3 /* io.c in Sources */,
-				FA322D3E0CEF74B1001761B3 /* irc-channel.c in Sources */,
-				FA322D3F0CEF74B1001761B3 /* irc-info.c in Sources */,
-				FA322D400CEF74B1001761B3 /* irc-login.c in Sources */,
-				FA322D410CEF74B1001761B3 /* irc-mode.c in Sources */,
-				FA322D420CEF74B1001761B3 /* irc-op.c in Sources */,
-				FA322D430CEF74B1001761B3 /* irc-oper.c in Sources */,
-				FA322D440CEF74B1001761B3 /* irc-server.c in Sources */,
-				FA322D450CEF74B1001761B3 /* irc-write.c in Sources */,
-				FA322D460CEF74B1001761B3 /* irc.c in Sources */,
-				FA322D470CEF74B1001761B3 /* lists.c in Sources */,
-				FA322D480CEF74B1001761B3 /* log.c in Sources */,
-				FA322D490CEF74B1001761B3 /* match.c in Sources */,
-				FA322D4A0CEF74B1001761B3 /* ngircd.c in Sources */,
-				FA322D4B0CEF74B1001761B3 /* parse.c in Sources */,
-				FA322D4D0CEF74B1001761B3 /* resolve.c in Sources */,
-				FA322DBE0CEF7766001761B3 /* tool.c in Sources */,
-				FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */,
-				FA407F2E0DB159F400271AF1 /* ng_ipaddr.c in Sources */,
-				FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */,
-				FA85178C0FA061EC006A1F5A /* op.c in Sources */,
-				FA99428C10E82A27007F27ED /* proc.c in Sources */,
-				FA2D564A11EA158B00D37A35 /* pam.c in Sources */,
-				FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB928708733DD80010E9CD /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_PEDANTIC = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = ngIRCd;
-			};
-			name = Default;
-		};
-		1DEB928B08733DD80010E9CD /* Default */ = {
-			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";
-				GCC_VERSION = 4.0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
-			};
-			name = Default;
-		};
-		FAB0570C105D917F006AF9E2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				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 = "";
-			};
-			name = Debug;
-		};
-		FAB0570D105D917F006AF9E2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_PEDANTIC = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = ngIRCd;
-			};
-			name = Debug;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "ngIRCd" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB928708733DD80010E9CD /* Default */,
-				FAB0570D105D917F006AF9E2 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB928B08733DD80010E9CD /* Default */,
-				FAB0570C105D917F006AF9E2 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
--- a/contrib/MacOSX/postinstall.sh
+++ b/contrib/MacOSX/postinstall.sh
@@ -1,56 +0,0 @@
-#!/bin/sh
-# ngIRCd Mac OS X postinstall/postupgrade script
-
-LDPLIST="/Library/LaunchDaemons/de.barton.ngircd.plist"
-
-if [ ! -e /etc/ngircd ]; then
-	echo "Creating symlink: /opt/ngircd/etc -> /etc/ngircd"
-	ln -s /opt/ngircd/etc /etc/ngircd || exit 1
-else
-	echo "/etc/ngircd already exists. Don't create symlink."
-fi
-
-if [ ! -e /opt/ngircd/etc/ngircd.conf ]; then
-	echo "Creating default configuration: /opt/ngircd/etc/ngircd.conf"
-	cp /opt/ngircd/share/doc/ngircd/sample-ngircd.conf \
-	 /opt/ngircd/etc/ngircd.conf || exit 1
-else
-	echo "/opt/ngircd/etc/ngircd.conf exists. Don't copy sample file."
-fi
-chmod o-rwx /opt/ngircd/etc/ngircd.conf
-
-if [ ! -e /opt/ngircd/etc/ngircd.pam ]; then
-	echo "Creating default PAM configuration: /opt/ngircd/etc/ngircd.pam"
-	echo "# PAM configuration for ngIRCd" >/opt/ngircd/etc/ngircd.pam
-	echo "" >>/opt/ngircd/etc/ngircd.pam
-	echo "auth required pam_permit.so" >>/opt/ngircd/etc/ngircd.pam
-	echo "#auth required pam_opendirectory.so" >>/opt/ngircd/etc/ngircd.pam
-fi
-chmod 644 /opt/ngircd/etc/ngircd.pam
-
-if [ ! -e /etc/pam.d/ngircd ]; then
-	echo "Linkint /opt/ngircd/etc/ngircd.pam to /etc/pam.d/ngircd"
-	ln -s /opt/ngircd/etc/ngircd.pam /etc/pam.d/ngircd || exit 1
-fi
-
-if [ -f "$LDPLIST" ]; then
-	echo "Fixing ownership and permissions of LaunchDaemon script ..."
-	chown root:wheel "$LDPLIST" || exit 1
-	chmod 644 "$LDPLIST" || exit 1
-fi
-
-if [ -f /tmp/ngircd_needs_restart ]; then
-	echo "ngIRCd should be (re-)started ..."
-	if [ -r "$LDPLIST" ]; then
-		echo "LaunchDaemon script found, starting daemon ..."
-		launchctl load -w "$LDPLIST" || exit 1
-		echo "OK, LaunchDaemon script loaded successfully."
-	else
-		echo "LaunchDaemon script not installed. Can't start daemon."
-	fi
-else
-	echo "Not loading LaunchDaemon script."
-fi
-rm -f /tmp/ngircd_needs_restart
-
-# -eof-
--- a/contrib/MacOSX/preinstall.sh
+++ b/contrib/MacOSX/preinstall.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-# ngIRCd Mac OS X preinstall/preupgrade script
-
-LDPLIST="/Library/LaunchDaemons/de.barton.ngircd.plist"
-
-rm -f /tmp/ngircd_needs_restart || exit 1
-if [ -r "$LDPLIST" ]; then
-	echo "LaunchDaemon script found, checking status ..."
-	launchctl list | fgrep "de.barton.ngIRCd" >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		# ngIRCd is already running; stop it and touch a
-		# "stamp file" so that we know that we have to
-		# restart it after installation/upgrade.
-		echo "ngIRCd is already running; stop it ..."
-		launchctl unload "$LDPLIST" || exit 1
-		echo "Daemon has been stopped."
-		touch /tmp/ngircd_needs_restart || exit 1
-	else
-		echo "ngIRCd is not running."
-	fi
-else
-	echo "LaunchDaemon script not found."
-fi
-
-# -eof-
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,18 +1,20 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2009 Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2004 Alexander Barton <alex@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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
+# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
+# der GNU General Public License (GPL), wie von der Free Software Foundation
+# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
+# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
+# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
+# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+#
+# $Id: Makefile.am,v 1.4 2004/04/28 12:18:02 alex Exp $
 #

 SUBDIRS = Debian MacOSX

-EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh \
-	ngIRCd-Logo.gif ngircd-redhat.init platformtest.sh
+EXTRA_DIST = README ngircd.spec systrace.policy

 maintainer-clean-local:
 	rm -f Makefile Makefile.in
--- a/contrib/README
+++ b/contrib/README
@@ -1,7 +1,7 @@

                     ngIRCd - Next Generation IRC Server

-                        (c)2001-2009 Alexander Barton,
+                      (c)2001-2004 by Alexander Barton,
                    alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -10,26 +10,18 @@
                            -- Contributions --


-Debian/
- - Various files for building Debian GNU/Linux packages (".deb's").
-
 MacOSX/
- - Project files for XCode, the "project builder" of Apple Mac OS X.
+ - Project file for XCode "project builder" of Mac OS X.

-ngindent
- - Script to indent the code of ngIRCd in the "standard way".
-
-ngircd-bsd.sh
- - Start script for FreeBSD.
-
-ngircd-redhat.init
- - Start/stop script for RedHat-based distributions (like CentOS).
+Debian/
+ - Various files for building Debian packages.

 ngircd.spec
 - RPM "spec" file.

-platformtest.sh
- - Build ngIRCd and output a "result line" suitable for doc/Platforms.txt.
-
 systrace.policy
 - Systrace policy file for OpenBSD (and probably NetBSD).
+
+
+--
+$Id: README,v 1.1 2004/04/28 12:18:50 alex Exp $
--- a/contrib/ngIRCd-Logo.gif
+++ b/contrib/ngIRCd-Logo.gif
--- a/contrib/ngindent
+++ b/contrib/ngindent
@@ -1,16 +0,0 @@
-#/bin/sh
-
-INDENTARGS="-kr -i8 -ts8 -l80 -c3 -cd41 -ss -ncs -psl"
-
-# check if indent(1) is available
-type indent >/dev/null 2>&1 && INDENT="indent"
-type gnuindent >/dev/null 2>&1 && INDENT="gnuindent"
-
-if [ -z "$INDENT" ]; then
-	echo "Error: GNU \"indent\" not found!"
-	exit 1
-fi
-
-$INDENT -v $INDENTARGS $*
-
-# -eof-
--- a/contrib/ngircd-bsd.sh
+++ b/contrib/ngircd-bsd.sh
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: ngircd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-# Add the following line to /etc/rc.conf to enable `ngircd':
-#
-#ngircd_enable="YES"
-#
-
-. "/etc/rc.subr"
-
-name="ngircd"
-rcvar=`set_rcvar`
-
-command="/usr/local/sbin/ngircd"
-command_args=""
-
-load_rc_config "$name"
-: ${ngircd_enable="NO"}
-: ${ngircd_flags=""}
-
-required_files="/usr/local/etc/$name.conf"
-pidfile="${ngircd_pidfile:-/var/run/${name}/${name}.pid}"
-
-if [ ! x"${ngircd_chrootdir}" = x ];then
-	# Mount a devfs in the chroot directory if needed
-	if [ ! -c ${ngircd_chrootdir}/dev/random \
-	  -o ! -c ${ngircd_chrootdir}/dev/null ]; then
-		umount ${ngircd_chrootdir}/dev 2>/dev/null
-		mount_devfs devfs ${ngircd_chrootdir}/dev
-	fi
-
-	devfs -m ${ngircd_chrootdir}/dev rule apply hide
-	devfs -m ${ngircd_chrootdir}/dev rule apply path null unhide
-	devfs -m ${ngircd_chrootdir}/dev rule apply path random unhide
-
-	# Copy local timezone information if it is not up to date.
-	if [ -f /etc/localtime ]; then
-		cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
-			cp -p /etc/localtime "${named_chrootdir}/etc/localtime"
-	fi
-
-	pidfile="${ngircd_chrootdir}${pidfile}"
-fi
-
-run_rc_command "$1"
-
-# -eof-
--- a/contrib/ngircd-redhat.init
+++ b/contrib/ngircd-redhat.init
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-# ngIRCd start and stop script for RedHat based distributions.
-# Written by Naoya Nakazawa <naoya.n@gmail.com> for CentOS 5.2, 2009.
-#
-# chkconfig: 2345 01
-# description: ngIRCd is an Open Source server for \
-#              the Internet Relay Chat (IRC), which \
-#              is developed and published under \
-#              the terms of the GNU General Public
-#              Licence (URL: http://www.gnu.org/licenses/gpl.html). \
-#              ngIRCd means "next generation IRC daemon", \
-#              it's written from scratch and not deduced from the \
-#              "grandfather of IRC daemons", the daemon of the IRCNet.
-#
-# processname: /usr/sbin/ngircd
-# config: /etc/ngircd
-# pidfile: /var/run/ngircd.pid
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/ngircd
-NAME=ngIRCd
-BASENAME=ngircd
-CONF=/etc/$BASENAME.conf
-DESC="IRC daemon"
-PARAMS="-f $CONF"
-
-# Source function library.
-. /etc/init.d/functions
-
-# Get config.
-test -f /etc/sysconfig/network && . /etc/sysconfig/network
-test -f /etc/sysconfig/makuosan && . /etc/sysconfig/makuosan
-
-# Check that networking is up.
-[ "${NETWORKING}" = "yes" ] || exit 0
-
-[ -x $DAEMON ] || exit 1
-[ -f $CONF ] || exit 2
-
-RETVAL=0
-
-start(){
-    echo -n $"Starting $NAME: "
-    daemon $DAEMON $PARAMS
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
-    echo
-    return $RETVAL
-}
-
-stop(){
-    echo -n $"Stopping $NAME: "
-    killproc $DAEMON
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ] ; then
-        rm -f /var/lock/subsys/$BASENAME
-    fi
-    echo
-    return $RETVAL
-}
-
-reload(){
-    echo -n $"Reloading configuration: "
-    killproc $DAEMON -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
-}
-
-restart(){
-    stop
-    start
-}
-
-condrestart(){
-    [ -e /var/lock/subsys/$BASENAME ] && restart
-    return 0
-}
-
-check_config(){
-     $DAEMON $PARAMS --configtest >/dev/null 2>&1
-     [ $? -eq 0 ] && return 0
-
-     echo -n $"Configuration of $NAME is not valid, won't (re)start!"
-     echo -n $"Run \"$DAEMON --configtest\" and fix it up ..."
-     exit 6
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        check_config
-	start
-	;;
-    stop)
-	stop
-	;;
-    status)
-	status $NAME
-	;;
-    restart)
-	restart
-	;;
-    reload)
-	reload
-	;;
-    condrestart)
-	condrestart
-	;;
-    test)
-        check_config
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|test}"
-	RETVAL=1
-esac
-
-exit $RETVAL
--- a/contrib/ngircd.spec
+++ b/contrib/ngircd.spec
@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version 18~rc2
+%define version 0.8.3
 %define release 1
 %define prefix  %{_prefix}

@@ -7,12 +7,12 @@ Summary:      A lightweight daemon for the Internet Relay Chat (IRC)
 Name:         %{name}
 Version:      %{version}
 Release:      %{release}
-License:      GPLv2+
-Group:        System Environment/Daemons
-URL:          http://ngircd.barton.de/
+Copyright:    GPL
+Group:        Networking/Daemons
+URL:          http://arthur.ath.cx/~alex/ngircd/
 Source:       %{name}-%{version}.tar.gz
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  zlib-devel, openssl-devel
+Packager:     Sean Reifschneider <jafo-rpms@tummy.com>
+BuildRoot:    /var/tmp/%{name}-root

 %description
 ngIRCd is a free open source daemon for the Internet Relay Chat (IRC),
@@ -29,13 +29,10 @@ ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
 mixed networks.

 %prep
-%setup -q
+%setup
 %build
-%configure \
-  --with-zlib \
-  --with-openssl
-
-make %{?_smp_mflags}
+%configure
+make

 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
@@ -45,7 +42,6 @@ make %{?_smp_mflags}
   ( cd usr/sbin; mv *-ngircd ngircd )
   ( cd usr/share/man/man5; mv *-ngircd.conf.5 ngircd.conf.5 )
   ( cd usr/share/man/man8; mv *-ngircd.8 ngircd.8 )
-   rm -fr usr/share/doc/ngircd
 )

 %clean
@@ -53,8 +49,7 @@ make %{?_smp_mflags}

 %files
 %defattr(755,root,root)
-%doc AUTHORS  COPYING  ChangeLog  INSTALL NEWS  README doc/*
+%doc AUTHORS  COPYING  ChangeLog  INSTALL NEWS  README
 %config(noreplace) /etc
 %{_prefix}/sbin
-%{_mandir}/man5/ngircd.conf*
-%{_mandir}/man8/ngircd.8*
+%{_prefix}/share/man/
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -1,156 +0,0 @@
-#!/bin/sh
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton <alex@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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-
-# This script analyzes the build process of ngIRCd and generates output
-# suitable for inclusion in doc/Platforms.txt -- please send reports
-# to the ngIRCd mailing list: <ngircd-ml@ngircd.barton.de>.
-
-NAME=`basename "$0"`
-VERBOSE=
-
-PLATFORM=
-COMPILER="unknown"
-VERSION="unknown"
-DATE=`date "+%y-%m-%d"`
-
-CONFIGURE=
-MAKE=
-CHECK=
-RUN=
-COMMENT=
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-		"-v")
-			VERBOSE=1
-			;;
-		*)
-			echo "Usage: $NAME [-v]"
-			exit 2
-	esac
-	shift
-done
-
-echo "$NAME: Checking ngIRCd base source directory ..."
-grep "ngIRCd" ./ChangeLog >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-	grep "ngIRCd" ../ChangeLog >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		echo "$NAME: ngIRCd base source directory not found!?"
-		exit 1
-	fi
-	cd ..
-fi
-
-echo "$NAME: Checking for \"./autogen.sh\" script ..."
-if [ -r ./autogen.sh ]; then
-	echo "$NAME: Running \"./autogen.sh\" ..."
-	[ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null
-fi
-
-if [ -r ./configure ]; then
-	echo "$NAME: Running \"./configure\" script ..."
-	[ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null
-	if [ $? -eq 0 -a -r ./Makefile ]; then
-		CONFIGURE=1
-		echo "$NAME: Running \"make\" ..."
-		[ -n "$VERBOSE" ] && make || make >/dev/null
-		if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then
-			MAKE=1
-			echo "$NAME: Running \"make check\" ..."
-			[ -n "$VERBOSE" ] && make check || make check >/dev/null
-			if [ $? -eq 0 ]; then
-				CHECK=1
-				RUN=$CHECK
-			else
-				./src/ngircd/ngircd --help 2>/dev/null \
-				 | grep "^ngircd" >/dev/null
-				[ $? -eq 0 ] && RUN=1
-			fi
-		fi
-	fi
-fi
-
-# Get target platform information
-if [ -r "src/config.h" ]; then
-	CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2`
-	OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2`
-	VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2`
-	PLATFORM="$CPU/$VENDOR/$OS"
-fi
-if [ -z "$PLATFORM" ]; then
-	PLATFORM="`uname 2>/dev/null` `uname -r 2>/dev/null`, `uname -m 2>/dev/null`"
-fi
-
-# Get compiler information
-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 -1 \
-		  | cut -d')' -f2 | cut -d' ' -f2)
-		COMPILER="gcc $COMPILER"
-	else
-		case "$CC" in
-		  gcc*)
-			v="`$CC --version 2>/dev/null | head -1`"
-			[ -n "$v" ] && COMPILER="gcc $v"
-			;;
-		esac
-	fi
-fi
-
-# Get ngIRCd version information
-eval $(grep "^VERSION = " Makefile | sed -e 's/ //g')
-case "$VERSION" in
-	*-*-*)
-		VERSION=`echo "$VERSION" | cut -d'-' -f3 | cut -b2-`
-		;;
-esac
-[ -n "$VERSION" ] || VERSION="unknown"
-
-# Get IO interface information
-if [ "$OS" = "linux-gnu" ]; then
-	COMMENT="(1)"
-else
-	grep "^#define HAVE_SYS_DEVPOLL_H 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(4)"
-	grep "^#define HAVE_EPOLL_CREATE 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(5)"
-	grep "^#define HAVE_KQUEUE 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(3)"
-fi
-
-[ -n "$CONFIGURE" ] && C="Y" || C="N"
-[ -n "$MAKE" ] && M="Y" || M="N"
-[ -n "$CHECK" ] && T="Y" || T="N"
-[ -n "$RUN" ] && R="Y" || R="N"
-[ -n "$COMMENT" ] && COMMENT=" $COMMENT"
-
-echo
-echo "                              the executable works (\"runs\") as expected --+"
-echo "                                tests run successfully (\"make check\") --+ |"
-echo "                                           ngIRCd compiles (\"make\") --+ | |"
-echo "                                                ./configure works --+ | | |"
-echo "                                                                    | | | |"
-echo "Platform                    Compiler     ngIRCd     Date     Tester C M T R See"
-echo "--------------------------- ------------ ---------- -------- ------ - - - - ---"
-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
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +0,0 @@
-sample-ngircd.conf
--- a/doc/Bopm.txt
+++ b/doc/Bopm.txt
@@ -1,53 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2010 Alexander Barton,
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                                -- BOPM.txt --
-
-
-I. Introduction
-~~~~~~~~~~~~~~~~
-
-Citing <http://wiki.blitzed.org/BOPM>: "BOPM is an open source open proxy
-monitor, designed for use with hybrid-based ircds, although it can be used
-with slight modification on any server which has the ability to show connects
-to opers and that supports KLINEs."
-
-And starting with Release 17, ngIRCd supports all required log messages that
-BOPM requires to be useful.
-
-II. Installation
-~~~~~~~~~~~~~~~~~
-
-Install BOPM as usual, please see the BOPM documentation for details.
-Afterwards adjust the following configuration parameters that are important
-for ngIRCd:
-
-a) BOPM "IRC" section:
-
-  1) Set "server" and "port" accordingly,
-
-  2) adjust the "oper" line to match an [Operator] block in ngircd.conf,
-
-  3) change "mode" to "+ci" or "+c".
-
-  4) Set "connregex" to the following string, everything in one line(!):
-     "\\*\\*\\* Notice -- Client connecting: ([^ ]+) \\(([^@]+)@([^\\)]+)\\) \\[([0-9\\.]+)\\].*";
-     and comment all the other "connregex" examples (prepend a "#" character).
-
-  5) Set "kline" to "KILL %n :Open proxy found on your host!"; for example,
-     and comment all the other "kline" examples.
-
-b) BOPM "scanner" section:
-
-  Make sure you configure a valid "target_ip" and "target_port" for the
-  configured scanners to test. And please note that you CAN'T USE the port
-  of ngIRCd, because ngIRCd doesn't send any banner message by default!
-
-  So you need a service what sends a banner, so for example POP3, SMTP,
-  IMAP, or SSH daemons should work ...
--- a/doc/CVS.txt
+++ b/doc/CVS.txt
@@ -0,0 +1,56 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001-2003 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+               ngIRCd is free software and published under the
+                   terms of the GNU General Public License.
+
+                                 -- CVS.txt --
+
+
+The source code of ngIRCd is maintained using the "Concurrent Versions
+System" (CVS). Thereby several developers can work with the source tree at
+the same time.
+
+
+I. Anonymous read-only Access
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To access the source tree anonymously in read-only mode, follow these steps:
+
+Login to the CVS server:
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd login
+
+Use "anonymous" as user name and no password (just hit Return). Now you can
+check out the sources:
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd checkout ngircd
+
+Thereby a new folder "ngircd" will be created containing all the individual
+source files.
+
+This is the "working folder", all CVS commands will be executed from within
+this folder in the future.
+
+Please note: When checking out a fresh copy of ngIRCd from CVS, the
+configure script doesn't exist; you have to run the autogen.sh shell script
+(which is included in the source tree) to generate it. This requires you to
+have GNU automake and GNU autoconf installed on your system.
+
+Updating the CVS tree:
+
+ $ cvs update -d -P [<filename>]
+
+You can update a single file or the complete source tree.
+
+
+III. Write Access
+~~~~~~~~~~~~~~~~~
+If you want to contribute a couple of patches and write access to the CVS
+repository would be handy, please contact Alex Barton, <alex@barton.de>.
+
+
+-- 
+$Id: CVS.txt,v 1.7 2003/03/26 22:34:33 alex Exp $
--- a/doc/Contributing.txt
+++ b/doc/Contributing.txt
@@ -1,54 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/
-
-               (c)2001-2011 Alexander Barton and Contributors.
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                            -- Contributing.txt --
-
-
-If you want to contribute to ngIRCd, please read the following paragraphs to
-get an idea of how to do it the best :-)
-
- - Use GIT
-
-   The source code of ngIRCd is maintained using GIT, see doc/GIT.txt. So if
-   remotely possible, use GIT for your work, too. It makes your and our lifes
-   much easier ;-)
-
- - Don't forget to include documentation
-
-   When adding features and new configuration options, don't forget to not
-   only code the features but to describe them in doc/sample-ngircd.conf,
-   man/ngircd.8.tmp and/or man/ngircd.conf.5.tmpl as well!
-
- - Be present on IRC
-
-   If you intend to code some new features or do some code cleanups or better
-   documentation, please be present on <irc://irc.barton.de/#ngircd> and
-   discuss your plans early! So other developers have an idea on what others
-   are working on, can offer help, and can synchronize their own work.
-
- - Check and validate your work!
-
-   Use "make check" to validate your work, and use "make distcheck" to
-   validate the resulting archives, especially when adding/removing files!
-
- - Send patches in "unified diff" format
-
-   Please send patches in "unified" format, that is, use "diff -u".
-   Or even better: use GIT ("git diff"), see above.
-
- - Send patches to the mailing list
-
-   If you have some code to present, send the patch(es) and/or pointers to
-   your GIT repository to the official ngIRCd mailing list for review, not
-   only to #ngircd: so it becomes archived and more people have a chance to
-   review your patch.
-
-   Sure it is a good idea to post some notes to #ngircd, too! :-)
-
-   And this is open source, your work must not be 100% finished and perfect,
-   work in progress is interesting, too: "release early, release often"!
--- a/doc/FAQ.txt
+++ b/doc/FAQ.txt
@@ -1,7 +1,7 @@

                     ngIRCd - Next Generation IRC Server

-                      (c)2001-2010 by Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                    alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -12,14 +12,12 @@

 I. General
 ~~~~~~~~~~
-
 Q: Is it possible to link the ngIRCd with non-ngIRCd servers?
 A: Yes. ngIRCd is compatible to the original ircd used by IRCNet. Actually
-   this is being tested with version 2.10.3p3. Please note that newer
-   versions (2.11.x) aren't compatible any more!
+   this is being tested with version 2.10.3p3.

 Q: Is there a homepage with further information and downloads?
-A: Yes. Please visit <http://ngircd.barton.de/>.
+A: Yes. Please visit <http://arthur.ath.cx/~alex/ngircd/>.

 Q: Why should I use ngIRCd instead of the original one?
 A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to
@@ -28,7 +26,6 @@ A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to

 II. Compilation
 ~~~~~~~~~~~~~~~
-
 Q: I did a "CVS checkout" but can't execute ./configure because the script
   is missing in the generated directory!?
 A: When using development versions via CVS, the configure script as well as
@@ -54,43 +51,17 @@ A: Most probably you are using version 1.5 of GNU automake which seems to be
   1.4 of GNU automake shipped with this distribution; it should work, too.)


-III. Runtime
-~~~~~~~~~~~~
-
-Q: Where is the log file located?
-A: ngIRCd does not write its own log file. Instead, ngIRCd uses syslog(3).
-   Check the files in /var/log/ and/or consult the documentation for your
-   system logger daemon.
-
-Q: I cannot connect to remote peers when I use the chroot option, the
-   following is logged: "Can't resolve example.com: unknown error!".
-A: On Linux/glibc with chroot enabled you need to put some libraries inside
-   the chroot as well, notably libnss_dns; maybe others. Unfortunately, even
-   linking ngIRCd statically does not help this. The only known workaround
-   is to either disable chroot support or to link against dietlibc instead
-   of glibc. (tnx to Sebastian Siewior)
-
-Q: I have added an [Oper] section, how do i log on as IRC operator?
-A: You can use the /OPER command in your IRC client to become an IRC operator.
-   ngIRCd will also log all OPER requests (using syslog), if OPER fails you
-   can look there to determine why it did not work (bad password, unauthorized
-   host mask, etc.)
-
-Q: I am an IRC operator, but MODE doesn't work!
-A: You need to set 'OperCanUseMode = yes' in ngircd.conf, then IRC operators
-   can use the MODE command for changing modes even when they are not joined
-   to the specific channel.
-
-
-IV. Bugs!?
-~~~~~~~~~~
-
+III. Bugs!?
+~~~~~~~~~~~
 Q: Is there a list of known bugs and desired feature enhancements?
 A: Yes. Have a look at the bug tracking system (Bugzilla) for ngIRCd located
-   at <http://ngircd.barton.de/bugzilla/index.cgi>. There you can file bug
-   reports and feature requests as well as search the bug database.
+   at <http://arthur.ath.cx/bugzilla/ngircd/>. There you can file bug reports
+   and feature requests as well as search the bug database.

 Q: What should I do if I found a bug?
-A: Please file a bug report at <http://ngircd.barton.de/bugzilla/index.cgi>!
+A: Please file a bug report at <http://arthur.ath.cx/bugzilla/ngircd/>!
   The author of the particular component will be notified automagically :-)

+
+-- 
+$Id: FAQ.txt,v 1.7 2003/11/07 21:32:15 alex Exp $
--- a/doc/GIT.txt
+++ b/doc/GIT.txt
@@ -1,54 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-                           http://ngircd.barton.de/
-
-               (c)2001-2011 Alexander Barton and Contributors.
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                                 -- GIT.txt --
-
-
-The source code of ngIRCd is maintained using git, the stupid content
-tracker.
-
-
-I. Getting the source code
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-To access the source tree anonymously, run:
-
- $ git clone git://ngircd.barton.de/ngircd.git
-
-Thereby a new folder "ngircd" will be created containing all the individual
-source files.
-
-The newly created directory ("ngircd") is the "working directory", all
-git commands will be executed from within this directory in the future.
-
-Please note: When checking out a fresh copy of ngIRCd using git, the
-configure script doesn't exist; you have to run the autogen.sh shell script
-(which is included in the source tree) to generate it. This requires you to
-have GNU automake and GNU autoconf installed on your system. Please see the
-file INSTALL for details!
-
-To update the git tree:
-
- $ git pull
-
-This retrieves all changes and merges them into the current branch.
-
-
-II. Contributing
-~~~~~~~~~~~~~~~~
-
-Patches should be sent to the ngircd mailing list. List homepage:
-http://arthur.barton.de/mailman/listinfo/ngircd-ml
-
-If you do not want to send them to the list, you can also mail them
-to Alex Barton, <alex@barton.de>.
-
-
-III. Write Access
-~~~~~~~~~~~~~~~~~
-If you want to contribute a couple of patches and write access to the git
-repository would be handy, please contact Alex Barton, <alex@barton.de>.
--- a/doc/HowToRelease.txt
+++ b/doc/HowToRelease.txt
@@ -1,77 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2010 Alexander Barton,
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                            -- HowToRelease.txt --
-
-
-I. Introduction
-~~~~~~~~~~~~~~~
-
-Creating a new ngIRCd release requires a few steps to follow: the source
-tree must be in a releasable state (be up to date, include all required
-patches, be tested on as many platforms as possible), a name for the new
-release must be chosen, and all the files describing the release must be
-updated accordingly.
-
-Since ngIRCd release 13 (2009-12-25) we use "simple" release numbers for
-major releases (e.g. "13", "17", "42", ...) introducing new features and
-sub-releases for bug fixes only (e.g. "14.1", "22.3", ...).
-
-When creating pre-releases or release candidates, please use the tilde ("~")
-character to separate the "postfix" in the release number (e.g. "17~rc2"
-or "123.4~rc6").
-
-The release/version number of a build is automatically generated using the
-GIT "describe" command, see git-describe(1). Therefore it is required that
-a new release is tagged in the GIT tree and that the configure script is
-up-to-date (e.g. using ./autogen.sh) before generating the archives!
-
-
-II. How to prepare a new ngIRCd release?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-a) Make sure the source tree is in a releasable state ;-)
-
-b) Make sure you have working versions of GNU autoconf and GNU automake
-   installed on the system you use for generating the release:
-   as of October 2010 we are using GNU autoconf 2.61 and GNU automake 1.10.1
-   which seem to work just fine.
-
-c) Update the files describing the new release:
-    - ChangeLog
-    - NEWS
-
-d) Update the version numbers in the following files:
-    - contrib/ngircd.spec
-
-e) Generate a new Debian change log entry in the following file, e.g. using
-   the Debian "dch" tool of the "devscripts" package:
-    - contrib/Debian/changelog
-
-f) Commit the above changes to GIT: "git add", "git commit"
-
-g) Create a new signed GIT tag for the new release: "git tag -s".
-   Please note that we don't use the tilde ("~") here, instead use a simple
-   hyphen ("-") as delimiter: e.g. "rel-16" "rel-17-rc1", "rel-18-pre2", ...
-
-h) Run "./autogen.sh" to update the ./configure script with the correct
-   release number (autogenerated using "git describe", see above).
-
-i) Run "./configure" to rebuild all generated Makefiles.
-
-j) Run "make distcheck" to generate the distribution archives.
-
-k) Sign the distribution archive(s) using GnuPG: "gpg -b <archivefile>"
-
-l) Upload and distribute the newly generated ngIRCd release archive(s)
-   and GnuPG signatures.
-
-m) Write an announcement to the mailing list, freshmeat, Twitter, ...
-
-n) Relax :-)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
 #
 # Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
 # der GNU General Public License (GPL), wie von der Free Software Foundation
@@ -9,52 +9,31 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
+# $Id: Makefile.am,v 1.17 2003/04/22 23:50:18 alex Exp $
+#

-.tmpl:
-	sed \
-	    -e s@:ETCDIR:@${sysconfdir}@ \
-	    <$< >$@
-
-SUFFIXES = .tmpl
-
-static_docs = Bopm.txt FAQ.txt GIT.txt HowToRelease.txt PAM.txt Platforms.txt \
-	Protocol.txt README-AUX.txt README-BeOS.txt README-Interix.txt RFC.txt \
-	SSL.txt Services.txt
-
-doc_templates = sample-ngircd.conf.tmpl
-
-generated_docs = sample-ngircd.conf
-
-toplevel_docs = ../AUTHORS ../COPYING ../ChangeLog ../INSTALL ../NEWS ../README
-
-SUBDIRS = src
-
-EXTRA_DIST = $(static_docs) $(doc_templates)
-
-CLEANFILES = $(generated_docs)
+EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt Platforms.txt \
+	README-AUX.txt README-BeOS.txt RFC.txt sample-ngircd.conf

 maintainer-clean-local:
 	rm -f Makefile Makefile.in

-all: $(generated_docs)
+docdir = $(datadir)/doc/$(PACKAGE)

-install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
+documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \
+	../NEWS ../README
+
+install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
-	  $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
+	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
 	 fi
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for f in $(static_docs) $(toplevel_docs); do \
+	for f in $(documents); do \
 	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
 	 done
-	for f in $(generated_docs); do \
-	  $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \
-	 done

 uninstall-hook:
 	rm -rf $(DESTDIR)$(docdir)

-srcdoc:
-	make -C src srcdoc
-
 # -eof-
--- a/doc/PAM.txt
+++ b/doc/PAM.txt
@@ -1,36 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2010 Alexander Barton,
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                                 -- PAM.txt --
-
-
-ngIRCd can optionally be compiled to use PAM, the Pluggable Authentication
-Modules library, for user authentication. When compiled with PAM support,
-ngIRCd will authenticate all users connecting to the daemon using the
-configured PAM modules in an asynchronous child process.
-
-To enable PAM, you have to pass the command line parameter "--with-pam" to
-the "configure" script. Please see the PAM documentation ("man 7 pam") for
-details and information about configuring PAM and its individual modules.
-
-A very simple -- and quite useless ;-) -- example would be:
-
-	/etc/pam.d/ngircd:
-	  auth  required  pam_debug.so
-
-Here the "pam_debug" module will be called each time a client connects to
-the ngIRCd and has sent its PASS, NICK, and USER commands.
-
-Please note ONE VERY IMPORTANT THING:
-
-All the PAM modules are executed with the privileges of the user ngIRCd
-is running as. Therefore a lot of PAM modules aren't working as expected,
-because they need root privileges ("pam_unix", for example)!
-Only PAM modules not(!) requiring root privileges (such as "pam_pgsql",
-"pam_mysql", "pam_opendirectory" ...) can be used in conjunction with ngIRCd.
--- a/doc/Platforms.txt
+++ b/doc/Platforms.txt
@@ -1,7 +1,7 @@

                     ngIRCd - Next Generation IRC Server

-                        (c)2001-2010 Alexander Barton
+                        (c)2001-2004 Alexander Barton
                    alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -26,66 +26,38 @@ list can be updated. Thanks for your help!
                                                                    | | | |
 Platform                    Compiler     ngIRCd     Date     Tester C M T R See
 --------------------------- ------------ ---------- -------- ------ - - - - ---
-alpha/unknown/netbsd3.0     gcc 3.3.3    CVSHEAD    06-05-07 fw     Y Y Y Y (3)
 hppa/unknown/openbsd3.5     gcc 2.95.3   CVSHEAD    04-05-25 alex   Y Y Y Y
 hppa1.1/unknown/linux-gnu   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
-hppa2.0/unknown/linux-gnu   gcc 3.3.5    13~rc1     08-12-02 alex   Y Y Y Y
-hppa2.0w-hp-hpux11.11       gcc 4.2.3    14.1       09-07-22 goetz  Y Y Y Y
-i386/apple/darwin9.7.0      gcc 4.0.1    14.1       09-08-04 alex   Y Y Y Y (3)
-i386/apple/darwin10.4.0     gcc 4.2.1    17         10-11-07 alex   Y Y Y Y (3)
 i386/pc/solaris2.9          gcc 3.2.2    CVSHEAD    04-02-24 alex   Y Y Y Y
-i386/pc/solaris2.11         gcc 3.4.3    17         10-11-07 alex   Y Y N Y (4)
 i386/unknown/freebsd5.2.1   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
-i386/unknown/freebsd6.2     gcc 3.4.6    17         10-11-07 alex   Y Y Y Y (3)
-i386/unknown/freebsd7.3     gcc 4.2.1    17         10-11-07 alex   Y Y Y Y (3)
-i686/unknown/gnu0.3         gcc 4.4.5    17         10-11-07 alex   Y Y Y Y
-i686/unkn./kfreebsd7.2-gnu  gcc 4.3.4    15         09-12-02 alex   Y Y Y Y (3)
+i386/unknown/gnu0.3         gcc 3.3.3    0.8.0      04-05-30 alex   Y Y n Y
 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         10-11-07 alex   Y Y Y Y (3)
-i386/unknown/netbsdelf5.0.2 gcc 4.1.3    17         10-11-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
-i686/pc/cygwin              gcc 3.3.1    0.8.0      04-05-30 alex   Y Y N Y
+i686/pc/cygwin              gcc 3.3.1    0.8.0      04-05-30 alex   Y Y n Y
 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         10-11-07 alex   Y Y N Y
-m68k/apple/aux3.0.1         Orig. A/UX   17         10-11-07 alex   Y Y N Y (2)
+i686/pc/linux-gnu           gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y (1)
 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 ? ?
 powerpc/apple/darwin6.5     gcc 3.1      0.7.x-CVS  03-04-23 alex   Y Y Y Y
-powerpc/apple/darwin7.9.0   gcc 3.3      CVSHEAD    06-05-07 fw     Y Y Y Y (3)
-powerpc/apple/darwin8.1.0   gcc 4.0      0.9.x-CVS  05-06-27 alex   Y Y Y Y
+powerpc/apple/darwin7.4.0   gcc 3.3      0.8.0      04-05-30 alex   Y Y Y Y
 powerpc/unknown/linux-gnu   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
-powerpc/unknown/openbsd3.6  gcc 2.95.3   0.10.0     06-10-08 alex   Y Y N Y
 sparc/sun/solaris2.6        gcc 2.95.3   0.7.x-CVS  03-04-22 alex   Y Y Y Y
 sparc/sun/solaris2.7        gcc 3.3      0.8.0      04-05-30 alex   Y Y Y Y
 sparc/unkn./netbsdelf1.6.1  gcc 2.95.3   0.8.0      04-05-30 alex   Y Y Y Y
-x86_64/unknown/freebsd8.1   gcc 4.2.1    17         10-11-07 alex   Y Y Y Y (3)
-x86_64/unknown/linux-gnu    gcc 4.3.2    17         10-11-07 alex   Y Y Y Y (1)
-x86_64/unknown/openbsd4.7   gcc 3.3.5    17         10-11-07 alex   Y Y Y Y (3)


 Notes
 ~~~~~
-
-(1) i686/pc/linux-gnu & x86_64/unknown/linux-gnu:
+(1) i686/pc/linux-gnu:
    ngIRCd has been tested with various Linux distributions, such as SuSE,
    RedHat, Debian, and Gentoo using Kernels 2.2.x, 2.4.x and 2.6.x with
-    various versions of the GNU C compiler (starting with 2.95.x and up to
-    version 4.3.x). The eldest glibc used was glibc-2.0.7. ngIRCd compiled
-    and run on all these systems without problems.
-    Actual Linux kernels (2.6.x) and glibc's support the epoll() IO interface.
+    various versions of the GNU C compiler (2.95.3, 3.0, 3.2, and 3.3). The
+    eldest glibc used was glibc-2.0.7. ngIRCd compiled and run on all these
+    systems without problems.

 (2) This compiler is an pre-ANSI C compiler, therefore the source code is
    automatically converted using the included ansi2knr tool while building.
+			

-(3) Using the kqueue() IO interface.
-
-(4) Using the /dev/poll IO interface.
-
-(5) Using the epoll() IO interface.
+-- 
+$Id: Platforms.txt,v 1.11.2.1 2004/11/09 10:58:01 alex Exp $
--- a/doc/Protocol.txt
+++ b/doc/Protocol.txt
@@ -1,7 +1,7 @@

                     ngIRCd - Next Generation IRC Server

-                        (c)2001-2008 Alexander Barton,
+                      (c)2001-2003 by Alexander Barton,
                    alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -79,14 +79,9 @@ The following <serverflags> are defined at the moment:
     peer understands this flag, it will send "MODE +I" and "MODE +b"
     commands after the server link has been established.

- H: The server supports the "enhanced server handshake", see section II.2
-     for a detailed description.
-
 - o: IRC operators are allowed to change channel- and channel-user-modes
     even if they aren't channel-operator of the affected channel.

- S: The server supports the SERVICE command (on this link).
-
 - Z: Compressed server links are supported by the server.

 Example for a complete <flags> string: "ngircd|0.7.5:CZ".
@@ -95,63 +90,14 @@ The optional parameter <options> is used to propagate server options as
 defined in RFC 2813, section 4.1.1.


-II.2 Enhanced Server Handshake
-
-The "enhanced server handshake" is used when both servers support this IRC+
-extension, which is indicated by the 'H' flag in the <serverflags> sent with
-the PASS command, see section II.1.
-
-It basically means, that after exchanging the PASS and SERVER commands the
-server is not registered in the network (as usual), but that IRC numerics
-are exchanged until the numeric 376 (ENDOFMOTD) is received. Afterwards the
-peer is registered in the network as with the regular IRC protocol.
-
-A server implementing the enhanced server handshake (and indicating this
-using 'H' in the <serverflags>) MUST ignore all unknown numerics to it
-silently.
-
-In addition, such a server should at least send the numeric 005 (ISUPPORT)
-to its peer, containing the following information. Syntax: <key>=<value>,
-one token per IRC parameter. If the server has to send more than 12 token
-it must send separate ISUPPORT numerics (this is a limitation of the IRC
-protocol which allows at max 15 arguments per command).
-
- - NICKLEN: Maximum nickname length. Default: 9.
- - CASEMAPPING: Case mapping used for nick- and channel name comparing.
-   Default: "ascii", the chars [a-z] are lowercase of [A-Z].
- - PREFIX: List of channel modes a person can get and the respective prefix
-   a channel or nickname will get in case the person has it. The order of the
-   modes goes from most powerful to least powerful. Default: "(ov)@+"
- - CHANTYPES: Supported channel prefixes. Default: "#".
- - CHANMODES: List of channel modes for 4 types, separated by comma (","):
-   Mode that adds or removes a nick or address to a list, mode that changes
-   a setting (both have always has a parameter), mode that changes a setting
-   and only has a parameter when set, and mode that changes a setting and
-   never has a parameter. For example "bI,k,l,imnPst".
- - CHANLIMIT: Maximum number of channels allowed to join by channel prefix,
-   for example "#:10".
-
-Please see <http://www.irc.org/tech_docs/005.html> for details.
-
-The information exchanged using ISUPPORT can be used to detect configuration
-incompatibilities (different maximum nick name length, for example) and
-therefore to disconnect the peer prior to registering it in the network.
-
-
-II.3 Exchange channel-modes, topics, and persistent channels
+II.2 Exchange channel-modes, topics, and persistent channels

     Command: CHANINFO
-  Parameters: <channel> +<modes> [[<key> <limit>] <topic>]
+  Parameters: <channel> +<modes> <key> <maxusers> [<topic>]
     Used by: servers only

 CHANINFO is used by servers to inform each other about a channel: its
-modes, channel key, user limits and its topic. The parameter combination
-<key> and <limit> is optional, as well as the <topic> parameter, so that
-there are three possible forms of this command:
-
-  CHANINFO <channel> +<modes>
-  CHANINFO <channel> +<modes> <topic>
-  CHANINFO <channel> +<modes> <key> <limit> <topic>
+modes, channel key, user limits and its topic. <topic> is optional.

 If the channel already exists on the server receiving the CHANINFO command,
 it only adopts the <modes> (or the <topic>) if there are no modes (or topic)
@@ -168,16 +114,5 @@ a channel has no user limit (the parameter <modes> doesn't list the "l"
 channel mode). In this case <limit> should be "0".


-II.4 Update webchat/proxy client information
-
-     Command: WEBIRC
-  Parameters: <password> <username> <hostname> <ip-address>
-     Used by: unregistered clients only
-
-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. It must be the very
-first command sent to the server, even before USER and NICK commands!
-
-The <password> must be set in the server configuration file to prevent
-unauthorized clients to fake their identity; it is an arbitrary string.
-
+-- 
+$Id: Protocol.txt,v 1.12 2004/04/25 15:44:10 alex Exp $
--- a/doc/README-AUX.txt
+++ b/doc/README-AUX.txt
@@ -1,7 +1,7 @@

                    ngIRCd - Next Generation IRC Server

-                      (c)2001-2005 Alexander Barton,
+                     (c)2001-2003 by Alexander Barton,
                   alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -22,7 +22,7 @@ The following software packages are needed:
 - GNU sed
   Source:
   http://www.rezepte-im-web.de/appleux/sed-3.02.tar.gz
-   ftp://arthur.barton.de/pub/unix/aux/tools/sed-3.02.tar.gz
+   ftp://arthur.ath.cx/pub/AUX/Software/Tools/sed-3.02.tar.gz

   A/UX comes with /bin/sed which isn't supporting all functions needed
   by GNU automake/autoconf.
@@ -33,11 +33,11 @@ The following software packages are needed:

 - libUTIL.a
   Source:
-   ftp://ftp.mayn.de/pub/really_old_stuff/apple/apple_unix/Sys_stuff/libUTIL-2.1.tar.gz>
-   ftp://arthur.barton.de/pub/unix/aux/libraries/libUTIL-2.1.tar.gz
+   http://ftp.mayn.de/pub/apple/apple_unix/Sys_stuff/libUTIL-2.1.tar.gz
+   ftp://arthur.ath.cx/pub/AUX/Software/Libraries/libUTIL-2.1.tar.gz

   This library contains functions that are common on other UNIX
-   systems but not on A/UX e.g. memmove(), strerror() and strdup().
+   systems but not on A/UX e.g. memmove(), strerror() und strdup().


 After installation of these packages just do a "./configure" and "make" to
@@ -50,7 +50,7 @@ A few hints in case of errors:
   (so 'configure' uses its own shell script) or use a fully functionable one.
   There's at least one binary "out there" causing problems. The one
   of the GNU fileutils works fine:
-   ftp://arthur.barton.de/pub/unix/aux/tools/fileutils-4.0.tar.gz
+   ftp://arthur.ath.cx/pub/UNIX/AUX/Software/Tools/fileutils-4.0.tar.gz

 - The precompiled binary of the old 'bash' shouldn't be installed within
   /bin (better do this in /usr/local/bin) because 'configure' would
@@ -60,8 +60,8 @@ A few hints in case of errors:
   the 'config.status' script. Better rename /bin/sh to /bin/sh.AUX and
   replace it by a symbolic link to /bin/ksh (ln -s /bin/ksh /bin/sh as
   root).
-   These procedure shouldn't cause you into problems and is recommended
+   These procedure should'nt cause you into problems and is recommended
   even if you don't use ngIRCd.

 -- 
-$Id: README-AUX.txt,v 1.10 2006/07/23 12:19:57 alex Exp $
+$Id: README-AUX.txt,v 1.8 2003/04/21 21:59:34 goetz Exp $
--- a/doc/README-BeOS.txt
+++ b/doc/README-BeOS.txt
@@ -24,7 +24,7 @@ mit diesem Fehler ab:
   select(): Bad file descriptor!

 Es sieht leider so aus, als ob das select() von BeOS nicht mit File-Handles
-von Pipes verschiedener Prozesse umgehen kann: sobald der Resolver asynchron
+von Pipes verschiedener Prozesse umgehen kann: sobald der Resolver asyncron
 gestartet wird, also Pipe-Handles im select() vorhanden sind, fuehrt das zu
 obiger Meldung.

--- a/doc/README-Interix.txt
+++ b/doc/README-Interix.txt
@@ -1,37 +0,0 @@
-
-                    ngIRCd - Next Generation IRC Server
-
-                      (c)2001-2010 Alexander Barton,
-                   alex@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.
-
--- a/doc/SSL.txt
+++ b/doc/SSL.txt
@@ -1,7 +1,7 @@

                     ngIRCd - Next Generation IRC Server

-                        (c)2001-2008 Alexander Barton,
+                      (c)2001-2004 by Alexander Barton,
                    alex@barton.de, http://www.barton.de/

               ngIRCd is free software and published under the
@@ -10,71 +10,17 @@
                                 -- SSL.txt --


-ngIRCd supports SSL/TLSv1 encrypted connections using the OpenSSL or GnuTLS
-libraries. Both encrypted server-server links as well as client-server links
-are supported.
-
-SSL is a compile-time option which is disabled by default. Use one of these
-options of the ./configure script to enable it:
-
-  --with-openssl     enable SSL support using OpenSSL
-  --with-gnutls      enable SSL support using GnuTLS
-
-You also need a key/certificate, see below for how to create a self-signed one.
-
-From a feature point of view, ngIRCds support for both libraries is
-comparable. The only major difference (at this time) is that ngircd with gnutls
-does not support password protected private keys.
-
-Configuration
-~~~~~~~~~~~~~
-
-To enable SSL connections a separate port must be configured: it is NOT
-possible to handle unencrypted and encrypted connections on the same port!
-This is a limitation of the IRC protocol ...
-
-You have to set (at least) the following configuration variables in the
-[SSL] section of ngircd.conf(5): Ports, KeyFile, and CertFile.
-
-Now IRC clients are able to connect using SSL on the configured port(s).
-(Using port 6697 for encrypted connections is common.)
-
-To enable encrypted server-server links, you have to additionally set
-SSLConnect to "yes" in the corresponding [SERVER] section.
-
-
-Creating a self-signed certificate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-OpenSSL:
-
-Creating a self-signed certificate and key:
- $ openssl req -newkey rsa:2048 -x509 -keyout server-key.pem -out server-cert.pem -days 1461
-Create DH parameters (optional):
- $ openssl dhparam -2 -out dhparams.pem 4096
-
-GnuTLS:
-
-Creating a self-signed certificate and key:
- $ certtool --generate-privkey --bits 2048 --outfile server-key.pem
- $ certtool --generate-self-signed --load-privkey server-key.pem --outfile server-cert.pem
-Create DH parameters (optional):
- $ certtool  --generate-dh-params --bits 4096 --outfile dhparams.pem
-
-
-Alternate approach using stunnel(1)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Alternatively (or if you are using ngIRCd compiled without support
-for GnuTLS/OpenSSL), you can use external programs/tools like stunnel(1) to
-get SSL encrypted connections:
+ngIRCd actually doesn't support secure connections for client-server or
+server-server links using SSL, the Secure Socket Layer, by itself. But you can
+use the stunnel(8) command to make this work.

  <http://stunnel.mirt.net/>
  <http://www.stunnel.org/>

-Stefan Sperling (stefan at binarchy dot net) mailed the following text as a
+Stefan Sperling (stefan at binarchy dot net) mailed me the following text as a
 short "how-to", thanks Stefan!

+
 === snip ===
    ! This guide applies to stunnel 4.x !

@@ -102,7 +48,11 @@ short "how-to", thanks Stefan!

    That's it.
    Don't forget to activate ssl support in your irc client ;)
-    The main drawback of this approach compared to using builtin ssl
-    is that from ngIRCds point of view, all ssl-enabled client connections will
-    originate from the host running stunnel.
 === snip ===
+
+
+Probably ngIRCd will include support for SSL in the future ...
+
+
+-- 
+$Id: SSL.txt,v 1.2.2.1 2005/01/26 21:47:47 alex Exp $
--- a/doc/Services.txt
+++ b/doc/Services.txt
@@ -1,70 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2008 Alexander Barton,
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                              -- Services.txt --
-
-
-At the moment, ngIRCd doesn't implement a "special IRC services interface".
-But services acting as a "regular server" are supported, either using the IRC
-protocol defined in RFC 1459 or RFC 2812.
-
-Services have been tested using "IRC Services" version 5.x by Andrew Church,
-homepage: <http://www.ircservices.za.net/>. This document describes setting up
-ngIRCd and these services.
-
-
-Setting up ngIRCd
-~~~~~~~~~~~~~~~~~
-
-The "pseudo server" handling the IRC services is configured as a regular
-remote server in the ngircd.conf(5). In addition the variable "ServiceMask"
-should be set, enabling this ngIRCd to recognize the "pseudo users" as IRC
-services instead of regular IRC users.
-
-Example:
-
-  [SERVER]
-     Name = services.irc.net
-     MyPassword = 123abc
-     PeerPassword = 123abc
-     ServiceMask = *Serv
-
-
-Setting up IRC Services 5.1.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-IRC Services 5.1.3 and above can be used with ngIRCd using the "rfc1459"
-protocol module.
-
-Please note that versions up to and including 5.1.3 contain a bug that
-sometimes causes IRC Services to hang on startup. There are two workarounds:
- a) send the services process a HUP signal ("killall -HUP ircservices")
- b) apply this patch to the IRC Services source tree:
-    <ftp://ngircd.barton.de/ngircd/contrib/IRCServices513-FlushBuffer.patch>
-
-At least the following settings have to be tweaked, in addition to all the
-settings marked as required by IRC Services:
-
-In ircservices.conf:
-
-  Variable		Example value
-
-  RemoteServer		server.irc.net 6667 "123abc"
-  ServerName		"services.irc.net"
-  LoadModule		protocol/rfc1459
-
-In modules.conf:
-
-  Module		protocol/rfc1459
-
-The documentation of IRC Services can be found here:
-<http://www.ircservices.za.net/docs/>
-
-Please let us know if you are successfully using other IRC service packages or
-which problems you encounter, thanks!
--- a/doc/sample-ngircd.conf
+++ b/doc/sample-ngircd.conf
@@ -0,0 +1,160 @@
+# $Id: sample-ngircd.conf,v 1.25.2.1 2004/05/07 11:24:17 alex Exp $
+
+#
+# This is a sample configuration file for the ngIRCd, which must be adepted
+# to the local preferences and needs.
+#
+# Comments are started with "#" or ";".
+#
+# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
+# server interpreted the configuration file as expected!
+#
+
+[Global]
+
+	# The [Global] section of this file is used to define the main
+	# configuration of the server, like the server name and the ports
+	# on which the server should be listening.
+	
+	# Server name in the IRC network, must contain at least one dot
+	# (".") and be unique in the IRC network. Required!
+	Name = irc.the.net
+	
+	# Info text of the server. This will be shown by WHOIS and
+	# LINKS requests for example.
+	Info = Server Info Text
+
+	# Global password for all users needed to connect to the server
+	;Password = abc
+	
+	# Information about the server and the administrator, used by the
+	# ADMIN command. Not required by server but by RFC!
+	;AdminInfo1 = Description
+	;AdminInfo2 = Location
+	;AdminEMail = admin@irc.server
+ 
+	# Ports on which the server should listen. There may be more than
+	# one port, separated with ";". (Default: 6667)
+	;Ports = 6667, 6668, 66694
+
+	# IP address on which the server should listen. (Default: empty,
+	# so the server listens on all IP addresses of the system)
+	;Listen = 1.2.3.4
+	
+	# 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
+
+	# 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.
+	;MotdPhrase = "Hello world!"
+
+	# User ID under which the server should run; you can use the name
+	# of the user or the numerical ID. ATTENTION: For this to work the
+	# server must have been started with root privileges! In addition,
+	# the configuration and MOTD files must be readable by this user,
+	# otherwise RESTART and REHASH won't work!
+	;ServerUID = 65534
+
+	# Group ID under which the ngircd should run; you can use the name
+	# of the group or the numerical ID. ATTENTION: For this to work the
+	# server must have been started with root privileges!
+	;ServerGID = 65534
+
+	# A directory to chroot in when everything is initialized. It
+	# doesn't need to be populated if ngIRCd is compiled as a static
+	# binary. By default ngIRCd won't use the chroot() feature.
+	# ATTENTION: For this to work the server must have been started
+	# with root privileges!
+	;ChrootDir = /var/empty
+
+	# After <PingTimeout> seconds of inactivity the server will send a
+	# PING to the peer to test whether it is alive or not.
+	;PingTimeout = 120
+
+	# If a client fails to answer a PING with a PONG within <PongTimeout>
+	# seconds, it will be disconnected by the server.
+	;PongTimeout = 20
+
+	# The server tries every <ConnectRetry> seconds to establish a link
+	# to not yet (or no longer) connected servers.
+	;ConnectRetry = 60
+
+	# Should IRC Operators be allowed to use the MODE command even if
+	# they are not(!) channel-operators?
+	;OperCanUseMode = no
+
+	# Maximum number of simultaneous connection the server is allowed
+	# to accept (<=0: unlimited):
+	;MaxConnections = -1
+	
+	# Maximum number of simultaneous connections from a single IP address
+	# the server will accept (<=0: unlimited):
+	;MaxConnectionsIP = 5
+
+	# Maximum number of channels a user can be member of (<=0: no limit):
+	;MaxJoins = 10
+
+[Operator]
+	# [Operator] sections are used to define IRC Operators. There may be
+	# more than one [Operator] block, one for each local operator.
+	
+	# ID of the operator (may be different of the nick name)
+	;Name = TheOper
+
+	# Password of the IRC operator
+	;Password = ThePwd
+
+[Server]
+	# Other servers are configured in [Server] sections. If you
+	# configure a port for the connection, then this ngircd tries to
+	# connect to to the other server on the given port; if not it waits
+	# for the other server to connect.
+	# There may be more than one server block.
+	#
+	# Server Groups:
+	# The ngIRCd allows "server groups": You can assign an "ID" to every
+	# server with which you want this ngIRCd to link. If a server of a
+	# group won't answer, the ngIRCd tries to connect to the next server
+	# in the given group. But the ngircd never tries to connect to two
+	# servers with the same group ID.
+	
+	# IRC name of the server
+	;Name = irc2.the.net
+   
+	# Internet host name of the peer
+	;Host = connect-to-host.the.net
+
+	# Port of the server to which the ngIRCd should connect. If you
+	# assign no port the ngIRCd waits for incoming connections.
+	;Port = 6666
+
+	# Own password for the connection. This password has to be configured
+	# as "PeerPassword" on the other server.
+	;MyPassword = MySecret
+
+	# Foreign password for this connection. This password has to be
+	# configured as "MyPassword" on the other server.
+	;PeerPassword = PeerSecret
+	
+	# Group of this server (optional)
+	;Group = 123
+
+[Channel]
+	# Pre-defined channels can be configured in [Channel] sections.
+	# Such channels are created by the server when starting up and even
+	# persist when there are no more members left.
+	# Persistent channels are marked with the mode 'P', which can be set
+	# and unset by IRC operators like other modes on the fly.
+	# There may be more than one [Channel] block.
+	
+	# Name of the channel
+	;Name = #TheName
+
+	# Topic for this channel
+	;Topic = a great topic
+	
+	# Initial channel modes
+	;Modes = tn
+
+# -eof-
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -1,318 +0,0 @@
-#
-# This is a sample configuration file for the ngIRCd IRC daemon, which must
-# be customized to the local preferences and needs.
-#
-# Comments are started with "#" or ";".
-#
-# A lot of configuration options in this file start with a ";". You have
-# to remove the ";" in front of each variable to actually set a value!
-# The disabled variables are shown with example values for completeness only
-# and the daemon is using compiled-in default settings.
-#
-# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
-# server interprets the configuration file as expected!
-#
-# Please see ngircd.conf(5) for a complete list of configuration options
-# and their descriptions.
-#
-
-[Global]
-	# The [Global] section of this file is used to define the main
-	# configuration of the server, like the server name and the ports
-	# on which the server should be listening.
-	# These settings depend on your personal preferences, so you should
-	# make sure that they correspond to your installation and setup!
-
-	# Server name in the IRC network, must contain at least one dot
-	# (".") and be unique in the IRC network. Required!
-	Name = irc.example.net
-
-	# Information about the server and the administrator, used by the
-	# ADMIN command. Not required by server but by RFC!
-	;AdminInfo1 = Description
-	;AdminInfo2 = Location
-	;AdminEMail = admin@irc.server
-
-	# Info text of the server. This will be shown by WHOIS and
-	# LINKS requests for example.
-	Info = Server Info Text
-
-	# Comma separated list of IP addresses on which the server should
-	# listen. Default values are:
-	# "0.0.0.0" or (if compiled with IPv6 support) "::,0.0.0.0"
-	# so the server listens on all IP addresses of the system by default.
-	;Listen = 127.0.0.1,192.168.0.1
-
-	# Text file with the "message of the day" (MOTD). This message will
-	# be shown to all users connecting to the server:
-	;MotdFile = :ETCDIR:/ngircd.motd
-
-	# A simple Phrase (<256 chars) if you don't want to use a motd file.
-	;MotdPhrase = "Hello world!"
-
-	# Global password for all users needed to connect to the server.
-	# (Default: not set)
-	;Password = abc
-
-	# This tells ngIRCd to write its current process ID to a file.
-	# Note that the pidfile is written AFTER chroot and switching the
-	# user ID, e.g. the directory the pidfile resides in must be
-	# writable by the ngIRCd user and exist in the chroot directory.
-	;PidFile = /var/run/ngircd/ngircd.pid
-
-	# Ports on which the server should listen. There may be more than
-	# one port, separated with ",". (Default: 6667)
-	;Ports = 6667, 6668, 6669
-
-	# Group ID under which the ngIRCd should run; you can use the name
-	# of the group or the numerical ID. ATTENTION: For this to work the
-	# server must have been started with root privileges!
-	;ServerGID = 65534
-
-	# User ID under which the server should run; you can use the name
-	# of the user or the numerical ID. ATTENTION: For this to work the
-	# server must have been started with root privileges! In addition,
-	# the configuration and MOTD files must be readable by this user,
-	# otherwise RESTART and REHASH won't work!
-	;ServerUID = 65534
-
-[Limits]
-	# Define some limits and timeouts for this ngIRCd instance. Default
-	# values should be safe, but it is wise to double-check :-)
-
-	# The server tries every <ConnectRetry> seconds to establish a link
-	# to not yet (or no longer) connected servers.
-	;ConnectRetry = 60
-
-	# Maximum number of simultaneous in- and outbound connections the
-	# server is allowed to accept (0: unlimited):
-	;MaxConnections = 0
-
-	# Maximum number of simultaneous connections from a single IP address
-	# the server will accept (0: unlimited):
-	;MaxConnectionsIP = 5
-
-	# Maximum number of channels a user can be member of (0: no limit):
-	;MaxJoins = 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!
-	;MaxNickLength = 9
-
-	# After <PingTimeout> seconds of inactivity the server will send a
-	# PING to the peer to test whether it is alive or not.
-	;PingTimeout = 120
-
-	# If a client fails to answer a PING with a PONG within <PongTimeout>
-	# seconds, it will be disconnected by the server.
-	;PongTimeout = 20
-
-[Options]
-	# Optional features and configuration options to further tweak the
-	# behavior of ngIRCd. If you want to get started quickly, you most
-	# probably don't have to make changes here -- they are all optional.
-
-	# Are remote IRC operators allowed to control this server, e.g.
-	# use commands like CONNECT, SQUIT, DIE, ...?
-	;AllowRemoteOper = no
-
-	# A directory to chroot in when everything is initialized. It
-	# doesn't need to be populated if ngIRCd is compiled as a static
-	# binary. By default ngIRCd won't use the chroot() feature.
-	# ATTENTION: For this to work the server must have been started
-	# with root privileges!
-	;ChrootDir = /var/empty
-
-	# Set this hostname for every client instead of the real one.
-	# Please note: don't use the percentage sign ("%"), it is reserved for
-	# future extensions!
-	;CloakHost = irc.example.net
-
-	# Set every clients' user name to their nick name
-	;CloakUserToNick = yes
-
-	# Try to connect to other IRC servers using IPv4 and IPv6, if possible.
-	;ConnectIPv6 = yes
-	;ConnectIPv4 = yes
-
-	# Do any DNS lookups when a client connects to the server.
-	;DNS = yes
-
-	# Do IDENT lookups if ngIRCd has been compiled with support for it.
-	;Ident = yes
-
-	# Enhance user privacy slightly (useful for IRC server on TOR or I2P)
-	# by censoring some information like idle time, logon time, etc.
-	;MorePrivacy = no
-
-	# Normally ngIRCd doesn't send any messages to a client until it is
-	# registered. Enable this option to let the daemon send "NOTICE AUTH"
-	# messages to clients while connecting.
-	;NoticeAuth = no
-
-	# Should IRC Operators be allowed to use the MODE command even if
-	# they are not(!) channel-operators?
-	;OperCanUseMode = no
-
-	# Mask IRC Operator mode requests as if they were coming from the
-	# server? (This is a compatibility hack for ircd-irc2 servers)
-	;OperServerMode = no
-
-	# Use PAM if ngIRCd has been compiled with support for it.
-	;PAM = no
-
-	# Allow Pre-Defined Channels only (see Section [Channels])
-	;PredefChannelsOnly = no
-
-	# Let ngIRCd send an "authentication PING" when a new client connects,
-	# and register this client only after receiving the corresponding
-	# "PONG" reply.
-	;RequireAuthPing = no
-
-	# Silently drop all incoming CTCP requests.
-	;ScrubCTCP = no
-
-	# Syslog "facility" to which ngIRCd should send log messages.
-	# Possible values are system dependent, but most probably auth, daemon,
-	# user and local1 through local7 are possible values; see syslog(3).
-	# Default is "local5" for historical reasons, you probably want to
-	# change this to "daemon", for example.
-	;SyslogFacility = local1
-
-	# 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
-
-;[SSL]
-	# SSL-related configuration options. Please note that this section
-	# is only available when ngIRCd is compiled with support for SSL!
-	# So don't forget to remove the ";" above if this is the case ...
-
-	# SSL Server Key Certificate
-	;CertFile = :ETCDIR:/ssl/server-cert.pem
-
-	# Diffie-Hellman parameters
-	;DHFile = :ETCDIR:/ssl/dhparams.pem
-
-	# SSL Server Key
-	;KeyFile = :ETCDIR:/ssl/server-key.pem
-
-	# password to decrypt SSLKeyFile (OpenSSL only)
-	;KeyFilePassword = secret
-
-	# Additional Listen Ports that expect SSL/TLS encrypted connections
-	;Ports = 6697, 9999
-
-[Operator]
-	# [Operator] sections are used to define IRC Operators. There may be
-	# more than one [Operator] block, one for each local operator.
-
-	# ID of the operator (may be different of the nick name)
-	;Name = TheOper
-
-	# Password of the IRC operator
-	;Password = ThePwd
-
-	# Optional Mask from which /OPER will be accepted
-	;Mask = *!ident@somewhere.example.com
-
-[Operator]
-	# More [Operator] sections, if you like ...
-
-[Server]
-	# Other servers are configured in [Server] sections. If you
-	# configure a port for the connection, then this ngircd tries to
-	# connect to to the other server on the given port; if not it waits
-	# for the other server to connect.
-	# There may be more than one server block, one for each server.
-	#
-	# Server Groups:
-	# The ngIRCd allows "server groups": You can assign an "ID" to every
-	# server with which you want this ngIRCd to link. If a server of a
-	# group won't answer, the ngIRCd tries to connect to the next server
-	# in the given group. But the ngircd never tries to connect to two
-	# servers with the same group ID.
-
-	# IRC name of the remote server, must match the "Name" variable in
-	# the [Global] section of the other server (when using ngIRCd).
-	;Name = irc2.example.net
-
-	# Internet host name or IP address of the peer (only required when
-	# this server should establish the connection).
-	;Host = connect-to-host.example.net
-
-	# IP address to use as _source_ address for the connection. if
-	# unspecified, ngircd will let the operating system pick an address.
-	;Bind = 10.0.0.1
-
-	# Port of the server to which the ngIRCd should connect. If you
-	# assign no port the ngIRCd waits for incoming connections.
-	;Port = 6667
-
-	# Own password for the connection. This password has to be configured
-	# as "PeerPassword" on the other server.
-	;MyPassword = MySecret
-
-	# Foreign password for this connection. This password has to be
-	# configured as "MyPassword" on the other server.
-	;PeerPassword = PeerSecret
-
-	# Group of this server (optional)
-	;Group = 123
-
-	# Set the "Passive" option to "yes" if you don't want this ngIRCd to
-	# connect to the configured peer (same as leaving the "Port" variable
-	# empty). The advantage of this option is that you can actually
-	# configure a port an use the IRC command CONNECT more easily to
-	# manually connect this specific server later.
-	;Passive = no
-
-	# Connect to the remote server using TLS/SSL (Default: false)
-	;SSLConnect = yes
-
-	# 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).
-	# When you are connecting IRC services which mask as a IRC server
-	# and which use "virtual users" to communicate with, for example
-	# "NickServ" and "ChanServ", you should set this parameter to
-	# something like "*Serv".
-	;ServiceMask = *Serv
-
-[Server]
-	# More [Server] sections, if you like ...
-
-[Channel]
-	# Pre-defined channels can be configured in [Channel] sections.
-	# Such channels are created by the server when starting up and even
-	# persist when there are no more members left.
-	# Persistent channels are marked with the mode 'P', which can be set
-	# and unset by IRC operators like other modes on the fly.
-	# There may be more than one [Channel] block, one for each channel.
-
-	# Name of the channel
-	;Name = #TheName
-
-	# Topic for this channel
-	;Topic = a great topic
-
-	# Initial channel modes
-	;Modes = tnk
-
-	# initial channel password (mode k)
-	;Key = Secret
-
-	# Key file, syntax for each line: "<user>:<nick>:<key>".
-	# Default: none.
-	;KeyFile = :ETCDIR:/#chan.key
-
-	# maximum users per channel (mode l)
-	;MaxUsers = 23
-
-[Channel]
-	# More [Channel] sections, if you like ...
-
-# -eof-
--- a/doc/src/.gitignore
+++ b/doc/src/.gitignore
@@ -1 +0,0 @@
-html
--- a/doc/src/Doxyfile
+++ b/doc/src/Doxyfile
@@ -1,164 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton (alex@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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for ngIRCd.
-#
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = ngIRCd
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = ../..
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory
-# hierarchy in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that
-# contain documented source files. You may enter file names like "myfile.cpp"
-# or directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = ../../src
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented
-# function all documented entities called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-#---------------------------------------------------------------------------
-# Output formats
-#---------------------------------------------------------------------------
-
-GENERATE_HTML          = YES
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for each
-# generated HTML page. If it is left blank doxygen will generate a standard
-# footer.
-
-HTML_FOOTER            = footer.inc.html
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports JavaScript and
-# DHTML is required (for instance Mozilla 1.0+, Firefox Netscape 6.0+,
-# Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-GENERATE_DOCSET        = NO
-GENERATE_HTMLHELP      = NO
-GENERATE_LATEX         = NO
-GENERATE_RTF           = NO
-GENERATE_MAN           = NO
-GENERATE_XML           = NO
-GENERATE_AUTOGEN_DEF   = NO
-GENERATE_PERLMOD       = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = DEBUG ZLIB PAM ZEROCONF CONN_MODULE __client_c__
-
-# -eof-
--- a/doc/src/Makefile.am
+++ b/doc/src/Makefile.am
@@ -1,25 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-
-EXTRA_DIST = Doxyfile footer.inc.html
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-distclean-local:
-	rm -rf html
-
-srcdoc:
-	@doxygen --version >/dev/null 2>&1 \
-	  || ( echo; echo "Error: \"doxygen\" not found!"; echo; exit 1 )
-	doxygen
-
-# -eof-
--- a/doc/src/footer.inc.html
+++ b/doc/src/footer.inc.html
@@ -1,11 +0,0 @@
-
-<hr class="footer">
-<p>
-  ngIRCd
-  <a href="http://ngircd.barton.de/">Homepage</a>,
-  <a href="http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git">GIT-Repository</a>,
-  <a href="http://ngircd.barton.de/bugzilla/index.cgi">Bug-Tracker</a>.
-</p>
-
-</body>
-</html>
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,2 +0,0 @@
-ngircd.8
-ngircd.conf.5
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -9,25 +9,12 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: Makefile.am,v 1.6 2006/12/25 16:13:26 alex Exp $
+# $Id: Makefile.am,v 1.5 2002/04/04 13:02:41 alex Exp $
 #

-TEMPLATE_MANS = ngircd.conf.5.tmpl ngircd.8.tmpl
-
-SUFFIXES = .tmpl .
-
-.tmpl:
-	sed \
-	    -e s@:SBINDIR:@${sbindir}@ \
-	    -e s@:BINDIR:@${bindir}@ \
-	    -e s@:ETCDIR:@${sysconfdir}@ \
-	    <$< >$@
-
 man_MANS = ngircd.conf.5 ngircd.8

-CLEANFILES = $(man_MANS)
-
-EXTRA_DIST = $(TEMPLATE_MANS)
+EXTRA_DIST = $(man_MANS)

 maintainer-clean-local:
 	rm -f Makefile Makefile.in
--- a/man/ngircd.8
+++ b/man/ngircd.8
@@ -0,0 +1,83 @@
+.\"
+.\" $Id: ngircd.8,v 1.9 2004/04/05 10:59:10 alex Exp $
+.\"
+.TH ngircd 8 "March 2003" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd \- the next generation IRC daemon
+.SH SYNOPSIS
+.B ngircd [
+.I Options
+.B ]
+.SH DESCRIPTION
+.BR ngircd
+is a free open source daemon for the Internet Relay Chat (IRC),
+developed under the GNU General Public License (GPL).
+.PP
+It's written from scratch and is not based upon the original IRCd like
+many others. It is easy to configure, supports server links (even with
+original ircd's) and runs on hosts with changing IP addresses (such as
+dial-in networks).
+.PP
+Currently supported platforms (tested versions) are: AIX (3.2.5 with IBM XL
+C Compiler), A/UX (3.x, Apple pre-ANSI C Compiler and GNU C), FreeBSD
+(4.5/i386, GNU C), HP-UX (10.20, GNU C), IRIX (6.5, SGI MIPSpro C 7.30),
+Linux (2.2.x/i386, 2.4.x/i386 and 2.4.x/hppa, GNU C), Mac OS X (10.x, GNU C),
+NetBSD (1.5.2/i386 and 1.5.3/m68k, GNU C), Solaris (2.5.1 and 2.6, GNU C),
+and Windows with Cygwin (GNU C).
+.PP
+As ngIRCd relies on UNIX standards and uses GNU automake and GNU autoconf
+there are good chances that it also supports other UNIX-based operating
+systems.
+.SH OPTIONS
+The default behaviour of
+.BR ngircd
+is to read its standard configuration file (see below), to detach from the
+controlling terminal and to wait for clients.
+.PP
+You can use these options to modify this default:
+.TP
+\fB\-f\fR \fIfile\fR, \fB\-\-config\fR \fIfile\fR
+Use
+.I file
+as configuration file.
+.TP
+\fB\-n\fR, \fB\-\-nodaemon\fR
+Don't fork a child and don't detach from controlling terminal.
+All log messages go to the console.
+.TP
+\fB\-p\fR, \fB\-\-passive\fR
+Disable automatic connections to other servers. You can use the IRC command
+CONNECT later on as IRC Operator to link this ngIRCd to other servers.
+.TP
+\fB\-t\fR, \fB\-\-configtest\fR
+Read, validate and display the configuration; then exit.
+.TP
+\fB\-\-version\fR
+Output version information and exit.
+.TP
+\fB\-\-help\fR
+Display a brief help text and exit.
+.SH FILES
+.I /usr/local/etc/ngircd.conf
+.RS
+The system wide default configuration file.
+.RE
+.I /usr/local/etc/ngircd.motd
+.RS
+Default "message of the day" (MOTD).
+.RE
+.SH AUTHOR
+Alexander Barton,
+.UR mailto:alex@barton.de
+alex@barton.de
+.UE
+.br
+Homepage:
+.UR http://arthur.ath.cx/~alex/ngircd/
+http://arthur.ath.cx/~alex/ngircd/
+.UE
+.SH "SEE ALSO"
+.BR ngircd.conf (5),
+.BR ircd (8)
+.\"
+.\" -eof-
--- a/man/ngircd.8.tmpl
+++ b/man/ngircd.8.tmpl
@@ -1,114 +0,0 @@
-.\"
-.\" ngircd(8) manual page template
-.\"
-.TH ngircd 8 "Dec 2010" ngircd "ngIRCd Manual"
-.SH NAME
-ngIRCd \- the next generation IRC daemon
-.SH SYNOPSIS
-.B ngircd [
-.I Options
-.B ]
-.SH DESCRIPTION
-.BR ngIRCd
-is a free open source daemon for the Internet Relay Chat (IRC),
-developed under the GNU General Public License (GPL).
-.PP
-It's written from scratch and is not based upon the original IRCd like
-many others. It is easy to configure, supports server links (even with
-original ircd's) and runs on hosts with changing IP addresses (such as
-dial-in networks).
-.PP
-Currently supported platforms include AIX, A/UX, FreeBSD, HP-UX, IRIX,
-Linux, Mac OS X, NetBSD, OpenBSD, Solaris, and Windows with Cygwin.
-.PP
-As ngIRCd relies on UNIX standards and uses GNU automake and GNU autoconf
-there are good chances that it also supports other UNIX-based operating
-systems as well. By default, ngIRCd writes diagnostic and informational messages using
-the syslog mechanism.
-.SH OPTIONS
-The default behavior of
-.BR ngircd
-is to read its standard configuration file (see below), to detach from the
-controlling terminal and to wait for clients.
-.PP
-You can use these options to modify this default:
-.TP
-\fB\-f\fR \fIfile\fR, \fB\-\-config\fR \fIfile\fR
-Use
-.I file
-as configuration file.
-.TP
-\fB\-n\fR, \fB\-\-nodaemon\fR
-Don't fork a child and don't detach from controlling terminal.
-All log messages go to the console and you can use CTRL-C to
-terminate the server.
-.TP
-\fB\-p\fR, \fB\-\-passive\fR
-Disable automatic connections to other servers. You can use the IRC command
-CONNECT later on as IRC Operator to link this ngIRCd to other servers.
-.TP
-\fB\-t\fR, \fB\-\-configtest\fR
-Read, validate and display the configuration; then exit.
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-Output version information and exit.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Display a brief help text and exit.
-.SH FILES
-.I :ETCDIR:/ngircd.conf
-.RS
-The system wide default configuration file.
-.RE
-.I :ETCDIR:/ngircd.motd
-.RS
-Default "message of the day" (MOTD).
-.RE
-.SH SIGNALS
-The daemon understands the following signals:
-.TP
-\fBTERM\fR
-Shut down all connections and terminate the daemon.
-.TP
-\fBHUP\fR
-Shut down all listening sockets, re-read the configuration file and
-re-initialize the daemon.
-.SH HINTS
-It's wise to use "ngircd \-\-configtest" to validate the configuration file
-after changing it.
-.SH DEBUGGING
-When ngIRCd is compiled with debug code, that is, its source code has
-been ./configure'd with "--enable-debug" and/or "--enable-sniffer" (witch
-enables debug mode automatically as well), you can use two more command
-line options and two more signals to debug problems with the daemon itself
-or IRC clients:
-.PP
-\fBOptions:\fR
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-Enable debug mode and log extra messages.
-.TP
-\fB\-s\fR, \fB\-\-sniffer\fR
-Enable IRC protocol sniffer, which logs all sent and received IRC commands to
-the console/syslog. This option requires that ngIRCd has been ./configure'd
-with "--enable-sniffer" and enables debug mode automatically, too.
-.PP
-\fBSignals:\fR
-.TP
-\fBUSR1\fR
-Toggle debug mode on and off during runtime.
-.TP
-\fBUSR2\fR
-Dump internal server state to the console/syslog when debug mode is on (use
-command line option \-\-debug or signal USR1).
-.SH AUTHORS
-Alexander Barton, <alex@barton.de>
-.br
-Florian Westphal, <fw@strlen.de>
-.PP
-Homepage: http://ngircd.barton.de/
-.SH "SEE ALSO"
-.BR ngircd.conf (5),
-.BR ircd (8)
-.\"
-.\" -eof-
--- a/man/ngircd.conf.5
+++ b/man/ngircd.conf.5
@@ -0,0 +1,231 @@
+.\"
+.\" $Id: ngircd.conf.5,v 1.12.2.1 2004/05/07 11:24:18 alex Exp $
+.\"
+.TH ngircd.conf 5 "Mai 2003" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd.conf \- configuration file of ngIRCd
+.SH SYNOPSIS
+.B /usr/local/etc/ngircd.conf
+.SH DESCRIPTION
+.BR ngircd.conf
+is the configuration file for
+.BR ngircd (8)
+which you should adept to your local preferences and needs.
+.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
+begins.
+.PP
+Sections contain parameters of the form
+.PP
+.RS
+.I name
+=
+.I value
+.RE
+.PP
+Any line beginning with a semicolon (';') or a hash ('#') character is
+treated as a comment and ignored.
+.PP
+The file format is line-based - that means, each newline-terminated line
+represents either a comment, a section name or a parameter.
+.PP
+Section and parameter names are not case sensitive.
+.SH "SECTION OVERVIEW"
+The file is separated in four blocks: [Global], [Operator], [Server],
+and [Channel].
+.PP
+In the
+.I [Global]
+section, there is the main configuration like the server name and the
+ports, on which the server should be listening. IRC operators of this
+server are defined in
+.I [Operator]
+blocks.
+.I [Server]
+is the section where server links are configured. And
+.I [Channel]
+blocks are used to configure pre-defined ("persistent") IRC channels.
+.SH [GLOBAL]
+The
+.I [Global]
+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
+.TP
+\fBInfo\fR
+Info text of the server. This will be shown by WHOIS and LINKS requests for
+example.
+.TP
+\fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR
+Information about the server and the administrator, used by the ADMIN
+command.
+.TP
+\fBPorts\fR
+Ports on which the server should listen. There may be more than one port,
+separated with ';'. Default: 6667.
+.TP
+\fBListen\fR
+The ip address on which the server should listen. Default is empty, so
+the server listens on all configured ip addresses and interfaces.
+.TP
+\fBMotdFile\fR
+Text file with the "message of the day" (MOTD). This message will be shown
+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.
+.TP
+\fBServerUID\fR
+User ID under which the server should run; you can use the name of the user
+or the numerical ID.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have been
+started with root privileges! In addition, the configuration and MOTD files
+must be readable by this user, otherwise RESTART and REHASH won't work!
+.RE
+.TP
+\fBServerGID\fR
+Group ID under which the ngIRCd should run; you can use the name of the
+group or the numerical ID.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have
+been started with root privileges!
+.RE
+.TP
+\fBChrootDir\fR
+A directory to chroot in when everything is initialized. It doesn't need
+to be populated if ngIRCd is compiled as a static binary. By default ngIRCd
+won't use the chroot() feature.
+.PP
+.RS
+.B Attention:
+.br
+For this to work the server must have
+been started with root privileges!
+.RE
+.TP
+\fBPingTimeout\fR
+After <PingTimeout> seconds of inactivity the server will send a PING to
+the peer to test whether it is alive or not. Default: 120.
+.TP
+\fBPongTimeout\fR
+If a client fails to answer a PING with a PONG within <PongTimeout>
+seconds, it will be disconnected by the server. Default: 20.
+.TP
+\fBConnectRetry\fR
+The server tries every <ConnectRetry> seconds to establish a link to not yet
+(or no longer) connected servers. Default: 60.
+.TP
+\fBOperCanUseMode\fR
+Should IRC Operators be allowed to use the MODE command even if they are
+not(!) channel-operators? Default: no.
+.TP
+\fBMaxConnections\fR
+Maximum number of simultaneous connection the server is allowed to accept
+(<=0: unlimited). Default: -1.
+.TP
+\fBMaxConnectionsIP\fR
+Maximum number of simultaneous connections from a single IP address that
+the server will accept (<=0: unlimited). This configuration options lowers
+the risk of denial of service attacks (DoS). Default: 5.
+.TP
+\fBMaxJoins\fR
+Maximum number of channels a user can be member of (<=0: no limit).
+Default: 10.
+.SH [OPERATOR]
+.I [Operator]
+sections are used to define IRC Operators. There may be more than one
+.I [Operator]
+block, one for each local operator.
+.TP
+\fBName\fR
+ID of the operator (may be different of the nick name).
+.TP
+\fBPassword\fR
+Password of the IRC operator.
+.SH [SERVER]
+Other servers are configured in
+.I [Server]
+sections. If you configure a port for the connection, then this ngIRCd
+tries to connect to to the other server on the given port; if not, it waits
+for the other server to connect.
+.PP
+The ngIRCd allows "server groups": You can assign an "ID" to every server
+with which you want this ngIRCd to link. If a server of a group won't
+answer, the ngIRCd tries to connect to the next server in the given group.
+But ngIRCd never tries to connect to two servers with the same group ID.
+.PP
+There may be more than one
+.I [Server]
+block.
+.TP
+\fBName\fR
+IRC name of the server
+.TP
+\fBHost\fR
+Internet host name of the peer
+.TP
+\fBPort\fR
+Port of the server to which the ngIRCd should connect. If you assign no port
+the ngIRCd waits for incoming connections.
+.TP
+\fBMyPassword\fR
+Own password for this connection. This password has to be configured as
+"PeerPassword" on the other server.
+.TP
+\fBPeerPassword\fR
+Foreign password for this connection. This password has to be configured as
+"MyPassword" on the other server.
+.TP
+\fBGroup\fR
+Group of this server (optional).
+.SH [CHANNEL]
+Pre-defined channels can be configured in
+.I [Channel]
+sections. Such channels are created by the server when starting up and even
+persist when there are no more members left.
+.PP
+Persistent channels are marked with the mode 'P', which can be set and unset
+by IRC operators like other modes on the fly.
+.PP
+There may be more than one
+.I [Channel]
+block.
+.TP
+\fBName\fR
+Name of the channel
+.TP
+\fBTopic\fR
+Topic for this channel
+.TP
+\fBModes\fR
+Initial channel modes.
+.SH HINTS
+It's wise to use "ngircd --configtest" to validate the configuration file
+after changing it. See
+.BR ngircd (8)
+for details.
+.SH AUTHOR
+Alexander Barton,
+.UR mailto:alex@barton.de
+alex@barton.de
+.UE
+.br
+Homepage:
+.UR http://arthur.ath.cx/~alex/ngircd/
+http://arthur.ath.cx/~alex/ngircd/
+.UE
+.SH "SEE ALSO"
+.BR ngircd (8)
+.\"
+.\" -eof-
--- a/man/ngircd.conf.5.tmpl
+++ b/man/ngircd.conf.5.tmpl
@@ -1,499 +0,0 @@
-.\"
-.\" ngircd.conf(5) manual page template
-.\"
-.TH ngircd.conf 5 "Jun 2011" ngircd "ngIRCd Manual"
-.SH NAME
-ngircd.conf \- configuration file of ngIRCd
-.SH SYNOPSIS
-.B :ETCDIR:/ngircd.conf
-.SH DESCRIPTION
-.BR ngircd.conf
-is the configuration file of the
-.BR ngircd (8)
-Internet Relay Chat (IRC) daemon, which must be customized to the local
-preferences and needs.
-.PP
-Most variables can be modified while the ngIRCd daemon is already running:
-It will reload its configuration file when a HUP signal or REHASH command
-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
-begins.
-.PP
-Sections contain parameters of the form
-.PP
-.RS
-.I name
-=
-.I value
-.RE
-.PP
-Empty lines and any line beginning with a semicolon (';') or a hash ('#')
-character are treated as a comment and will be ignored. Leading and trailing
-whitespaces are trimmed before any processing takes place.
-.PP
-The file format is line-based - that means, each non-empty newline-terminated
-line represents either a comment, a section name, or a parameter.
-.PP
-Section and parameter names are not case sensitive.
-.PP
-There are three types of variables:
-.I booleans,
-.I text strings,
-and
-.I numbers.
-Boolean values are
-.I true
-if they are "yes", "true", or any non-null integer. Text strings are used 1:1
-without leading and following spaces; there is no way to quote strings. And
-for numbers all decimal integer values are valid.
-.PP
-In addition, some string or numerical variables accept lists of values,
-separated by commas (",").
-.SH "SECTION OVERVIEW"
-The file can contain blocks of seven types: [Global], [Limits], [Options],
-[SSL], [Operator], [Server], and [Channel].
-.PP
-The main configuration of the server is stored in the
-.I [Global]
-section, like the server name, administrative information and the ports on
-which the server should be listening. The variables in this section have to be
-adjusted to the local requirements most of the time, whereas all the variables
-in the other sections can be left on there defaults very often.
-.PP
-Options in the
-.I [Limits]
-block are used to tweak different limits and timeouts of the daemon, like the
-maximum number of clients allowed to connect to this server. Variables in the
-.I [Options]
-section can be used to enable or disable specific features of ngIRCd, like
-support for IDENT, PAM, IPv6, and protocol and cloaking features. The
-.I [SSL]
-block contains all SSL-related configuration variables. These three sections
-are all optional.
-.PP
-IRC operators of this server are defined in
-.I [Operator]
-blocks. Links to remote servers are configured in
-.I [Server]
-sections. And
-.I [Channel]
-blocks are used to configure pre-defined ("persistent") IRC channels.
-.PP
-There can be more than one [Operator], [Server] and [Channel] section per
-configuration file (one for each operator, server, and channel), but only
-exactly one [Global], one [Limits], one [Options], and one [SSL] section.
-.SH [GLOBAL]
-The
-.I [Global]
-section of this file is used to define the main configuration of the server,
-like the server name and the ports on which the server should be listening.
-These settings depend on your personal preferences, so you should make sure
-that they correspond to your installation and setup!
-.TP
-\fBName\fR (string; required)
-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
-\fBAdminInfo1\fR, \fBAdminInfo2\fR, \fBAdminEMail\fR (string)
-Information about the server and the administrator, used by the ADMIN
-command. This information is not required by the server but by RFC!
-.TP
-\fBInfo\fR (string)
-Info text of the server. This will be shown by WHOIS and LINKS requests for
-example.
-.TP
-\fBListen\fR (list of strings)
-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 ngIRCd 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 (string)
-Text file with the "message of the day" (MOTD). This message will be shown to
-all users connecting to the server. Please note: Changes made to this file
-take effect when ngircd starts up or is instructed to re-read its
-configuration file.
-.TP
-\fBMotdPhrase\fR (string)
-A simple Phrase (<256 chars) if you don't want to use a MOTD file.
-.TP
-\fBPassword\fR (string)
-Global password for all users needed to connect to the server. The default is
-empty, so no password is required. Please note: This feature is not available
-if ngIRCd is using PAM!
-.TP
-\fBPidFile\fR (string)
-This tells ngIRCd to write its current process ID to a file. Note that the
-pidfile is written AFTER chroot and switching the user ID, e.g. the directory
-the pidfile resides in must be writable by the ngIRCd user and exist in the
-chroot directory (if configured, see above).
-.TP
-\fBPorts\fR (list of numbers)
-Ports on which the server should listen. There may be more than one port,
-separated with commas (","). Default: 6667, unless \fBSSL_Ports\fR are also
-specified.
-.TP
-\fBServerGID\fR (string or number)
-Group ID under which the ngIRCd should run; you can use the name of the
-group or the numerical ID.
-.PP
-.RS
-.B Attention:
-.br
-For this to work the server must have been started with root privileges!
-.RE
-.TP
-\fBServerUID\fR (string or number)
-User ID under which the server should run; you can use the name of the user
-or the numerical ID.
-.PP
-.RS
-.B Attention:
-.br
-For this to work the server must have been started with root privileges! In
-addition, the configuration and MOTD files must be readable by this user,
-otherwise RESTART and REHASH won't work!
-.RE
-.SH [LIMITS]
-Define some limits and timeouts for this ngIRCd instance. Default values
-should be safe, but it is wise to double-check :-)
-.TP
-\fBConnectRetry\fR (number)
-The server tries every <ConnectRetry> seconds to establish a link to not yet
-(or no longer) connected servers. Default: 60.
-.TP
-\fBMaxConnections\fR (number)
-Maximum number of simultaneous in- and outbound connections the server is
-allowed to accept (0: unlimited). Default: 0.
-.TP
-\fBMaxConnectionsIP\fR (number)
-Maximum number of simultaneous connections from a single IP address that
-the server will accept (0: unlimited). This configuration options lowers
-the risk of denial of service attacks (DoS). Default: 5.
-.TP
-\fBMaxJoins\fR (number)
-Maximum number of channels a user can be member of (0: no limit).
-Default: 10.
-.TP
-\fBMaxNickLength\fR (number)
-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
-\fBPingTimeout\fR (number)
-After <PingTimeout> seconds of inactivity the server will send a PING to
-the peer to test whether it is alive or not. Default: 120.
-.TP
-\fBPongTimeout\fR (number)
-If a client fails to answer a PING with a PONG within <PongTimeout>
-seconds, it will be disconnected by the server. Default: 20.
-.SH [OPTIONS]
-Optional features and configuration options to further tweak the behavior of
-ngIRCd. If you want to get started quickly, you most probably don't have to
-make changes here -- they are all optional.
-.TP
-\fBAllowRemoteOper\fR (boolean)
-Are IRC operators connected to remote servers allowed to control this server,
-e.g. are they allowed to use administrative commands like CONNECT, DIE,
-SQUIT, ... that affect this server? Default: no.
-.TP
-\fBChrootDir\fR (string)
-A directory to chroot in when everything is initialized. It doesn't need
-to be populated if ngIRCd is compiled as a static binary. By default ngIRCd
-won't use the chroot() feature.
-.PP
-.RS
-.B Attention:
-.br
-For this to work the server must have been started with root privileges!
-.RE
-.TP
-\fBCloakHost\fR (string)
-Set this hostname for every client instead of the real one. Default: empty,
-don't change.
-.PP
-.RS
-.B Please note:
-.br
-Don't use the percentage sign ("%"), it is reserved for future extensions!
-.RE
-.TP
-\fBCloakUserToNick\fR (boolean)
-Set every clients' user name to their nick name and hide the one supplied
-by the IRC client. Default: no.
-.TP
-\fBConnectIPv4\fR (boolean)
-Set this to no if you do not want ngIRCd to connect to other IRC servers using
-the IPv4 protocol. This allows the usage of ngIRCd in IPv6-only setups.
-Default: yes.
-.TP
-\fBConnectIPv6\fR (boolean)
-Set this to no if you do not want ngIRCd to connect to other IRC servers using
-the IPv6 protocol.
-Default: yes.
-.TP
-\fBDNS\fR (boolean)
-If set to false, ngIRCd will not make any 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: yes.
-.TP
-\fBIdent\fR (boolean)
-If ngIRCd is compiled with IDENT support this can be used to disable IDENT
-lookups at run time.
-Default: yes.
-.TP
-\fBMorePrivacy\fR (boolean)
-This will cause ngIRCd to censor user idle time, logon time as well as the
-part/quit messages (that are sometimes used to inform everyone about which
-client software is being used). WHOWAS requests are also silently ignored.
-This option is most useful when ngIRCd is being used together with
-anonymizing software such as TOR or I2P and one does not wish to make it
-too easy to collect statistics on the users.
-Default: no.
-.TP
-\fBNoticeAuth\fR (boolean)
-Normally ngIRCd doesn't send any messages to a client until it is registered.
-Enable this option to let the daemon send "NOTICE AUTH" messages to clients
-while connecting. Default: no.
-.TP
-\fBOperCanUseMode\fR (boolean)
-Should IRC Operators be allowed to use the MODE command even if they are
-not(!) channel-operators? Default: no.
-.TP
-\fBOperServerMode\fR (boolean)
-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;
-only enable it if you have ircd-irc2 servers in your IRC network.
-.TP
-\fBPAM\fR (boolean)
-If ngIRCd is compiled with PAM support this can be used to disable all calls
-to the PAM library at runtime; all users connecting without password are
-allowed to connect, all passwords given will fail.
-Default: yes.
-.TP
-\fBPredefChannelsOnly\fR (boolean)
-If enabled, no new channels can be created. Useful if you do not want to have
-other channels than those defined in [Channel] sections in the configuration
-file on this server.
-Default: no.
-.TP
-\fBRequireAuthPing\fR (boolean)
-Let ngIRCd send an "authentication PING" when a new client connects, and
-register this client only after receiving the corresponding "PONG" reply.
-Default: no.
-.TP
-\fBScrubCTCP\fR (boolean)
-If set to true, ngIRCd will silently drop all CTCP requests sent to it from
-both clients and servers. It will also not forward CTCP requests to any
-other servers. CTCP requests can be used to query user clients about which
-software they are using and which versions said software is. CTCP can also be
-used to reveal clients IP numbers. ACTION CTCP requests are not blocked,
-this means that /me commands will not be dropped, but please note that
-blocking CTCP will disable file sharing between users!
-Default: no.
-.TP
-\fBSyslogFacility\fR (string)
-Syslog "facility" to which ngIRCd should send log messages. Possible
-values are system dependent, but most probably "auth", "daemon", "user"
-and "local1" through "local7" are possible values; see syslog(3).
-Default is "local5" for historical reasons, you probably want to
-change this to "daemon", for example.
-.TP
-\fBWebircPassword\fR (string)
-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.
-.SH [SSL]
-All SSL-related configuration variables are located in the
-.I [SSL]
-section. Please note that this whole section is only recognized by ngIRCd
-when it is compiled with support for SSL using OpenSSL or GnuTLS!
-.TP
-\fBCertFile\fR (string)
-SSL Certificate file of the private server key.
-.TP
-\fBDHFile\fR (string)
-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 was compiled with OpenSSL, then
-(Ephemeral)-Diffie-Hellman Key Exchanges and several Cipher Suites will not be
-available.
-.TP
-\fBKeyFile\fR (string)
-Filename of SSL Server Key to be used for SSL connections. This is required
-for SSL/TLS support.
-.TP
-\fBKeyFilePassword\fR (string)
-OpenSSL only: Password to decrypt the private key file.
-.TP
-\fBPorts\fR (list of numbers)
-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.
-.SH [OPERATOR]
-.I [Operator]
-sections are used to define IRC Operators. There may be more than one
-.I [Operator]
-block, one for each local operator.
-.TP
-\fBName\fR (string)
-ID of the operator (may be different of the nick name).
-.TP
-\fBPassword\fR (string)
-Password of the IRC operator.
-.TP
-\fBMask\fR (string)
-Mask that is to be checked before an /OPER for this account is accepted.
-Example: nick!ident@*.example.com
-.SH [SERVER]
-Other servers are configured in
-.I [Server]
-sections. If you configure a port for the connection, then this ngIRCd
-tries to connect to to the other server on the given port (active);
-if not, it waits for the other server to connect (passive).
-.PP
-ngIRCd supports "server groups": You can assign an "ID" to every server
-with which you want this ngIRCd to link, and the daemon ensures that at
-any given time only one direct link exists to servers with the same ID.
-So if a server of a group won't answer, ngIRCd tries to connect to the next
-server in the given group (="with the same ID"), but never tries to connect
-to more than one server of this group simultaneously.
-.PP
-There may be more than one
-.I [Server]
-block.
-.TP
-\fBName\fR (string)
-IRC name of the remote server.
-.TP
-\fBHost\fR (string)
-Internet host name (or IP address) of the peer.
-.TP
-\fBBind\fR (string)
-IP address to use as source IP for the outgoing connection. Default is
-to let the operating system decide.
-.TP
-\fBPort\fR (number)
-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, default).
-.TP
-\fBMyPassword\fR (string)
-Own password for this connection. This password has to be configured as
-\fBPeerPassword\fR on the other server. Must not have ':' as first character.
-.TP
-\fBPeerPassword\fR (string)
-Foreign password for this connection. This password has to be configured as
-\fBMyPassword\fR on the other server.
-.TP
-\fBGroup\fR (number)
-Group of this server (optional).
-.TP
-\fBPassive\fR (boolean)
-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
-\fBSSLConnect\fR (boolean)
-Connect to the remote server using TLS/SSL. Default: false.
-.TP
-\fBServiceMask\fR (string)
-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" and "ChanServ",
-you should set this parameter to something like "*Serv".
-.SH [CHANNEL]
-Pre-defined channels can be configured in
-.I [Channel]
-sections. Such channels are created by the server when starting up and even
-persist when there are no more members left.
-.PP
-Persistent channels are marked with the mode 'P', which can be set and unset
-by IRC operators like other modes on the fly.
-.PP
-There may be more than one
-.I [Channel]
-block.
-.TP
-\fBName\fR (string)
-Name of the channel, including channel prefix ("#" or "&").
-.TP
-\fBTopic\fR (string)
-Topic for this channel.
-.TP
-\fBModes\fR (string)
-Initial channel modes.
-.TP
-\fBKey\fR (string)
-Sets initial channel key (only relevant if channel mode "k" is set).
-.TP
-\fBKeyFile\fR (string)
-Path and file name of a "key file" containing individual channel keys for
-different users. The file consists of plain text lines with the following
-syntax (without spaces!):
-.PP
-.RS
-.RS
-.I user
-:
-.I nick
-:
-.I key
-.RE
-.PP
-.I user
-and
-.I nick
-can contain the wildcard character "*".
-.br
-.I key
-is an arbitrary password.
-.PP
-Valid examples are:
-.PP
-.RS
-*:*:KeY
-.br
-*:nick:123
-.br
-~user:*:xyz
-.RE
-.PP
-The key file is read on each JOIN command when this channel has a key
-(channel mode +k). Access is granted, if a) the channel key set using the
-MODE +k command or b) one of the lines in the key file match.
-.PP
-.B Please note:
-.br
-The file is not reopened on each access, so you can modify and overwrite it
-without problems, but moving or deleting the file will have not effect until
-the daemon re-reads its configuration!
-.RE
-.TP
-\fBMaxUsers\fR (number)
-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
-.BR ngircd (8)
-for details.
-.SH AUTHOR
-Alexander Barton, <alex@barton.de>
-.br
-Florian Westphal, <fw@strlen.de>
-.PP
-Homepage: http://ngircd.barton.de/
-.SH "SEE ALSO"
-.BR ngircd (8)
-.\"
-.\" -eof-
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,4 +0,0 @@
-config.h
-config.h.in
-config.h.in~
-stamp-h1
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,10 +8,10 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.8 2008/02/26 22:04:15 fw Exp $
+# $Id: Makefile.am,v 1.5 2003/01/13 12:20:16 alex Exp $
 #

-SUBDIRS = portab tool ipaddr ngircd testsuite
+SUBDIRS = portab tool ngircd testsuite

 maintainer-clean-local:
 	rm -f Makefile Makefile.in config.h config.h.in stamp-h.in
--- a/src/ipaddr/Makefile.am
+++ b/src/ipaddr/Makefile.am
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = ansi2knr
-
-INCLUDES = -I$(srcdir)/../portab
-
-noinst_LIBRARIES = libngipaddr.a
-
-libngipaddr_a_SOURCES = ng_ipaddr.c
-
-noinst_HEADERS = ng_ipaddr.h
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-# -eof-
--- a/src/ipaddr/ng_ipaddr.c
+++ b/src/ipaddr/ng_ipaddr.c
@@ -1,177 +0,0 @@
-/*
- * (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
- */
-
-#include "portab.h"
-
-/**
- * @file
- * Functions for AF_ agnostic ipv4/ipv6 handling.
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_GETADDRINFO
-#include <netdb.h>
-#include <sys/types.h>
-#endif
-
-#include "ng_ipaddr.h"
-
-GLOBAL bool
-ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port)
-{
-#ifdef HAVE_GETADDRINFO
-	int ret;
-	char portstr[64];
-	struct addrinfo *res0;
-	struct addrinfo hints;
-
-	assert(ip_str);
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_NUMERICHOST;
-#ifndef WANT_IPV6	/* do not convert ipv6 addresses */
-	hints.ai_family = AF_INET;
-#endif
-
-	/* some getaddrinfo implementations require that ai_socktype is set. */
-	hints.ai_socktype = SOCK_STREAM;
-
-	/* silly, but ngircd stores UINT16 in server config, not string */
-	snprintf(portstr, sizeof(portstr), "%u", (unsigned int) port);
-
-	ret = getaddrinfo(ip_str, portstr, &hints, &res0);
-	if (ret != 0)
-		return false;
-
-	assert(sizeof(*addr) >= res0->ai_addrlen);
-	if (sizeof(*addr) >= res0->ai_addrlen)
-		memcpy(addr, res0->ai_addr, res0->ai_addrlen);
-	else
-		ret = -1;
-	freeaddrinfo(res0);
-	return ret == 0;
-#else /* HAVE_GETADDRINFO */
-	assert(ip_str);
-	memset(addr, 0, sizeof *addr);
-#ifdef HAVE_sockaddr_in_len
-	addr->sin4.sin_len = sizeof(addr->sin4);
-#endif
-	addr->sin4.sin_family = AF_INET;
-# ifdef HAVE_INET_ATON
-	if (inet_aton(ip_str, &addr->sin4.sin_addr) == 0)
-		return false;
-# else
-	addr->sin4.sin_addr.s_addr = inet_addr(ip_str);
-	if (addr->sin4.sin_addr.s_addr == (unsigned) -1)
-		return false;
-# endif
-	ng_ipaddr_setport(addr, port);
-	return true;
-#endif /* HAVE_GETADDRINFO */
-}
-
-
-GLOBAL void
-ng_ipaddr_setport(ng_ipaddr_t *a, UINT16 port)
-{
-#ifdef WANT_IPV6
-	int af;
-
-	assert(a != NULL);
-
-	af = a->sa.sa_family;
-
-	assert(af == AF_INET || af == AF_INET6);
-
-	switch (af) {
-	case AF_INET:
-		a->sin4.sin_port = htons(port);
-		break;
-	case AF_INET6:
-		a->sin6.sin6_port = htons(port);
-		break;
-	}
-#else /* WANT_IPV6 */
-	assert(a != NULL);
-	assert(a->sin4.sin_family == AF_INET);
-	a->sin4.sin_port = htons(port);
-#endif /* WANT_IPV6 */
-}
-
-
-
-GLOBAL bool
-ng_ipaddr_ipequal(const ng_ipaddr_t *a, const ng_ipaddr_t *b)
-{
-	assert(a != NULL);
-	assert(b != NULL);
-#ifdef WANT_IPV6
-	if (a->sa.sa_family != b->sa.sa_family)
-		return false;
-	assert(ng_ipaddr_salen(a) == ng_ipaddr_salen(b));
-	switch (a->sa.sa_family) {
-	case AF_INET6:
-		return IN6_ARE_ADDR_EQUAL(&a->sin6.sin6_addr, &b->sin6.sin6_addr);
-	case AF_INET:
-		return memcmp(&a->sin4.sin_addr, &b->sin4.sin_addr, sizeof(a->sin4.sin_addr)) == 0;
-	}
-	return false;
-#else
-	assert(a->sin4.sin_family == AF_INET);
-	assert(b->sin4.sin_family == AF_INET);
-	return memcmp(&a->sin4.sin_addr, &b->sin4.sin_addr, sizeof(a->sin4.sin_addr)) == 0;
-#endif
-}
-
-
-#ifdef WANT_IPV6
-GLOBAL const char *
-ng_ipaddr_tostr(const ng_ipaddr_t *addr)
-{
-	static char strbuf[NG_INET_ADDRSTRLEN];
-
-	strbuf[0] = 0;
-
-	ng_ipaddr_tostr_r(addr, strbuf);
-	return strbuf;
-}
-
-
-/* str must be at least NG_INET_ADDRSTRLEN bytes long */
-GLOBAL bool
-ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *str)
-{
-#ifdef HAVE_GETNAMEINFO
-	const struct sockaddr *sa = (const struct sockaddr *) addr;
-	int ret;
-
-	*str = 0;
-
-	ret = getnameinfo(sa, ng_ipaddr_salen(addr),
-			str, NG_INET_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST);
-	/*
-	 * avoid leading ':'.
-	 * causes mis-interpretation of client host in e.g. /WHOIS
-	 */
-	if (*str == ':') {
-		char tmp[NG_INET_ADDRSTRLEN] = "0";
-		ret = getnameinfo(sa, ng_ipaddr_salen(addr),
-				  tmp + 1, (socklen_t)sizeof(tmp) - 1,
-				  NULL, 0, NI_NUMERICHOST);
-		if (ret == 0)
-			strlcpy(str, tmp, NG_INET_ADDRSTRLEN);
-	}
-	assert (ret == 0);
-	return ret == 0;
-#else
-	abort(); /* WANT_IPV6 depends on HAVE_GETNAMEINFO */
-#endif
-}
-
-#endif /* WANT_IPV6 */
-
-/* -eof- */
--- a/src/ipaddr/ng_ipaddr.h
+++ b/src/ipaddr/ng_ipaddr.h
@@ -1,124 +0,0 @@
-/*
- * (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
- */
-
-#ifndef NG_IPADDR_HDR
-#define NG_IPADDR_HDR
-#include "portab.h"
-
-/**
- * @file
- * Functions for AF_ agnostic ipv4/ipv6 handling (header).
- */
-
-#include <assert.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#else
-# define PF_INET AF_INET
-#endif
-
-
-#ifdef WANT_IPV6
-#define NG_INET_ADDRSTRLEN	INET6_ADDRSTRLEN
-#else
-#define NG_INET_ADDRSTRLEN	16
-#endif
-
-
-#ifdef WANT_IPV6
-typedef union {
-	struct sockaddr sa;
-	struct sockaddr_in sin4;
-	struct sockaddr_in6 sin6;
-} ng_ipaddr_t;
-#else
-/* assume compiler can't deal with typedef struct {... */
-struct NG_IP_ADDR_DONTUSE {
-	struct sockaddr_in sin4;
-};
-typedef struct NG_IP_ADDR_DONTUSE ng_ipaddr_t;
-#endif
-
-
-static inline int
-ng_ipaddr_af(const ng_ipaddr_t *a)
-{
-#ifdef WANT_IPV6
-	return a->sa.sa_family;
-#else
-	assert(a->sin4.sin_family == 0 || a->sin4.sin_family == AF_INET);
-	return a->sin4.sin_family;
-#endif
-}
-
-
-static inline socklen_t
-ng_ipaddr_salen(const ng_ipaddr_t *a)
-{
-#ifdef WANT_IPV6
-	assert(a->sa.sa_family == AF_INET || a->sa.sa_family == AF_INET6);
-	if (a->sa.sa_family == AF_INET6)
-		return (socklen_t)sizeof(a->sin6);
-#endif
-	assert(a->sin4.sin_family == AF_INET);
-	return (socklen_t)sizeof(a->sin4);
-}
-
-
-static inline UINT16
-ng_ipaddr_getport(const ng_ipaddr_t *a)
-{
-#ifdef WANT_IPV6
-	int af = a->sa.sa_family;
-
-	assert(af == AF_INET || af == AF_INET6);
-
-	if (af == AF_INET6)
-		return ntohs(a->sin6.sin6_port);
-#endif /* WANT_IPV6 */
-	assert(a->sin4.sin_family == AF_INET);
-	return ntohs(a->sin4.sin_port);
-}
-
-/*
- * init a ng_ipaddr_t object.
- * @param addr: pointer to ng_ipaddr_t to initialize.
- * @param ip_str: ip address in dotted-decimal (ipv4) or hexadecimal (ipv6) notation
- * @param port: transport layer port number to use.
- */
-GLOBAL bool ng_ipaddr_init PARAMS((ng_ipaddr_t *addr, const char *ip_str, UINT16 port));
-
-/* set sin4/sin6_port, depending on a->sa_family */
-GLOBAL void ng_ipaddr_setport PARAMS((ng_ipaddr_t *a, UINT16 port));
-
-/* return true if a and b have the same IP address. If a and b have different AF, return false. */
-GLOBAL bool ng_ipaddr_ipequal PARAMS((const ng_ipaddr_t *a, const ng_ipaddr_t *b));
-
-
-#ifdef WANT_IPV6
-/* convert struct sockaddr to string, returns pointer to static buffer */
-GLOBAL const char *ng_ipaddr_tostr PARAMS((const ng_ipaddr_t *addr));
-
-/* convert struct sockaddr to string. dest must be NG_INET_ADDRSTRLEN bytes long */
-GLOBAL bool ng_ipaddr_tostr_r PARAMS((const ng_ipaddr_t *addr, char *dest));
-#else
-static inline const char*
-ng_ipaddr_tostr(const ng_ipaddr_t *addr)
-{
-	return inet_ntoa(addr->sin4.sin_addr);
-}
-
-static inline bool
-ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d)
-{
-	strlcpy(d, inet_ntoa(addr->sin4.sin_addr), NG_INET_ADDRSTRLEN);
-	return true;
-}
-#endif
-#endif
-
-/* -eof- */
--- a/src/ngircd/.gitignore
+++ b/src/ngircd/.gitignore
@@ -1,3 +0,0 @@
-check-help
-check-version
-ngircd
--- a/src/ngircd/Makefile.am
+++ b/src/ngircd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2003 by Alexander Barton (alex@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,72 +8,75 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
+# $Id: Makefile.am,v 1.42 2003/12/04 14:05:16 alex Exp $
+#

 AUTOMAKE_OPTIONS = ../portab/ansi2knr

-INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
+INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool

-LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
- -varuse -retvalother -emptyret -unrecog
+LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN

 sbin_PROGRAMS = ngircd

-ngircd_SOURCES = ngircd.c array.c channel.c client.c conf.c conn.c conn-func.c \
-	conn-ssl.c conn-zip.c hash.c io.c irc.c irc-channel.c irc-info.c irc-login.c \
-	irc-mode.c irc-op.c irc-oper.c irc-server.c irc-write.c lists.c log.c \
-	match.c op.c numeric.c pam.c parse.c proc.c resolve.c sighandlers.c
+ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c conn-zip.c conn-func.c \
+	hash.c irc.c irc-channel.c irc-info.c irc-login.c irc-mode.c irc-op.c \
+	irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c \
+	rendezvous.c resolve.c

-ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr
+ngircd_LDFLAGS = -L../portab -L../tool

-ngircd_LDADD = -lngportab -lngtool -lngipaddr
+ngircd_LDADD = -lngportab -lngtool

-noinst_HEADERS = ngircd.h array.h channel.h client.h conf.h conf-ssl.h conn.h \
-	conn-func.h conn-ssl.h conn-zip.h hash.h io.h irc.h irc-channel.h \
-	irc-info.h irc-login.h irc-mode.h irc-op.h irc-oper.h irc-server.h \
-	irc-write.h lists.h log.h match.h numeric.h op.h pam.h parse.h proc.h \
-	resolve.h sighandlers.h defines.h messages.h
+noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h conn-zip.h conn-func.h \
+	hash.h irc.h irc-channel.h irc-info.h irc-login.h irc-mode.h irc-op.h \
+	irc-oper.h irc-server.h irc-write.h lists.h log.h match.h parse.h \
+	rendezvous.h resolve.h \
+	messages.h defines.h

 clean-local:
-	rm -f check-version check-help lint.out
+	rm -f check-version check-help lint.out cvs-version.*

 maintainer-clean-local:
 	rm -f Makefile Makefile.in

 check-version: Makefile
 	echo "#!/bin/sh" > check-version
-	echo "./ngircd --version | grep ngircd >/dev/null 2>&1" >>check-version
+	echo "./ngircd --version | grep ngircd > /dev/null 2>&1" >> check-version
 	chmod 755 check-version

 check-help: Makefile
 	echo "#!/bin/sh" > check-help
-	echo "./ngircd --help | grep help >/dev/null 2>&1" >>check-help
+	echo "./ngircd --help | grep help > /dev/null 2>&1" >> check-help
 	chmod 755 check-help

 lint:
-	@splint --version >/dev/null 2>&1 \
-	 || ( echo; echo "Error: \"splint\" not found!"; echo; exit 1 )
-	@echo; warnings=0; files=0; \
+	rm -f lint.out
 	for f in *.c; do \
 	 echo "checking $$f ..."; \
-	 splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \
-	  $(INCLUDES) $(AM_CFLAGS) >lint.out 2>&1; \
+	 splint $$f $(LINTARGS) -I./.. -I./../portab $(AM_CFLAGS) > lint.out 2>&1; \
 	 grep "no warnings" lint.out > /dev/null 2>&1; \
 	 if [ $$? -ne 0 ]; then \
-	  waswarning=1; \
-	  echo; grep -v "^Command Line: " lint.out; echo; \
-	  w=$$( grep "code warning" lint.out | $(AWK) "{ print \$$4 }" ); \
-	  [ "$$w" -gt 0 ] && warnings=`expr $$warnings + $$w`; \
-	  files=`expr $$files + 1`; \
-	 else \
-	  waswarning=0; \
+	  echo; cat lint.out; echo; \
 	 fi; \
-	 rm -f lint.out; \
-	done; \
-	[ $$waswarning -eq 0 ] && echo; \
-	[ $$warnings -gt 0 ] \
-	 && echo "Result: $$warnings warning(s) in $$files file(s)!" \
-	 || echo "Result: no warnings found."; \
-	echo; [ $$warnings -gt 0 ] && exit 1
+	done;
+
+ngircd.c: cvs-version.h
+
+irc-login.c: cvs-version.h
+
+irc-info.c: cvs-version.h
+
+cvs-version.h: cvs-date
+
+cvs-date:
+	grep VERSION ../config.h | grep "CVS" \
+	 && echo "#define CVSDATE \"$$( grep "\$$Id" $(srcdir)/*.c \
+	    | $(AWK) "{ print \$$9 }" | sort | tail -1 \
+	    | sed -e "s/\//-/g" )\"" > cvs-version.new \
+	 || echo "" > cvs-version.new
+	diff cvs-version.h cvs-version.new 2>/dev/null \
+	 || cp cvs-version.new cvs-version.h

 TESTS = check-version check-help

--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -1,328 +0,0 @@
-/*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * Please read the file COPYING, README and AUTHORS for more information.
- *
- * libarray - dynamically allocate arrays.
- * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- */
-
-/**
- * @file
- * Functions to dynamically allocate arrays.
- */
-
-#include "array.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "log.h"
-
-/* Enable more Debug messages in alloc / append / memmove code. */
-/* #define DEBUG_ARRAY */
-
-#define array_UNUSABLE(x)	( !(x)->mem )
-
-
-static bool
-safemult_sizet(size_t a, size_t b, size_t *res)
-{
-	size_t tmp = a * b;
-
-	if (b && (tmp / b != a))
-		return false;
-
-	*res = tmp;
-	return true;
-}
-
-
-void
-array_init(array *a)
-{
-	assert(a != NULL);
-	a->mem = NULL;
-	a->allocated = 0;
-	a->used = 0;
-}
-
-
-/* if realloc() fails, array_alloc return NULL. otherwise return pointer to elem pos in array */
-void *
-array_alloc(array * a, size_t size, size_t pos)
-{
-	size_t alloc, pos_plus1 = pos + 1;
-	char *tmp;
-
-	assert(size > 0);
-
-	if (pos_plus1 == 0 || !safemult_sizet(size, pos_plus1, &alloc))
-		return NULL;
-
-	if (a->allocated < alloc) {
-#ifdef DEBUG_ARRAY
-		Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.",
-		    a->allocated, alloc);
-#endif
-		tmp = realloc(a->mem, alloc);
-		if (!tmp)
-			return NULL;
-
-		a->mem = tmp;
-		a->allocated = alloc;
-		memset(a->mem + a->used, 0, a->allocated - a->used);
-		a->used = alloc;
-	}
-
-	assert(a->allocated >= a->used);
-
-	return a->mem + (pos * size);
-}
-
-
-/*return number of initialized ELEMS in a. */
-size_t
-array_length(const array * const a, size_t membersize)
-{
-	assert(a != NULL);
-	assert(membersize > 0);
-
-	if (array_UNUSABLE(a))
-		return 0;
-
-	assert(a->allocated);
-	return membersize ? a->used / membersize : 0;
-}
-
-
-/* copy array src to array dest */
-bool
-array_copy(array * dest, const array * const src)
-{
-	if (array_UNUSABLE(src))
-		return false;
-
-	assert(src->allocated);
-	return array_copyb(dest, src->mem, src->used);
-}
-
-
-/* return false on failure (realloc failure, invalid src/dest array) */
-bool
-array_copyb(array * dest, const char *src, size_t len)
-{
-	assert(dest != NULL);
-	assert(src != NULL );
-
-	if (!src || !dest)
-		return false;
-
-	array_trunc(dest);
-	return array_catb(dest, src, len);
-}
-
-
-/* copy string to dest */
-bool
-array_copys(array * dest, const char *src)
-{
-	return array_copyb(dest, src, strlen(src));
-}
-
-
-/* append len bytes from src to the array dest.
-return false if we could not append all bytes (realloc failure, invalid src/dest array) */
-bool
-array_catb(array * dest, const char *src, size_t len)
-{
-	size_t tmp;
-	size_t used;
-	char *ptr;
-
-	assert(dest != NULL);
-	assert(src != NULL);
-
-	if (!len)
-		return true;
-
-	if (!src || !dest)
-		return false;
-
-	used = dest->used;
-	tmp = used + len;
-
-	if (tmp < used || tmp < len)	/* integer overflow */
-		return false;
-
-	if (!array_alloc(dest, 1, tmp))
-		return false;
-
-	ptr = dest->mem;
-
-	assert(ptr != NULL);
-
-#ifdef DEBUG_ARRAY
-	Log(LOG_DEBUG,
-	    "array_catb(): appending %u bytes to array (now %u bytes in array).",
-	    len, tmp);
-#endif
-	memcpy(ptr + used, src, len);
-	dest->used = tmp;
-	return true;
-}
-
-
-/* append string to dest */
-bool
-array_cats(array * dest, const char *src)
-{
-	return array_catb(dest, src, strlen(src));
-}
-
-
-/* append trailing NUL byte to array */
-bool
-array_cat0(array * a)
-{
-	return array_catb(a, "", 1);
-}
-
-
-/* append trailing NUL byte to array, but do not count it. */
-bool
-array_cat0_temporary(array * a)
-{
-	char *endpos = array_alloc(a, 1, array_bytes(a));
-	if (!endpos)
-		return false;
-
-	*endpos = '\0';
-	return true;
-}
-
-/* add contents of array src to array dest. */
-bool
-array_cat(array * dest, const array * const src)
-{
-	if (array_UNUSABLE(src))
-		return false;
-
-	return array_catb(dest, src->mem, src->used);
-}
-
-
-/* return pointer to the element at pos.
-   return NULL if the array is unallocated, or if pos is larger than
-   the number of elements stored int the array. */
-void *
-array_get(array * a, size_t membersize, size_t pos)
-{
-	size_t totalsize;
-	size_t posplus1 = pos + 1;
-
-	assert(membersize > 0);
-	assert(a != NULL);
-
-	if (!posplus1 || array_UNUSABLE(a))
-		return NULL;
-
-	if (!safemult_sizet(posplus1, membersize, &totalsize))
-		return NULL;
-
-	if (a->allocated < totalsize)
-		return NULL;
-
-	totalsize = pos * membersize;
-	return a->mem + totalsize;
-}
-
-
-void
-array_free(array * a)
-{
-	assert(a != NULL);
-#ifdef DEBUG_ARRAY
-	Log(LOG_DEBUG,
-	    "array_free(): %u bytes free'd (%u bytes still used at time of free()).",
-	    a->allocated, a->used);
-#endif
-	free(a->mem);
-	a->mem = NULL;
-	a->allocated = 0;
-	a->used = 0;
-}
-
-void
-array_free_wipe(array *a)
-{
-	size_t bytes = a->allocated;
-	if (bytes)
-		memset(a->mem, 0, bytes);
-	array_free(a);
-}
-
-void *
-array_start(const array * const a)
-{
-	assert(a != NULL);
-	return a->mem;
-}
-
-
-void
-array_trunc(array * a)
-{
-	assert(a != NULL);
-	a->used = 0;
-}
-
-
-void
-array_truncate(array * a, size_t membersize, size_t len)
-{
-	size_t newlen;
-	assert(a != NULL);
-	if (!safemult_sizet(membersize, len, &newlen))
-		return;
-
-	if (newlen <= a->allocated)
-		a->used = newlen;
-}
-
-
-/* move elements starting at pos to beginning of array */
-void
-array_moveleft(array * a, size_t membersize, size_t pos)
-{
-	size_t bytepos;
-
-	assert(a != NULL);
-	assert(membersize > 0);
-
-	if (!safemult_sizet(membersize, pos, &bytepos)) {
-		a->used = 0;
-		return;
-	}
-
-	if (!bytepos)
-		return;	/* nothing to do */
-
-#ifdef DEBUG_ARRAY
-	Log(LOG_DEBUG,
-	    "array_moveleft(): %u bytes used in array, starting at position %u.",
-	    a->used, bytepos);
-#endif
-	if (a->used <= bytepos) {
-		a->used = 0;
-		return;
-	}
-
-	a->used -= bytepos;
-	memmove(a->mem, a->mem + bytepos, a->used);
-}
-
-/* -eof- */
--- a/src/ngircd/array.h
+++ b/src/ngircd/array.h
@@ -1,104 +0,0 @@
-/*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * Please read the file COPYING, README and AUTHORS for more information.
- *
- * libarray - dynamically allocate arrays.
- * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- */
-
-#ifndef array_h_included
-#define array_h_included
-
-/**
- * @file
- * Functions to dynamically allocate arrays (header).
- */
-
-#include "portab.h"
-
-typedef struct {
-	char * mem;
-	size_t allocated;
-	size_t used;
-} array;
-
-/* allocated: mem != NULL, used >= 0 && used <= allocated, allocated > 0
-   unallocated: mem == NULL, allocated == 0, used == 0 */
-
-#define array_unallocated(x)	(array_bytes(x)==0)
-#define INIT_ARRAY		{ NULL, 0, 0 }
-
-/* set all variables in a to 0 */
-extern void array_init PARAMS((array *a));
-
-/* allocates space for at least nmemb+1 elements of size bytes each.
-   return pointer to elem at pos, or NULL if realloc() fails */
-extern void * array_alloc PARAMS((array *a, size_t size, size_t pos));
-
-/* returns the number of initialized BYTES in a. */
-#define array_bytes(array)	( (array)->used )
-
-/* returns the number of initialized ELEMS in a. */
-extern size_t array_length PARAMS((const array* const a, size_t elemsize));
-
-/* _copy functions: copy src to dest.
-   return true if OK, else false (e. g. realloc failure, invalid src/dest
-   array, ...). In that case dest is left unchanged. */
-
-/* copy array src to dest */
-extern bool array_copy PARAMS((array* dest, const array* const src));
-
-/* copy len bytes from src to array dest. */
-extern bool array_copyb PARAMS((array* dest, const char* src, size_t len));
-
-/* copy string to dest */
-extern bool array_copys PARAMS((array* dest, const char* src));
-
-/* _cat functions: append src to dest.
-   return true if OK, else false (e. g. realloc failure, invalid src/dest
-   array, ...). In that case dest is left unchanged. */
-
-/* append len bytes from src to array dest. */
-extern bool array_catb PARAMS((array* dest, const char* src, size_t len));
-
-/* append string to dest */
-extern bool array_cats PARAMS((array* dest, const char* src));
-
-/* append NUL byte to dest */
-extern bool array_cat0 PARAMS((array* dest));
-
-/* append NUL byte to dest, but do not count null byte */
-extern bool array_cat0_temporary PARAMS((array* dest));
-
-/* append contents of array src to array dest. */
-extern bool array_cat PARAMS((array* dest, const array* const src));
-
-/* return pointer to element at pos.
-   return NULL if the array is unallocated or if pos is larger than the number
-   of elements stored int the array. */
-extern void* array_get PARAMS((array* a, size_t membersize, size_t pos));
-
-/* free the contents of this array. */
-extern void array_free PARAMS((array* a));
-
-/* overwrite array with zeroes before free */
-extern void array_free_wipe PARAMS((array* a));
-
-/* return pointer to first element in this array */
-extern void* array_start PARAMS((const array* const a));
-
-/* reset this array (the memory is not free'd */
-extern void array_trunc PARAMS((array* a));
-
-/* set number of used elements in this array to len */
-extern void array_truncate PARAMS((array* a, size_t membersize, size_t len));
-
-/* move elements starting at pos to beginning of array */
-extern void array_moveleft PARAMS((array* a, size_t membersize, size_t pos));
-
-#endif
-
-/* -eof- */
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
--- a/src/ngircd/channel.h
+++ b/src/ngircd/channel.h
@@ -1,45 +1,36 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: channel.h,v 1.26 2002/12/16 23:05:24 alex Exp $
+ *
+ * Channel management (header)
 */

+
 #ifndef __channel_h__
 #define __channel_h__

-/**
- * @file
- * Channel management (header)
- */

 #if defined(__channel_c__) | defined(S_SPLINT_S)

-#include "lists.h"
 #include "defines.h"
-#include "array.h"

 typedef struct _CHANNEL
 {
 	struct _CHANNEL *next;
-	char name[CHANNEL_NAME_LEN];	/* Name of the channel */
+	CHAR name[CHANNEL_NAME_LEN];	/* Name of the channel */
 	UINT32 hash;			/* Hash of the (lowecase!) name */
-	char modes[CHANNEL_MODE_LEN];	/* Channel modes */
-	array topic;			/* Topic of the channel */
-#ifndef STRICT_RFC
-	time_t creation_time;		/* Channel creation time */
-	time_t topic_time;		/* Time when topic was set */
-	char topic_who[CLIENT_NICK_LEN];/* Nickname of user that set topic */
-#endif
-	char key[CLIENT_PASS_LEN];	/* Channel key ("password", mode "k" ) */
-	unsigned long maxusers;		/* Maximum number of members (mode "l") */
-	struct list_head list_bans;	/* list head of banned users */
-	struct list_head list_invites;	/* list head of invited users */
-	array keyfile;			/* Name of the channel key file */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Channel modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Topic of the channel */
+	CHAR key[CLIENT_PASS_LEN];	/* Channel key ("password", mode "k" ) */
+	LONG maxusers;			/* Maximum number of members (mode "l") */
 } CHANNEL;

 typedef struct _CLIENT2CHAN
@@ -47,7 +38,7 @@ typedef struct _CLIENT2CHAN
 	struct _CLIENT2CHAN *next;
 	CLIENT *client;
 	CHANNEL *channel;
-	char modes[CHANNEL_MODE_LEN];	/* User-Modes in Channel */
+	CHAR modes[CHANNEL_MODE_LEN];	/* User-Modes in dem Channel */
 } CL2CHAN;

 #else
@@ -57,39 +48,37 @@ typedef POINTER CL2CHAN;

 #endif

-GLOBAL struct list_head *Channel_GetListBans PARAMS((CHANNEL *c));
-GLOBAL struct list_head *Channel_GetListInvites PARAMS((CHANNEL *c));

-GLOBAL void Channel_Init PARAMS(( void ));
-GLOBAL void Channel_InitPredefined PARAMS((  void ));
-GLOBAL void Channel_Exit PARAMS(( void ));
+GLOBAL VOID Channel_Init PARAMS(( VOID ));
+GLOBAL VOID Channel_InitPredefined PARAMS((  VOID ));
+GLOBAL VOID Channel_Exit PARAMS(( VOID ));

-GLOBAL bool Channel_Join PARAMS(( CLIENT *Client, const char *Name ));
-GLOBAL bool Channel_Part PARAMS(( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason ));
+GLOBAL BOOLEAN Channel_Join PARAMS(( CLIENT *Client, CHAR *Name ));
+GLOBAL BOOLEAN Channel_Part PARAMS(( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));

-GLOBAL void Channel_Quit PARAMS(( CLIENT *Client, const char *Reason ));
+GLOBAL VOID Channel_Quit PARAMS(( CLIENT *Client, CHAR *Reason ));

-GLOBAL void Channel_Kick PARAMS((CLIENT *Peer, CLIENT *Target, CLIENT *Origin,
-				 const char *Name, const char *Reason));
+GLOBAL VOID Channel_Kick PARAMS((  CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));

-GLOBAL unsigned long Channel_Count PARAMS(( void ));
-GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan ));
-GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client ));
+GLOBAL LONG Channel_Count PARAMS(( VOID ));
+GLOBAL LONG Channel_MemberCount PARAMS(( CHANNEL *Chan ));
+GLOBAL INT Channel_CountForUser PARAMS(( CLIENT *Client ));
+GLOBAL INT Channel_PCount PARAMS(( VOID ));

-GLOBAL const char *Channel_Name PARAMS(( const CHANNEL *Chan ));
-GLOBAL char *Channel_Modes PARAMS(( CHANNEL *Chan ));
-GLOBAL char *Channel_Topic PARAMS(( CHANNEL *Chan ));
-GLOBAL char *Channel_Key PARAMS(( CHANNEL *Chan ));
-GLOBAL unsigned long Channel_MaxUsers PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Name PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Modes PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Topic PARAMS(( CHANNEL *Chan ));
+GLOBAL CHAR *Channel_Key PARAMS(( CHANNEL *Chan ));
+GLOBAL LONG Channel_MaxUsers PARAMS(( CHANNEL *Chan ));

-GLOBAL void Channel_SetTopic PARAMS(( CHANNEL *Chan, CLIENT *Client, const char *Topic ));
-GLOBAL void Channel_SetModes PARAMS(( CHANNEL *Chan, const char *Modes ));
-GLOBAL void Channel_SetKey PARAMS(( CHANNEL *Chan, const char *Key ));
-GLOBAL void Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, unsigned long Count ));
+GLOBAL VOID Channel_SetTopic PARAMS(( CHANNEL *Chan, CHAR *Topic ));
+GLOBAL VOID Channel_SetModes PARAMS(( CHANNEL *Chan, CHAR *Modes ));
+GLOBAL VOID Channel_SetKey PARAMS(( CHANNEL *Chan, CHAR *Key ));
+GLOBAL VOID Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, LONG Count ));

-GLOBAL CHANNEL *Channel_Search PARAMS(( const char *Name ));
+GLOBAL CHANNEL *Channel_Search PARAMS(( CHAR *Name ));

-GLOBAL CHANNEL *Channel_First PARAMS(( void ));
+GLOBAL CHANNEL *Channel_First PARAMS(( VOID ));
 GLOBAL CHANNEL *Channel_Next PARAMS(( CHANNEL *Chan ));

 GLOBAL CL2CHAN *Channel_FirstMember PARAMS(( CHANNEL *Chan ));
@@ -100,47 +89,23 @@ GLOBAL CL2CHAN *Channel_NextChannelOf PARAMS(( CLIENT *Client, CL2CHAN *Cl2Chan
 GLOBAL CLIENT *Channel_GetClient PARAMS(( CL2CHAN *Cl2Chan ));
 GLOBAL CHANNEL *Channel_GetChannel PARAMS(( CL2CHAN *Cl2Chan ));

-GLOBAL bool Channel_IsValidName PARAMS(( const char *Name ));
+GLOBAL BOOLEAN Channel_IsValidName PARAMS(( CHAR *Name ));

-GLOBAL bool Channel_ModeAdd PARAMS(( CHANNEL *Chan, char Mode ));
-GLOBAL bool Channel_ModeDel PARAMS(( CHANNEL *Chan, char Mode ));
+GLOBAL BOOLEAN Channel_ModeAdd PARAMS(( CHANNEL *Chan, CHAR Mode ));
+GLOBAL BOOLEAN Channel_ModeDel PARAMS(( CHANNEL *Chan, CHAR Mode ));

-GLOBAL bool Channel_UserModeAdd PARAMS(( CHANNEL *Chan, CLIENT *Client, char Mode ));
-GLOBAL bool Channel_UserModeDel PARAMS(( CHANNEL *Chan, CLIENT *Client, char Mode ));
-GLOBAL char *Channel_UserModes PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+GLOBAL BOOLEAN Channel_UserModeAdd PARAMS(( CHANNEL *Chan, CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Channel_UserModeDel PARAMS(( CHANNEL *Chan, CLIENT *Client, CHAR Mode ));
+GLOBAL CHAR *Channel_UserModes PARAMS(( CHANNEL *Chan, CLIENT *Client ));

-GLOBAL bool Channel_IsMemberOf PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+GLOBAL BOOLEAN Channel_IsMemberOf PARAMS(( CHANNEL *Chan, CLIENT *Client ));

-GLOBAL bool Channel_Write PARAMS((CHANNEL *Chan, CLIENT *From, CLIENT *Client,
-				  const char *Command, bool SendErrors,
-				  const char *Text));
+GLOBAL BOOLEAN Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ));

-GLOBAL CHANNEL *Channel_Create PARAMS(( const char *Name ));
+GLOBAL CHANNEL *Channel_Create PARAMS(( CHAR *Name ));

-#ifndef STRICT_RFC
-GLOBAL unsigned int Channel_TopicTime PARAMS(( CHANNEL *Chan ));
-GLOBAL char *Channel_TopicWho PARAMS(( CHANNEL *Chan ));
-GLOBAL unsigned int Channel_CreationTime PARAMS(( CHANNEL *Chan ));
-#endif
-
-GLOBAL bool Channel_AddInvite PARAMS((CHANNEL *c, const char *Mask, bool OnlyOnce ));
-GLOBAL bool Channel_AddBan PARAMS((CHANNEL *c, const char *Mask ));
-
-GLOBAL bool Channel_ShowBans PARAMS((CLIENT *client, CHANNEL *c));
-GLOBAL bool Channel_ShowInvites PARAMS((CLIENT *client, CHANNEL *c));
-
-GLOBAL void Channel_LogServer PARAMS((const char *msg));
-
-GLOBAL bool Channel_CheckKey PARAMS((CHANNEL *Chan, CLIENT *Client,
-				     const char *Key));
-
-GLOBAL void Channel_CheckAdminRights PARAMS((CHANNEL *Chan, CLIENT *Client,
-					     CLIENT *Origin, bool *OnChannel,
-					     bool *AdminOk, bool *UseServerMode));
-
-#define Channel_IsLocal(c) (Channel_Name(c)[0] == '&')
-#define Channel_IsModeless(c) (Channel_Name(c)[0] == '+')

 #endif

+
 /* -eof- */
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -1,63 +1,58 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: client.h,v 1.34 2003/01/15 14:28:25 alex Exp $
+ *
+ * Client management (header)
 */

+
 #ifndef __client_h__
 #define __client_h__

-/**
- * @file
- * Client management (header)
- */

 #define CLIENT_UNKNOWN 1		/* connection of unknown type */
 #define CLIENT_GOTPASS 2		/* client did send PASS */
 #define CLIENT_GOTNICK 4		/* client did send NICK */
 #define CLIENT_GOTUSER 8		/* client did send USER */
 #define CLIENT_USER 16			/* client is an IRC user */
-#define CLIENT_SERVER 32		/* client is a server */
-#define CLIENT_SERVICE 64		/* client is a service */
-#define CLIENT_UNKNOWNSERVER 128	/* unregistered server connection */
-#define CLIENT_GOTPASS_2813 256		/* client did send PASS, RFC 2813 style */
-#ifndef STRICT_RFC
-# define CLIENT_WAITAUTHPING 512	/* waiting for AUTH PONG from client */
-#endif
+#define CLIENT_UNKNOWNSERVER 32		/* unregistered server connection */
+#define CLIENT_GOTPASSSERVER 64		/* client did send PASS in "server style" */
+#define CLIENT_SERVER 128		/* client is a server */
+#define CLIENT_SERVICE 256		/* client is a service */

-#define CLIENT_TYPE int
+#define CLIENT_TYPE INT

-#include "defines.h"

 #if defined(__client_c__) | defined(S_SPLINT_S)

+#include "defines.h"
+
 typedef struct _CLIENT
 {
-	time_t starttime;		/* Start time of link */
-	char id[CLIENT_ID_LEN];		/* nick (user) / ID (server) */
+	CHAR id[CLIENT_ID_LEN];		/* nick (user) / ID (server) */
 	UINT32 hash;			/* hash of lower-case ID */
 	POINTER *next;			/* pointer to next client structure */
 	CLIENT_TYPE type;		/* type of client, see CLIENT_xxx */
 	CONN_ID conn_id;		/* ID of the connection (if local) or NONE (remote) */
 	struct _CLIENT *introducer;	/* ID of the servers which the client is connected to */
 	struct _CLIENT *topserver;	/* toplevel servers (only valid if client is a server) */
-	char pwd[CLIENT_PASS_LEN];	/* password received of the client */
-	char host[CLIENT_HOST_LEN];	/* hostname of the client */
-	char user[CLIENT_USER_LEN];	/* user name ("login") */
-#if defined(PAM) && defined(IDENTAUTH)
-	char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */
-#endif
-	char info[CLIENT_INFO_LEN];	/* long user name (user) / info text (server) */
-	char modes[CLIENT_MODE_LEN];	/* client modes */
-	int hops, token, mytoken;	/* "hops" and "Token" (see SERVER command) */
-	bool oper_by_me;		/* client is local IRC operator on this server? */
-	char away[CLIENT_AWAY_LEN];	/* AWAY text (valid if mode 'a' is set) */
-	char flags[CLIENT_FLAGS_LEN];	/* flags of the client */
+	CHAR pwd[CLIENT_PASS_LEN];	/* password received of the client */
+	CHAR host[CLIENT_HOST_LEN];	/* hostname of the client */
+	CHAR user[CLIENT_USER_LEN];	/* user name ("login") */
+	CHAR info[CLIENT_INFO_LEN];	/* long user name (user) / info text (server) */
+	CHAR modes[CLIENT_MODE_LEN];	/* client modes */
+	INT hops, token, mytoken;	/* "hops" and "Token" (see SERVER command) */
+	BOOLEAN oper_by_me;		/* client is local IRC operator on this server? */
+	CHAR away[CLIENT_AWAY_LEN];	/* AWAY text (valid if mode 'a' is set) */
+	CHAR flags[CLIENT_FLAGS_LEN];	/* flags of the client */
 } CLIENT;

 #else
@@ -67,106 +62,84 @@ typedef POINTER CLIENT;
 #endif


-typedef struct _WHOWAS
-{
-	time_t time;			/* time stamp of entry or 0 if unused */
-	char id[CLIENT_NICK_LEN];	/* client nick name */
-	char host[CLIENT_HOST_LEN];	/* hostname of the client */
-	char user[CLIENT_USER_LEN];	/* user name ("login") */
-	char info[CLIENT_INFO_LEN];	/* long user name */
-	char server[CLIENT_HOST_LEN];	/* server name */
-} WHOWAS;
+GLOBAL VOID Client_Init PARAMS(( VOID ));
+GLOBAL VOID Client_Exit PARAMS(( VOID ));

+GLOBAL CLIENT *Client_NewLocal PARAMS(( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_NewRemoteServer PARAMS(( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_NewRemoteUser PARAMS(( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented ));
+GLOBAL CLIENT *Client_New PARAMS(( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented ));

-GLOBAL void Client_Init PARAMS(( void ));
-GLOBAL void Client_Exit PARAMS(( void ));
+GLOBAL VOID Client_Destroy PARAMS(( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit ));
+#ifdef CONN_MODULE
+GLOBAL VOID Client_DestroyNow PARAMS(( CLIENT *Client ));
+#endif

-GLOBAL CLIENT *Client_NewLocal PARAMS(( CONN_ID Idx, const char *Hostname, int Type, bool Idented ));
-GLOBAL CLIENT *Client_NewRemoteServer PARAMS(( CLIENT *Introducer, const char *Hostname, CLIENT *TopServer, int Hops, int Token, const char *Info, bool Idented ));
-GLOBAL CLIENT *Client_NewRemoteUser PARAMS(( CLIENT *Introducer, const char *Nick, int Hops, const char *User, const char *Hostname, int Token, const char *Modes, const char *Info, bool Idented ));
+GLOBAL CLIENT *Client_ThisServer PARAMS(( VOID ));

-GLOBAL void Client_Destroy PARAMS(( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool SendQuit ));
+GLOBAL CLIENT *Client_GetFromConn PARAMS(( CONN_ID Idx ));
+GLOBAL CLIENT *Client_GetFromToken PARAMS(( CLIENT *Client, INT Token ));

-GLOBAL CLIENT *Client_ThisServer PARAMS(( void ));
-
-GLOBAL CLIENT *Client_GetFromToken PARAMS(( CLIENT *Client, int Token ));
-
-GLOBAL CLIENT *Client_Search PARAMS(( const char *ID ));
-GLOBAL CLIENT *Client_First PARAMS(( void ));
+GLOBAL CLIENT *Client_Search PARAMS(( CHAR *ID ));
+GLOBAL CLIENT *Client_First PARAMS(( VOID ));
 GLOBAL CLIENT *Client_Next PARAMS(( CLIENT *c ));

-GLOBAL int Client_Type PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_Type PARAMS(( CLIENT *Client ));
 GLOBAL CONN_ID Client_Conn PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_ID PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Mask PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_MaskCloaked PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Info PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_User PARAMS(( CLIENT *Client ));
-#ifdef PAM
-GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client ));
-#endif
-GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Password PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Modes PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Flags PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_ID PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Mask PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Info PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_User PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Hostname PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Password PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Modes PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Flags PARAMS(( CLIENT *Client ));
 GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client ));
-GLOBAL bool Client_OperByMe PARAMS(( CLIENT *Client ));
-GLOBAL int Client_Hops PARAMS(( CLIENT *Client ));
-GLOBAL int Client_Token PARAMS(( CLIENT *Client ));
-GLOBAL int Client_MyToken PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN Client_OperByMe PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_Hops PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_Token PARAMS(( CLIENT *Client ));
+GLOBAL INT Client_MyToken PARAMS(( CLIENT *Client ));
 GLOBAL CLIENT *Client_TopServer PARAMS(( CLIENT *Client ));
 GLOBAL CLIENT *Client_NextHop PARAMS(( CLIENT *Client ));
-GLOBAL char *Client_Away PARAMS(( CLIENT *Client ));
-GLOBAL time_t Client_StartTime PARAMS(( CLIENT *Client ));
+GLOBAL CHAR *Client_Away PARAMS(( CLIENT *Client ));

-GLOBAL bool Client_HasMode PARAMS(( CLIENT *Client, char Mode ));
+GLOBAL BOOLEAN Client_HasMode PARAMS(( CLIENT *Client, CHAR Mode ));

-GLOBAL void Client_SetHostname PARAMS(( CLIENT *Client, const char *Hostname ));
-GLOBAL void Client_SetID PARAMS(( CLIENT *Client, const char *Nick ));
-GLOBAL void Client_SetUser PARAMS(( CLIENT *Client, const char *User, bool Idented ));
-GLOBAL void Client_SetOrigUser PARAMS(( CLIENT *Client, const char *User ));
-GLOBAL void Client_SetInfo PARAMS(( CLIENT *Client, const char *Info ));
-GLOBAL void Client_SetPassword PARAMS(( CLIENT *Client, const char *Pwd ));
-GLOBAL void Client_SetType PARAMS(( CLIENT *Client, int Type ));
-GLOBAL void Client_SetHops PARAMS(( CLIENT *Client, int Hops ));
-GLOBAL void Client_SetToken PARAMS(( CLIENT *Client, int Token ));
-GLOBAL void Client_SetOperByMe PARAMS(( CLIENT *Client, bool OperByMe ));
-GLOBAL void Client_SetModes PARAMS(( CLIENT *Client, const char *Modes ));
-GLOBAL void Client_SetFlags PARAMS(( CLIENT *Client, const char *Flags ));
-GLOBAL void Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer ));
-GLOBAL void Client_SetAway PARAMS(( CLIENT *Client, const char *Txt ));
+GLOBAL VOID Client_SetHostname PARAMS(( CLIENT *Client, CHAR *Hostname ));
+GLOBAL VOID Client_SetID PARAMS(( CLIENT *Client, CHAR *Nick ));
+GLOBAL VOID Client_SetUser PARAMS(( CLIENT *Client, CHAR *User, BOOLEAN Idented ));
+GLOBAL VOID Client_SetInfo PARAMS(( CLIENT *Client, CHAR *Info ));
+GLOBAL VOID Client_SetPassword PARAMS(( CLIENT *Client, CHAR *Pwd ));
+GLOBAL VOID Client_SetType PARAMS(( CLIENT *Client, INT Type ));
+GLOBAL VOID Client_SetHops PARAMS(( CLIENT *Client, INT Hops ));
+GLOBAL VOID Client_SetToken PARAMS(( CLIENT *Client, INT Token ));
+GLOBAL VOID Client_SetOperByMe PARAMS(( CLIENT *Client, BOOLEAN OperByMe ));
+GLOBAL VOID Client_SetModes PARAMS(( CLIENT *Client, CHAR *Modes ));
+GLOBAL VOID Client_SetFlags PARAMS(( CLIENT *Client, CHAR *Flags ));
+GLOBAL VOID Client_SetIntroducer PARAMS(( CLIENT *Client, CLIENT *Introducer ));
+GLOBAL VOID Client_SetAway PARAMS(( CLIENT *Client, CHAR *Txt ));

-GLOBAL bool Client_ModeAdd PARAMS(( CLIENT *Client, char Mode ));
-GLOBAL bool Client_ModeDel PARAMS(( CLIENT *Client, char Mode ));
+GLOBAL BOOLEAN Client_ModeAdd PARAMS(( CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Client_ModeDel PARAMS(( CLIENT *Client, CHAR Mode ));

-GLOBAL bool Client_CheckNick PARAMS(( CLIENT *Client, char *Nick ));
-GLOBAL bool Client_CheckID PARAMS(( CLIENT *Client, char *ID ));
+GLOBAL BOOLEAN Client_CheckNick PARAMS(( CLIENT *Client, CHAR *Nick ));
+GLOBAL BOOLEAN Client_CheckID PARAMS(( CLIENT *Client, CHAR *ID ));

-GLOBAL long Client_UserCount PARAMS(( void ));
-GLOBAL long Client_ServiceCount PARAMS(( void ));
-GLOBAL long Client_ServerCount PARAMS(( void ));
-GLOBAL unsigned long Client_OperCount PARAMS(( void ));
-GLOBAL unsigned long Client_UnknownCount PARAMS(( void ));
-GLOBAL long Client_MyUserCount PARAMS(( void ));
-GLOBAL long Client_MyServiceCount PARAMS(( void ));
-GLOBAL unsigned long Client_MyServerCount PARAMS(( void ));
-GLOBAL long Client_MaxUserCount PARAMS((  void ));
-GLOBAL long Client_MyMaxUserCount PARAMS((  void ));
+GLOBAL LONG Client_UserCount PARAMS(( VOID ));
+GLOBAL LONG Client_ServiceCount PARAMS(( VOID ));
+GLOBAL LONG Client_ServerCount PARAMS(( VOID ));
+GLOBAL LONG Client_OperCount PARAMS(( VOID ));
+GLOBAL LONG Client_UnknownCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyUserCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyServiceCount PARAMS(( VOID ));
+GLOBAL LONG Client_MyServerCount PARAMS(( VOID ));
+GLOBAL LONG Client_MaxUserCount PARAMS((  VOID ));
+GLOBAL LONG Client_MyMaxUserCount PARAMS((  VOID ));

-GLOBAL bool Client_IsValidNick PARAMS(( const char *Nick ));
+GLOBAL BOOLEAN Client_IsValidNick PARAMS(( CHAR *Nick ));

-GLOBAL WHOWAS *Client_GetWhowas PARAMS(( void ));
-GLOBAL int Client_GetLastWhowasIndex PARAMS(( void ));
-
-GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client ));
-
-GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client));
-
-#ifdef DEBUG
-GLOBAL void Client_DebugDump PARAMS((void));
-#endif

 #endif

+
 /* -eof- */
--- a/src/ngircd/conf-ssl.h
+++ b/src/ngircd/conf-ssl.h
@@ -1,52 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- */
-
-#ifndef conf_ssl_h
-#define conf_ssl_h
-
-/**
- * @file
- * SSL related definitions
- */
-
-#ifdef HAVE_LIBSSL
-#define SSL_SUPPORT
-#include <openssl/ssl.h>
-#endif
-#ifdef HAVE_LIBGNUTLS
-#define SSL_SUPPORT
-#include <gnutls/gnutls.h>
-#ifndef LIBGNUTLS_VERSION_MAJOR
-#define gnutls_certificate_credentials_t gnutls_certificate_credentials
-#define gnutls_cipher_algorithm_t gnutls_cipher_algorithm
-#define gnutls_datum_t gnutls_datum
-#define gnutls_dh_params_t gnutls_dh_params
-#define gnutls_session_t gnutls_session
-#define gnutls_transport_ptr_t gnutls_transport_ptr
-#endif
-#endif
-
-#ifdef SSL_SUPPORT
-struct ConnSSL_State {
-#ifdef HAVE_LIBSSL
-	SSL *ssl;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	gnutls_session gnutls_session;
-	void *cookie;		/* pointer to server configuration structure
-				   (for outgoing connections), or NULL. */
-#endif
-};
-
-bool
-ConnSSL_InitLibrary(void);
-#else
-static inline bool
-ConnSSL_InitLibrary(void)
-{ return true; }
-#endif /* SSL_SUPPORT */
-
-#endif /* conf_ssl_h */
-
-/* -eof- */
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -1,248 +1,136 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conf.h,v 1.28.2.1 2004/05/07 11:24:18 alex Exp $
+ *
+ * Configuration management (header)
 */

+
 #ifndef __conf_h__
 #define __conf_h__

-/**
- * @file
- * Configuration management (header)
- */
-
 #include <time.h>

 #include "defines.h"
-#include "array.h"
-#include "portab.h"
-#include "tool.h"
-#include "ng_ipaddr.h"
-#include "proc.h"
-#include "conf-ssl.h"

-/**
- * Configured IRC operator.
- * Please note the the name of the IRC operaor and his nick have nothing to
- * do with each other! The IRC operator is only identified by the name and
- * password configured in this structure.
- */
-struct Conf_Oper {
-	char name[CLIENT_PASS_LEN];	/**< Name (ID) */
-	char pwd[CLIENT_PASS_LEN];	/**< Password */
-	char *mask;			/**< Allowed host mask */
-};

-/**
- * Configured server.
- * Peers to which this daemon should establish an outgoing server link must
- * have set a port number; all other servers are allowed to connect to this one.
- */
+typedef struct _Conf_Oper
+{
+	CHAR name[CLIENT_PASS_LEN];	/* Name (ID) of IRC operator */
+	CHAR pwd[CLIENT_PASS_LEN];	/* Password */
+} CONF_OPER;
+
 typedef struct _Conf_Server
 {
-	char host[HOST_LEN];		/**< Hostname */
-	char name[CLIENT_ID_LEN];	/**< IRC client ID */
-	char pwd_in[CLIENT_PASS_LEN];	/**< Password which must be received */
-	char pwd_out[CLIENT_PASS_LEN];	/**< Password to send to the peer */
-	UINT16 port;			/**< Server port to connect to */
-	int group;			/**< Group ID of this server */
-	time_t lasttry;			/**< Time of last connection attempt */
-	PROC_STAT res_stat;		/**< Status of the resolver */
-	int flags;			/**< Server flags */
-	CONN_ID conn_id;		/**< ID of server connection or NONE */
-	ng_ipaddr_t bind_addr;		/**< Source address to use for outgoing
-					     connections */
-	ng_ipaddr_t dst_addr[2];	/**< List of addresses to connect to */
-#ifdef SSL_SUPPORT
-	bool SSLConnect;		/**< Establish connection using SSL? */
-#endif
-	char svs_mask[CLIENT_ID_LEN];	/**< Mask of nick names that should be
-					     treated and counted as services */
+	CHAR host[HOST_LEN];		/* Hostname */
+	CHAR ip[16];			/* IP address (Resolver) */
+	CHAR name[CLIENT_ID_LEN];	/* IRC-Client-ID */
+	CHAR pwd_in[CLIENT_PASS_LEN];	/* Password which must be received */
+	CHAR pwd_out[CLIENT_PASS_LEN];	/* Password to send to peer */
+	INT port;			/* Server port */
+	INT group;			/* Group of server */
+	time_t lasttry;			/* Last connect attempt */
+	RES_STAT *res_stat;		/* Status of the resolver */
+	INT flags;			/* Flags */
+	CONN_ID conn_id;		/* ID of server connection or NONE */
 } CONF_SERVER;

-
-#ifdef SSL_SUPPORT
-/** Configuration options required for SSL support */
-struct SSLOptions {
-	char *KeyFile;			/**< SSL key file */
-	char *CertFile;			/**< SSL certificate file */
-	char *DHFile;			/**< File containing DH parameters */
-	array ListenPorts;		/**< Array of listening SSL ports */
-	array KeyFilePassword;		/**< Key file password */
-};
-#endif
-
-
-/** Pre-defined channels */
-struct Conf_Channel {
-	char name[CHANNEL_NAME_LEN];	/**< Name of the channel */
-	char modes[CHANNEL_MODE_LEN];	/**< Initial channel modes */
-	char key[CLIENT_PASS_LEN];      /**< Channel key ("password", mode "k" ) */
-	char topic[COMMAND_LEN];	/**< Initial topic */
-	char keyfile[512];		/**< Path and name of channel key file */
-	unsigned long maxusers;		/**< User limit for this channel, mode "l" */
-};
+typedef struct _Conf_Channel
+{
+	CHAR name[CHANNEL_NAME_LEN];	/* Name of the channel */
+	CHAR modes[CHANNEL_MODE_LEN];	/* Initial channel modes */
+	CHAR topic[CHANNEL_TOPIC_LEN];	/* Initial topic */
+} CONF_CHANNEL;


 #define CONF_SFLAG_ONCE	1		/* Delete this entry after next disconnect */
 #define CONF_SFLAG_DISABLED 2		/* This server configuration entry is disabled */


-/** Name (ID, "nick") of this server */
-GLOBAL char Conf_ServerName[CLIENT_ID_LEN];
+/* Name ("Nick") of the servers */
+GLOBAL CHAR Conf_ServerName[CLIENT_ID_LEN];

-/** Server info text */
-GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];
+/* Server info text */
+GLOBAL CHAR Conf_ServerInfo[CLIENT_INFO_LEN];

-/** Global server passwort */
-GLOBAL char Conf_ServerPwd[CLIENT_PASS_LEN];
+/* Global server passwort */
+GLOBAL CHAR Conf_ServerPwd[CLIENT_PASS_LEN];

-/** Administrative information */
-GLOBAL char Conf_ServerAdmin1[CLIENT_INFO_LEN];
-GLOBAL char Conf_ServerAdmin2[CLIENT_INFO_LEN];
-GLOBAL char Conf_ServerAdminMail[CLIENT_INFO_LEN];
+/* Administrative information */
+GLOBAL CHAR Conf_ServerAdmin1[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdmin2[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdminMail[CLIENT_INFO_LEN];

-/** Message of the day (MOTD) of this server */
-GLOBAL array Conf_Motd;
+/* File with MOTD text */
+GLOBAL CHAR Conf_MotdFile[FNAME_LEN];

-/** Array of ports this server should listen on */
-GLOBAL array Conf_ListenPorts;
+/* Phrase with MOTD text */
+GLOBAL CHAR Conf_MotdPhrase[LINE_LEN];

-/** Address to which sockets should be bound to or empty (=all) */
-GLOBAL char *Conf_ListenAddress;
+/* Ports the server should listen on */
+GLOBAL UINT Conf_ListenPorts[MAX_LISTEN_PORTS];
+GLOBAL INT Conf_ListenPorts_Count;

-/** User and group ID this daemon should run with */
-GLOBAL uid_t Conf_UID;
-GLOBAL gid_t Conf_GID;
+/* Address to which the socket should be bound or empty (=all) */
+GLOBAL CHAR Conf_ListenAddress[16];

-/** The directory to chroot() into */
-GLOBAL char Conf_Chroot[FNAME_LEN];
+/* User and group ID the server should run with */
+GLOBAL UINT Conf_UID;
+GLOBAL UINT Conf_GID;

-/** Full path and name of a file to which the PID of daemon should be written */
-GLOBAL char Conf_PidFile[FNAME_LEN];
+/* A directory to chroot() in */
+GLOBAL CHAR Conf_Chroot[FNAME_LEN];

-/** Timeout (in seconds) for PING commands */
-GLOBAL int Conf_PingTimeout;
+/* Timeouts for PING and PONG */
+GLOBAL INT Conf_PingTimeout;
+GLOBAL INT Conf_PongTimeout;

-/** Timeout (in seconds) for PONG replies */
-GLOBAL int Conf_PongTimeout;
+/* Seconds between connect attempts to other servers */
+GLOBAL INT Conf_ConnectRetry;

-/** Seconds between connection attempts to other servers */
-GLOBAL int Conf_ConnectRetry;
+/* Operators */
+GLOBAL CONF_OPER Conf_Oper[MAX_OPERATORS];
+GLOBAL INT Conf_Oper_Count;

-/** Array of configured IRC operators */
-GLOBAL array Conf_Opers;
-
-/** Array of configured IRC servers */
+/* Servers */
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];

-/** Array of pre-defined channels */
-GLOBAL array Conf_Channels;
+/* Pre-defined channels */
+GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
+GLOBAL INT Conf_Channel_Count;

-/** Flag indicating if only pre-defined channels are allowed (true) or not */
-GLOBAL bool Conf_PredefChannelsOnly;
+/* Are IRC operators allowed to always use MODE? */
+GLOBAL BOOLEAN Conf_OperCanMode;

-/** Flag indicating if IRC operators are allowed to always use MODE (true) */
-GLOBAL bool Conf_OperCanMode;
+/* Maximum number of connections to this server */
+GLOBAL LONG Conf_MaxConnections;

-/**
- * If true, mask channel MODE commands of IRC operators to the server.
- * Background: ircd2 will ignore channel MODE commands if an IRC operator
- * gives chanel operator privileges to someone without being a channel operator
- * himself. This enables a workaround: it masks the MODE command as coming
- * from the IRC server and not the IRC operator.
- */
-GLOBAL bool Conf_OperServerMode;
+/* Maximum number of channels a user can join */
+GLOBAL INT Conf_MaxJoins;

-/** Flag indicating if remote IRC operators are allowed to manage this server */
-GLOBAL bool Conf_AllowRemoteOper;
+/* Maximum number of connections per IP address */
+GLOBAL INT Conf_MaxConnectionsIP;

-/** Cloaked hostname of the clients */
-GLOBAL char Conf_CloakHost[CLIENT_ID_LEN];

-/** Use nick name as user name? */
-GLOBAL bool Conf_CloakUserToNick;
+GLOBAL VOID Conf_Init PARAMS((VOID ));
+GLOBAL VOID Conf_Rehash PARAMS((VOID ));
+GLOBAL INT Conf_Test PARAMS((VOID ));

-/** Enable all DNS functions? */
-GLOBAL bool Conf_DNS;
+GLOBAL VOID Conf_UnsetServer PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conf_SetServer PARAMS(( INT ConfServer, CONN_ID Idx ));
+GLOBAL INT Conf_GetServer PARAMS(( CONN_ID Idx ));

-/** Enable IDENT lookups, even when compiled with support for it */
-GLOBAL bool Conf_Ident;
-
-/** Enable "more privacy" mode and "censor" some user-related information */
-GLOBAL bool Conf_MorePrivacy;
-
-/** Enable NOTICE AUTH messages on connect */
-GLOBAL bool Conf_NoticeAuth;
-
-/** Enable all usage of PAM, even when compiled with support for it */
-GLOBAL bool Conf_PAM;
-
-/** Disable all CTCP commands except for /me ? */
-GLOBAL bool Conf_ScrubCTCP;
-
-/*
- * try to connect to remote systems using the ipv6 protocol,
- * if they have an ipv6 address? (default yes)
- */
-GLOBAL bool Conf_ConnectIPv6;
-
-/** Try to connect to remote systems using the IPv4 protocol (true) */
-GLOBAL bool Conf_ConnectIPv4;
-
-/** Maximum number of simultaneous connections to this server */
-GLOBAL long Conf_MaxConnections;
-
-/** Maximum number of channels a user can join */
-GLOBAL int Conf_MaxJoins;
-
-/** Maximum number of connections per IP address */
-GLOBAL int Conf_MaxConnectionsIP;
-
-/** Maximum length of a nick name */
-GLOBAL unsigned int Conf_MaxNickLength;
-
-#ifndef STRICT_RFC
-
-/** Require "AUTH PING-PONG" on login */
-GLOBAL bool Conf_AuthPing;
-
-#endif
-
-#ifdef SYSLOG
-
-/* Syslog "facility" */
-GLOBAL int Conf_SyslogFacility;
-
-#endif
-
-GLOBAL void Conf_Init PARAMS((void));
-GLOBAL bool Conf_Rehash PARAMS((void));
-GLOBAL int Conf_Test PARAMS((void));
-
-GLOBAL void Conf_UnsetServer PARAMS(( CONN_ID Idx ));
-GLOBAL void Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx ));
-GLOBAL int Conf_GetServer PARAMS(( CONN_ID Idx ));
-
-GLOBAL bool Conf_EnableServer PARAMS(( const char *Name, UINT16 Port ));
-GLOBAL bool Conf_EnablePassiveServer PARAMS((const char *Name));
-GLOBAL bool Conf_DisableServer PARAMS(( const char *Name ));
-GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd ));
-
-GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick));
-
-/* Password required by WEBIRC command */
-GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN];
-
-#ifdef DEBUG
-GLOBAL void Conf_DebugDump PARAMS((void));
-#endif
+GLOBAL BOOLEAN Conf_EnableServer PARAMS(( CHAR *Name, INT Port ));
+GLOBAL BOOLEAN Conf_DisableServer PARAMS(( CHAR *Name ));
+GLOBAL BOOLEAN Conf_AddServer PARAMS(( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ));


 #endif
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -1,57 +1,48 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Connection management: Global functions
 */

+
 #define CONN_MODULE

 #include "portab.h"

-/**
- * @file
- * Connection management: Global functions
- */
+static char UNUSED id[] = "$Id: conn-func.c,v 1.3 2003/12/26 15:55:07 alex Exp $";

 #include "imp.h"
 #include <assert.h>
-#include <string.h>
-#include "log.h"
+#include <log.h>

 #include "conn.h"
-#include "client.h"

 #include "exp.h"
 #include "conn-func.h"


-GLOBAL void
+GLOBAL VOID
 Conn_UpdateIdle( CONN_ID Idx )
 {
+	/* Idle-Timer zuruecksetzen */
+
 	assert( Idx > NONE );
 	My_Connections[Idx].lastprivmsg = time( NULL );
 }


-/*
- * Get signon time of a connection.
- */
-GLOBAL time_t
-Conn_GetSignon(CONN_ID Idx)
-{
-	assert(Idx > NONE);
-	return My_Connections[Idx].signon;
-}
-
 GLOBAL time_t
 Conn_GetIdle( CONN_ID Idx )
 {
-	/* Return Idle-Timer of a connetion */
+	/* Idle-Time einer Verbindung liefern (in Sekunden) */
+
 	assert( Idx > NONE );
 	return time( NULL ) - My_Connections[Idx].lastprivmsg;
 } /* Conn_GetIdle */
@@ -60,36 +51,32 @@ Conn_GetIdle( CONN_ID Idx )
 GLOBAL time_t
 Conn_LastPing( CONN_ID Idx )
 {
+	/* Zeitpunkt des letzten PING liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].lastping;
 } /* Conn_LastPing */


-GLOBAL void
+GLOBAL VOID
 Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
 {
-	/* set Penalty-Delay for a socket.
-	 * during the penalty, the socket is ignored completely, no new
-	 * data is read. This function only increases the penalty, it is
-	 * not possible to decrease the penalty time.
-	 */
+	/* Penalty-Delay fuer eine Verbindung (in Sekunden) setzen;
+	 * waehrend dieser Zeit wird der entsprechende Socket vom Server
+	 * bei Lese-Operationen komplett ignoriert. Der Delay kann mit
+	 * dieser Funktion nur erhoeht, nicht aber verringert werden. */
+	
 	time_t t;
 	
 	assert( Idx > NONE );
 	assert( Seconds >= 0 );

 	t = time( NULL ) + Seconds;
-	if (t > My_Connections[Idx].delaytime)
-		My_Connections[Idx].delaytime = t;
-
-#ifdef DEBUG
-	Log(LOG_DEBUG, "Add penalty time on connection %d: %ld second(s).",
-			Idx, (long)Seconds);
-#endif
+	if( t > My_Connections[Idx].delaytime ) My_Connections[Idx].delaytime = t;
 } /* Conn_SetPenalty */


-GLOBAL void
+GLOBAL VOID
 Conn_ResetPenalty( CONN_ID Idx )
 {
 	assert( Idx > NONE );
@@ -97,25 +84,29 @@ Conn_ResetPenalty( CONN_ID Idx )
 } /* Conn_ResetPenalty */


-GLOBAL void
-Conn_ClearFlags( void )
+GLOBAL VOID
+Conn_ClearFlags( VOID )
 {
+	/* Alle Connection auf "nicht-markiert" setzen */
+
 	CONN_ID i;

 	for( i = 0; i < Pool_Size; i++ ) My_Connections[i].flag = 0;
 } /* Conn_ClearFlags */


-GLOBAL int
+GLOBAL INT
 Conn_Flag( CONN_ID Idx )
 {
+	/* Ist eine Connection markiert (TRUE) oder nicht? */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].flag;
 } /* Conn_Flag */


-GLOBAL void
-Conn_SetFlag( CONN_ID Idx, int Flag )
+GLOBAL VOID
+Conn_SetFlag( CONN_ID Idx, INT Flag )
 {
 	/* Connection markieren */

@@ -125,7 +116,7 @@ Conn_SetFlag( CONN_ID Idx, int Flag )


 GLOBAL CONN_ID
-Conn_First( void )
+Conn_First( VOID )
 {
 	/* Connection-Struktur der ersten Verbindung liefern;
 	 * Ist keine Verbindung vorhanden, wird NONE geliefert. */
@@ -158,7 +149,32 @@ Conn_Next( CONN_ID Idx )
 } /* Conn_Next */


-GLOBAL UINT16
+GLOBAL VOID
+Conn_SetOption( CONN_ID Idx, INT Option )
+{
+	/* Option fuer Verbindung setzen.
+	 * Initial sind alle Optionen _nicht_ gesetzt. */
+
+	assert( Idx > NONE );
+	assert( Option != 0 );
+
+	My_Connections[Idx].options |= Option;
+} /* Conn_SetOption */
+
+
+GLOBAL VOID
+Conn_UnsetOption( CONN_ID Idx, INT Option )
+{
+	/* Option fuer Verbindung loeschen */
+
+	assert( Idx > NONE );
+	assert( Option != 0 );
+
+	My_Connections[Idx].options &= ~Option;
+} /* Conn_UnsetOption */
+
+
+GLOBAL INT
 Conn_Options( CONN_ID Idx )
 {
 	assert( Idx > NONE );
@@ -166,135 +182,93 @@ Conn_Options( CONN_ID Idx )
 } /* Conn_Options */


-/**
- * Set connection option.
- */
-GLOBAL void
-Conn_SetOption(CONN_ID Idx, int Option)
-{
-	assert(Idx > NONE);
-	Conn_OPTION_ADD(&My_Connections[Idx], Option);
-} /* Conn_SetOption */
-
-
-/**
- * Get the start time of the connection.
- * The result is the start time in seconds since 1970-01-01, as reported
- * by the C function time(NULL).
- */
 GLOBAL time_t
 Conn_StartTime( CONN_ID Idx )
 {
-	CLIENT *c;
+	/* Zeitpunkt des Link-Starts liefern (in Sekunden) */

-	assert(Idx > NONE);
+	assert( Idx > NONE );
+	return My_Connections[Idx].starttime;
+} /* Conn_Uptime */

-	/* Search client structure for this link ... */
-	c = Conn_GetClient(Idx);
-	if(c != NULL)
-		return Client_StartTime(c);

-	return 0;
-} /* Conn_StartTime */
-
-/**
- * return number of bytes queued for writing
- */
-GLOBAL size_t
+GLOBAL INT
 Conn_SendQ( CONN_ID Idx )
 {
+	/* Laenge der Daten im Schreibbuffer liefern */
+
 	assert( Idx > NONE );
 #ifdef ZLIB
-	if( My_Connections[Idx].options & CONN_ZIP )
-		return array_bytes(&My_Connections[Idx].zip.wbuf);
+	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen;
 	else
 #endif
-	return array_bytes(&My_Connections[Idx].wbuf);
+	return My_Connections[Idx].wdatalen;
 } /* Conn_SendQ */


-/**
- * return number of messages sent on this connection so far
- */
-GLOBAL long
+GLOBAL LONG
 Conn_SendMsg( CONN_ID Idx )
 {
+	/* Anzahl gesendeter Nachrichten liefern */

 	assert( Idx > NONE );
 	return My_Connections[Idx].msg_out;
 } /* Conn_SendMsg */


-/**
- * return number of (uncompressed) bytes sent
- * on this connection so far
- */
-GLOBAL long
+GLOBAL LONG
 Conn_SendBytes( CONN_ID Idx )
 {
+	/* Anzahl gesendeter Bytes (unkomprimiert) liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].bytes_out;
 } /* Conn_SendBytes */


-/**
- * return number of bytes pending in read buffer
- */
-GLOBAL size_t
+GLOBAL INT
 Conn_RecvQ( CONN_ID Idx )
 {
+	/* Laenge der Daten im Lesebuffer liefern */
+
 	assert( Idx > NONE );
 #ifdef ZLIB
-	if( My_Connections[Idx].options & CONN_ZIP )
-		return array_bytes(&My_Connections[Idx].zip.rbuf);
+	if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen;
 	else
 #endif
-	return array_bytes(&My_Connections[Idx].rbuf);
+	return My_Connections[Idx].rdatalen;
 } /* Conn_RecvQ */


-/**
- * return number of messages received on this connection so far
- */
-GLOBAL long
+GLOBAL LONG
 Conn_RecvMsg( CONN_ID Idx )
 {
+	/* Anzahl empfangener Nachrichten liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].msg_in;
 } /* Conn_RecvMsg */


-/**
- * return number of (uncompressed) bytes received on this
- * connection so far
- */
-GLOBAL long
+GLOBAL LONG
 Conn_RecvBytes( CONN_ID Idx )
 {
+	/* Anzahl empfangener Bytes (unkomprimiert) liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].bytes_in;
 } /* Conn_RecvBytes */

-/**
- * Return the remote IP address of this connection as string.
- */
-GLOBAL const char *
-Conn_IPA(CONN_ID Idx)
-{
-	assert (Idx > NONE);
-	return ng_ipaddr_tostr(&My_Connections[Idx].addr);
-}

-
-GLOBAL void
-Conn_ResetWCounter( void )
+GLOBAL VOID
+Conn_ResetWCounter( VOID )
 {
 	WCounter = 0;
 } /* Conn_ResetWCounter */


-GLOBAL long
-Conn_WCounter( void )
+GLOBAL LONG
+Conn_WCounter( VOID )
 {
 	return WCounter;
 } /* Conn_WCounter */
--- a/src/ngircd/conn-func.h
+++ b/src/ngircd/conn-func.h
@@ -1,62 +1,59 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conn-func.h,v 1.1 2002/12/30 17:14:28 alex Exp $
+ *
+ * Connection management: Global functions (header)
 */

+
 #ifndef __conn_func_h__
 #define __conn_func_h__

-/**
- * @file
- * Connection management: Global functions (header)
- */

 /* Include the header conn.h if this header is _not_ included by any module
 * containing connection handling functions. So other modules must only
 * include this conn-func.h header. */
 #ifndef CONN_MODULE
-#include "conn.h"
-#else
-#define Conn_OPTION_ADD( x, opt )   ( (x)->options |= (opt) )
-#define Conn_OPTION_DEL( x, opt )   ( (x)->options &= ~(opt) )
-#define Conn_OPTION_ISSET( x, opt ) ( ((x)->options & (opt)) != 0)
+#	include "conn.h"
 #endif


-GLOBAL void Conn_UpdateIdle PARAMS(( CONN_ID Idx ));
-GLOBAL time_t Conn_GetSignon PARAMS((CONN_ID Idx));
+GLOBAL VOID Conn_UpdateIdle PARAMS(( CONN_ID Idx ));
 GLOBAL time_t Conn_GetIdle PARAMS(( CONN_ID Idx ));
 GLOBAL time_t Conn_LastPing PARAMS(( CONN_ID Idx ));
 GLOBAL time_t Conn_StartTime PARAMS(( CONN_ID Idx ));
-GLOBAL size_t Conn_SendQ PARAMS(( CONN_ID Idx ));
-GLOBAL size_t Conn_RecvQ PARAMS(( CONN_ID Idx ));
-GLOBAL long Conn_SendMsg PARAMS(( CONN_ID Idx ));
-GLOBAL long Conn_RecvMsg PARAMS(( CONN_ID Idx ));
-GLOBAL long Conn_SendBytes PARAMS(( CONN_ID Idx ));
-GLOBAL long Conn_RecvBytes PARAMS(( CONN_ID Idx ));
-GLOBAL const char *Conn_IPA PARAMS(( CONN_ID Idx ));
+GLOBAL INT Conn_SendQ PARAMS(( CONN_ID Idx ));
+GLOBAL INT Conn_RecvQ PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_SendMsg PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_RecvMsg PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_SendBytes PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_RecvBytes PARAMS(( CONN_ID Idx ));

-GLOBAL void Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds ));
-GLOBAL void Conn_ResetPenalty PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds ));
+GLOBAL VOID Conn_ResetPenalty PARAMS(( CONN_ID Idx ));

-GLOBAL void Conn_ClearFlags PARAMS(( void ));
-GLOBAL int Conn_Flag PARAMS(( CONN_ID Idx ));
-GLOBAL void Conn_SetFlag PARAMS(( CONN_ID Idx, int Flag ));
+GLOBAL VOID Conn_ClearFlags PARAMS(( VOID ));
+GLOBAL INT Conn_Flag PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conn_SetFlag PARAMS(( CONN_ID Idx, INT Flag ));

-GLOBAL CONN_ID Conn_First PARAMS(( void ));
+GLOBAL CONN_ID Conn_First PARAMS(( VOID ));
 GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));

-GLOBAL UINT16 Conn_Options PARAMS(( CONN_ID Idx ));
-GLOBAL void Conn_SetOption PARAMS(( CONN_ID Idx, int Option ));
+GLOBAL VOID Conn_SetOption PARAMS(( CONN_ID Idx, INT Option ));
+GLOBAL VOID Conn_UnsetOption PARAMS(( CONN_ID Idx, INT Option ));
+GLOBAL INT Conn_Options PARAMS(( CONN_ID Idx ));
+
+GLOBAL VOID Conn_ResetWCounter PARAMS(( VOID ));
+GLOBAL LONG Conn_WCounter PARAMS(( VOID ));

-GLOBAL void Conn_ResetWCounter PARAMS(( void ));
-GLOBAL long Conn_WCounter PARAMS(( void ));

 #endif

--- a/src/ngircd/conn-ssl.c
+++ b/src/ngircd/conn-ssl.c
@@ -1,718 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c) 2005-2008 Florian Westphal <fw@strlen.de>
- */
-
-#include "portab.h"
-
-/**
- * @file
- * SSL wrapper functions
- */
-
-#include "imp.h"
-#include "conf-ssl.h"
-
-#ifdef SSL_SUPPORT
-
-#include "io.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#define CONN_MODULE
-#include "conn.h"
-#include "conf.h"
-#include "conn-func.h"
-#include "conn-ssl.h"
-#include "log.h"
-
-#include "exp.h"
-#include "defines.h"
-
-extern struct SSLOptions Conf_SSLOptions;
-
-#ifdef HAVE_LIBSSL
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-static SSL_CTX * ssl_ctx;
-static DH *dh_params;
-
-static bool ConnSSL_LoadServerKey_openssl PARAMS(( SSL_CTX *c ));
-#endif
-
-#ifdef HAVE_LIBGNUTLS
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnutls/x509.h>
-
-#define DH_BITS 2048
-#define DH_BITS_MIN 1024
-
-static gnutls_certificate_credentials_t x509_cred;
-static gnutls_dh_params_t dh_params;
-static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void ));
-#endif
-
-static bool ConnSSL_Init_SSL PARAMS(( CONNECTION *c ));
-static int ConnectAccept PARAMS(( CONNECTION *c, bool connect ));
-static int ConnSSL_HandleError PARAMS(( CONNECTION *c, const int code, const char *fname ));
-
-#ifdef HAVE_LIBGNUTLS
-static char * openreadclose(const char *name, size_t *len)
-{
-	char *buf = NULL;
-	struct stat s;
-	ssize_t br;
-	int fd = open(name, O_RDONLY);
-	if (fd < 0) {
-		Log(LOG_ERR, "Could not open %s: %s", name, strerror(errno));
-		return NULL;
-	}
-	if (fstat(fd, &s)) {
-		Log(LOG_ERR, "Could not fstat %s: %s", name, strerror(errno));
-		goto out;
-	}
-	if (!S_ISREG(s.st_mode)) {
-		Log(LOG_ERR, "%s: Not a regular file", name);
-		goto out;
-	}
-	if (s.st_size <= 0) {
-		Log(LOG_ERR, "%s: invalid file length (size %ld <= 0)", name, (long) s.st_size);
-		goto out;
-	}
-	buf = malloc(s.st_size);
-	if (!buf) {
-		Log(LOG_ERR, "Could not malloc %lu bytes for file %s: %s", s.st_size, name, strerror(errno));
-		goto out;
-	}
-	br = read(fd, buf, s.st_size);
-	if (br != (ssize_t)s.st_size) {
-		Log(LOG_ERR, "Could not read file %s: read returned %ld, expected %ld: %s",
-			name, (long) br, (long) s.st_size, br == -1 ? strerror(errno):"short read?!");
-		memset(buf, 0, s.st_size);
-		free(buf);
-		buf = NULL;
-	} else {
-		*len = br;
-	}
-out:
-	close(fd);
-	return buf;
-}
-#endif
-
-
-#ifdef HAVE_LIBSSL
-static void
-LogOpenSSLError( const char *msg, const char *msg2 )
-{
-	unsigned long err = ERR_get_error();
-	char * errmsg = err ? ERR_error_string(err, NULL) : "Unable to determine error";
-
-	if (!msg) msg = "SSL Error";
-	if (msg2)
-		Log( LOG_ERR, "%s: %s: %s", msg, msg2, errmsg);
-	else
-		Log( LOG_ERR, "%s: %s", msg, errmsg);
-}
-
-
-static int
-pem_passwd_cb(char *buf, int size, int rwflag, void *password)
-{
-	array *pass = password;
-	int passlen;
-
-	(void)rwflag;		/* rwflag is unused if DEBUG is not set. */
-	assert(rwflag == 0);	/* 0 -> callback used for decryption.
-				 * See SSL_CTX_set_default_passwd_cb(3) */
-
-	passlen = (int) array_bytes(pass);
-
-	LogDebug("pem_passwd_cb buf size %d, array size %d", size, passlen);
-	assert(passlen >= 0);
-	if (passlen <= 0) {
-		Log(LOG_ERR, "pem_passwd_cb: password required, but not set");
-		return 0;
-	}
-	size = passlen > size ? size : passlen;
-	memcpy(buf, (char *)(array_start(pass)), size);
-	return size;
-}
-#endif
-
-
-static bool
-Load_DH_params(void)
-{
-#ifdef HAVE_LIBSSL
-	FILE *fp;
-	bool ret = true;
-
-	if (!Conf_SSLOptions.DHFile) {
-		Log(LOG_NOTICE, "Configuration option \"SSLDHFile\" not set!");
-		return false;
-	}
-	fp = fopen(Conf_SSLOptions.DHFile, "r");
-	if (!fp) {
-		Log(LOG_ERR, "%s: %s", Conf_SSLOptions.DHFile, strerror(errno));
-		return false;
-	}
-	dh_params = PEM_read_DHparams(fp, NULL, NULL, NULL);
-	if (!dh_params) {
-		Log(LOG_ERR, "%s: PEM_read_DHparams failed!",
-		    Conf_SSLOptions.DHFile);
-		ret = false;
-	}
-	fclose(fp);
-	return ret;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	bool need_dhgenerate = true;
-	int err;
-	gnutls_dh_params_t tmp_dh_params;
-
-	err = gnutls_dh_params_init(&tmp_dh_params);
-	if (err < 0) {
-		Log(LOG_ERR, "gnutls_dh_params_init: %s", gnutls_strerror(err));
-		return false;
-	}
-	if (Conf_SSLOptions.DHFile) {
-		gnutls_datum_t dhparms;
-		size_t size;
-		dhparms.data = (unsigned char *) openreadclose(Conf_SSLOptions.DHFile, &size);
-		if (dhparms.data) {
-			dhparms.size = size;
-			err = gnutls_dh_params_import_pkcs3(tmp_dh_params, &dhparms, GNUTLS_X509_FMT_PEM);
-			if (err == 0)
-				need_dhgenerate = false;
-			else
-				Log(LOG_ERR, "gnutls_dh_params_init: %s", gnutls_strerror(err));
-
-			memset(dhparms.data, 0, size);
-			free(dhparms.data);
-		}
-	}
-	if (need_dhgenerate) {
-		Log(LOG_WARNING,
-		    "SSLDHFile not set, generating %u bit DH parameters. This may take a while ...",
-		    DH_BITS);
-		err = gnutls_dh_params_generate2(tmp_dh_params, DH_BITS);
-		if (err < 0) {
-			Log(LOG_ERR, "gnutls_dh_params_generate2: %s", gnutls_strerror(err));
-			return false;
-		}
-        }
-	dh_params = tmp_dh_params;
-	return true;
-#endif
-}
-
-
-void ConnSSL_Free(CONNECTION *c)
-{
-#ifdef HAVE_LIBSSL
-	SSL *ssl = c->ssl_state.ssl;
-	if (ssl) {
-		SSL_shutdown(ssl);
-		SSL_free(ssl);
-		c->ssl_state.ssl = NULL;
-	}
-#endif
-#ifdef HAVE_LIBGNUTLS
-	gnutls_session_t sess = c->ssl_state.gnutls_session;
-	if (Conn_OPTION_ISSET(c, CONN_SSL)) {
-		gnutls_bye(sess, GNUTLS_SHUT_RDWR);
-		gnutls_deinit(sess);
-	}
-#endif
-	assert(Conn_OPTION_ISSET(c, CONN_SSL));
-	/* can't just set bitmask to 0 -- there are other, non-ssl related flags, e.g. CONN_ZIP. */
-	Conn_OPTION_DEL(c, CONN_SSL_FLAGS_ALL);
-}
-
-
-bool
-ConnSSL_InitLibrary( void )
-{
-#ifdef HAVE_LIBSSL
-	SSL_CTX *newctx;
-
-	if (!ssl_ctx) {
-		SSL_library_init();
-		SSL_load_error_strings();
-	}
-
-	if (!RAND_status()) {
-		Log(LOG_ERR, "OpenSSL PRNG not seeded: /dev/urandom missing?");
-		/*
-		 * it is probably best to fail and let the user install EGD or a similar program if no kernel random device is available.
-		 * According to OpenSSL RAND_egd(3): "The automatic query of /var/run/egd-pool et al was added in OpenSSL 0.9.7";
-		 * so it makes little sense to deal with PRNGD seeding ourselves.
-		 */
-		return false;
-	}
-
-	newctx = SSL_CTX_new(SSLv23_method());
-	if (!newctx) {
-		LogOpenSSLError("SSL_CTX_new()", NULL);
-		return false;
-	}
-
-	if (!ConnSSL_LoadServerKey_openssl(newctx))
-		goto out;
-
-	SSL_CTX_set_options(newctx, SSL_OP_SINGLE_DH_USE|SSL_OP_NO_SSLv2);
-	SSL_CTX_set_mode(newctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-	SSL_CTX_free(ssl_ctx);
-	ssl_ctx = newctx;
-	Log(LOG_INFO, "%s initialized.", SSLeay_version(SSLEAY_VERSION));
-	return true;
-out:
-	SSL_CTX_free(newctx);
-	return false;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	int err;
-	static bool initialized;
-	if (initialized) /* TODO: cannot reload gnutls keys: can't simply free x509 context -- it may still be in use */
-		return false;
-
-	err = gnutls_global_init();
-	if (err) {
-		Log(LOG_ERR, "gnutls_global_init(): %s", gnutls_strerror(err));
-		return false;
-	}
-	if (!ConnSSL_LoadServerKey_gnutls())
-		return false;
-	Log(LOG_INFO, "gnutls %s initialized.", gnutls_check_version(NULL));
-	initialized = true;
-	return true;
-#endif
-}
-
-
-#ifdef HAVE_LIBGNUTLS
-static bool
-ConnSSL_LoadServerKey_gnutls(void)
-{
-	int err;
-	const char *cert_file;
-
-	err = gnutls_certificate_allocate_credentials(&x509_cred);
-	if (err < 0) {
-		Log(LOG_ERR, "gnutls_certificate_allocate_credentials: %s", gnutls_strerror(err));
-		return false;
-	}
-
-	cert_file = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile;
-	if (!cert_file) {
-		Log(LOG_NOTICE, "No SSL server key configured, SSL disabled.");
-		return false;
-	}
-
-	if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
-		Log(LOG_WARNING,
-		    "Ignoring KeyFilePassword: Not supported by GNUTLS.");
-
-	if (!Load_DH_params())
-		return false;
-
-	gnutls_certificate_set_dh_params(x509_cred, dh_params);
-	err = gnutls_certificate_set_x509_key_file(x509_cred, cert_file, Conf_SSLOptions.KeyFile, GNUTLS_X509_FMT_PEM);
-	if (err < 0) {
-		Log(LOG_ERR, "gnutls_certificate_set_x509_key_file (cert %s, key %s): %s",
-				cert_file, Conf_SSLOptions.KeyFile ? Conf_SSLOptions.KeyFile : "(NULL)", gnutls_strerror(err));
-		return false;
-	}
-	return true;
-}
-#endif
-
-
-#ifdef HAVE_LIBSSL
-static bool
-ConnSSL_LoadServerKey_openssl(SSL_CTX *ctx)
-{
-	char *cert_key;
-
-	assert(ctx);
-	if (!Conf_SSLOptions.KeyFile) {
-		Log(LOG_NOTICE, "No SSL server key configured, SSL disabled.");
-		return false;
-	}
-
-	SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
-	SSL_CTX_set_default_passwd_cb_userdata(ctx, &Conf_SSLOptions.KeyFilePassword);
-
-	if (SSL_CTX_use_PrivateKey_file(ctx, Conf_SSLOptions.KeyFile, SSL_FILETYPE_PEM) != 1) {
-		array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
-		LogOpenSSLError("SSL_CTX_use_PrivateKey_file",  Conf_SSLOptions.KeyFile);
-		return false;
-	}
-
-	cert_key = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile;
-	if (SSL_CTX_use_certificate_chain_file(ctx, cert_key) != 1) {
-		array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
-		LogOpenSSLError("SSL_CTX_use_certificate_file", cert_key);
-		return false;
-	}
-
-	array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
-
-	if (!SSL_CTX_check_private_key(ctx)) {
-		LogOpenSSLError("Server Private Key does not match certificate", NULL);
-		return false;
-	}
-	if (Load_DH_params()) {
-		if (SSL_CTX_set_tmp_dh(ctx, dh_params) != 1)
-			LogOpenSSLError("Error setting DH Parameters", Conf_SSLOptions.DHFile);
-		/* don't return false here: the non-DH modes will still work */
-		DH_free(dh_params);
-		dh_params = NULL;
-	}
-	return true;
-}
-
-
-#endif
-static bool
-ConnSSL_Init_SSL(CONNECTION *c)
-{
-	int ret;
-	assert(c != NULL);
-#ifdef HAVE_LIBSSL
-	if (!ssl_ctx) {
-		Log(LOG_ERR, "Cannot init ssl_ctx: OpenSSL initialization failed at startup");
-		return false;
-	}
-	assert(c->ssl_state.ssl == NULL);
-
-	c->ssl_state.ssl = SSL_new(ssl_ctx);
-	if (!c->ssl_state.ssl) {
-		LogOpenSSLError("SSL_new()", NULL);
-		return false;
-	}
-
-	ret = SSL_set_fd(c->ssl_state.ssl, c->sock);
-	if (ret != 1) {
-		LogOpenSSLError("SSL_set_fd()", NULL);
-		ConnSSL_Free(c);
-		return false;
-	}
-#endif
-#ifdef HAVE_LIBGNUTLS
-	ret = gnutls_set_default_priority(c->ssl_state.gnutls_session);
-	if (ret < 0) {
-		Log(LOG_ERR, "gnutls_set_default_priority: %s", gnutls_strerror(ret));
-		ConnSSL_Free(c);
-		return false;
-	}
-	/*
-	 * The intermediate (long) cast is here to avoid a warning like:
-	 * "cast to pointer from integer of different size" on 64-bit platforms.
-	 * There doesn't seem to be an alternate GNUTLS API we could use instead, see e.g.
-	 * http://www.mail-archive.com/help-gnutls@gnu.org/msg00286.html
-	 */
-	gnutls_transport_set_ptr(c->ssl_state.gnutls_session, (gnutls_transport_ptr_t) (long) c->sock);
-	ret = gnutls_credentials_set(c->ssl_state.gnutls_session, GNUTLS_CRD_CERTIFICATE, x509_cred);
-	if (ret < 0) {
-		Log(LOG_ERR, "gnutls_credentials_set: %s", gnutls_strerror(ret));
-		ConnSSL_Free(c);
-		return false;
-	}
-	gnutls_dh_set_prime_bits(c->ssl_state.gnutls_session, DH_BITS_MIN);
-#endif
-	Conn_OPTION_ADD(c, CONN_SSL);
-	return true;
-}
-
-
-bool
-ConnSSL_PrepareConnect(CONNECTION *c, UNUSED CONF_SERVER *s)
-{
-	bool ret;
-#ifdef HAVE_LIBGNUTLS
-	int err;
-
-	err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT);
-	if (err) {
-		Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
-		return false;
-        }
-#endif
-	ret = ConnSSL_Init_SSL(c);
-	if (!ret)
-		return false;
-	Conn_OPTION_ADD(c, CONN_SSL_CONNECT);
-#ifdef HAVE_LIBSSL
-	assert(c->ssl_state.ssl);
-	SSL_set_verify(c->ssl_state.ssl, SSL_VERIFY_NONE, NULL);
-#endif
-	return true;
-}
-
-
-/*
-  Check an Handle Error return code after failed calls to ssl/tls functions.
-  OpenSSL:
-  SSL_connect(), SSL_accept(), SSL_do_handshake(), SSL_read(), SSL_peek(), or SSL_write() on ssl.
-  GNUTLS:
-  gnutlsssl_read(), gnutls_write() or gnutls_handshake().
-  Return: -1 on fatal error, 0 if we can try again later.
- */
-static int
-ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname )
-{
-#ifdef HAVE_LIBSSL
-	int ret = SSL_ERROR_SYSCALL;
-	unsigned long sslerr;
-	int real_errno = errno;
-
-	ret = SSL_get_error(c->ssl_state.ssl, code);
-	switch (ret) {
-	case SSL_ERROR_WANT_READ:
-		io_event_del(c->sock, IO_WANTWRITE);
-		Conn_OPTION_ADD(c, CONN_SSL_WANT_READ);
-		return 0;	/* try again later */
-	case SSL_ERROR_WANT_WRITE:
-		io_event_del(c->sock, IO_WANTREAD);
-		Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE); /* fall through */
-	case SSL_ERROR_NONE:
-		return 0;	/* try again later */
-	case SSL_ERROR_ZERO_RETURN:
-		LogDebug("TLS/SSL connection shut down normally");
-		break;
-	/*
-	SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP
-	*/
-	case SSL_ERROR_SYSCALL:
-		sslerr = ERR_get_error();
-		if (sslerr) {
-			Log( LOG_ERR, "%s: %s", fname, ERR_error_string(sslerr, NULL ));
-		} else {
-
-			switch (code) {	/* EOF that violated protocol */
-			case 0:
-				Log(LOG_ERR, "%s: Client Disconnected", fname );
-				break;
-			case -1: /* low level socket I/O error, check errno */
-				Log(LOG_ERR, "%s: %s", fname, strerror(real_errno));
-			}
-		}
-		break;
-	case SSL_ERROR_SSL:
-		LogOpenSSLError("TLS/SSL Protocol Error", fname);
-		break;
-	default:
-		Log( LOG_ERR, "%s: Unknown error %d!", fname, ret);
-	}
-	ConnSSL_Free(c);
-	return -1;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	switch (code) {
-	case GNUTLS_E_AGAIN:
-	case GNUTLS_E_INTERRUPTED:
-		if (gnutls_record_get_direction(c->ssl_state.gnutls_session)) {
-			Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE);
-			io_event_del(c->sock, IO_WANTREAD);
-		} else {
-			Conn_OPTION_ADD(c, CONN_SSL_WANT_READ);
-			io_event_del(c->sock, IO_WANTWRITE);
-		}
-		break;
-	default:
-		assert(code < 0);
-		if (gnutls_error_is_fatal(code)) {
-			Log(LOG_ERR, "%s: %s", fname, gnutls_strerror(code));
-			ConnSSL_Free(c);
-			return -1;
-		}
-	}
-	return 0;
-#endif
-}
-
-
-static void
-ConnSSL_LogCertInfo( CONNECTION *c )
-{
-#ifdef HAVE_LIBSSL
-	SSL *ssl = c->ssl_state.ssl;
-
-	assert(ssl);
-
-	Log(LOG_INFO, "New %s connection using cipher %s on socket %d.",
-		SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock);
-#endif
-#ifdef HAVE_LIBGNUTLS
-	gnutls_session_t sess = c->ssl_state.gnutls_session;
-	gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
-
-	Log(LOG_INFO, "New %s connection using cipher %s-%s on socket %d.",
-	    gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
-	    gnutls_cipher_get_name(cipher),
-	    gnutls_mac_get_name(gnutls_mac_get(sess)), c->sock);
-#endif
-}
-
-
-/*
- Accept incoming SSL connection.
- Return Values:
-	 1: SSL Connection established
-	 0: try again
-	-1: SSL Connection not established due to fatal error.
-*/
-int
-ConnSSL_Accept( CONNECTION *c )
-{
-	assert(c != NULL);
-	if (!Conn_OPTION_ISSET(c, CONN_SSL)) {
-#ifdef HAVE_LIBGNUTLS
-		int err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_SERVER);
-		if (err) {
-			Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
-			return false;
-		}
-#endif
-		LogDebug("ConnSSL_Accept: Initializing SSL data");
-		if (!ConnSSL_Init_SSL(c))
-			return -1;
-	}
-	return ConnectAccept(c, false );
-}
-
-
-int
-ConnSSL_Connect( CONNECTION *c )
-{
-	assert(c != NULL);
-#ifdef HAVE_LIBSSL
-	assert(c->ssl_state.ssl);
-#endif
-	assert(Conn_OPTION_ISSET(c, CONN_SSL));
-	return ConnectAccept(c, true);
-}
-
-
-/* accept/connect wrapper. if connect is true, connect to peer, otherwise wait for incoming connection */
-static int
-ConnectAccept( CONNECTION *c, bool connect)
-{
-	int ret;
-#ifdef HAVE_LIBSSL
-	SSL *ssl = c->ssl_state.ssl;
-	assert(ssl != NULL);
-
-	ret = connect ? SSL_connect(ssl) : SSL_accept(ssl);
-	if (1 != ret)
-		return ConnSSL_HandleError(c, ret, connect ? "SSL_connect": "SSL_accept");
-#endif
-#ifdef HAVE_LIBGNUTLS
-	(void) connect;
-	ret = gnutls_handshake(c->ssl_state.gnutls_session);
-	if (ret)
-		return ConnSSL_HandleError(c, ret, "gnutls_handshake");
-#endif /* _GNUTLS */
-	Conn_OPTION_DEL(c, (CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ|CONN_SSL_CONNECT));
-	ConnSSL_LogCertInfo(c);
-	return 1;
-}
-
-
-ssize_t
-ConnSSL_Write(CONNECTION *c, const void *buf, size_t count)
-{
-	ssize_t bw;
-
-	Conn_OPTION_DEL(c, CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ);
-
-	assert(count > 0);
-#ifdef HAVE_LIBSSL
-	bw = (ssize_t) SSL_write(c->ssl_state.ssl, buf, count);
-#endif
-#ifdef HAVE_LIBGNUTLS
-	bw = gnutls_write(c->ssl_state.gnutls_session, buf, count);
-#endif
-	if (bw > 0)
-		return bw;
-	if (ConnSSL_HandleError( c, bw, "ConnSSL_Write") == 0)
-		errno = EAGAIN; /* try again */
-	return -1;
-}
-
-
-ssize_t
-ConnSSL_Read(CONNECTION *c, void * buf, size_t count)
-{
-	ssize_t br;
-
-	Conn_OPTION_DEL(c, CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ);
-#ifdef HAVE_LIBSSL
-        br = (ssize_t) SSL_read(c->ssl_state.ssl, buf, count);
-	if (br > 0)	/* on EOF we have to call ConnSSL_HandleError(), see SSL_read(3) */
-		return br;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	br = gnutls_read(c->ssl_state.gnutls_session, buf, count);
-	if (br >= 0)	/* on EOF we must _not_ call ConnSSL_HandleError, see gnutls_record_recv(3) */
-		return br;
-#endif
-	/* error on read: switch ConnSSL_HandleError() return values -> 0 is "try again", so return -1 and set EAGAIN */
-	if (ConnSSL_HandleError(c, br, "ConnSSL_Read") == 0) {
-		errno = EAGAIN;
-		return -1;
-	}
-	return 0;
-}
-
-
-bool
-ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
-{
-#ifdef HAVE_LIBSSL
-	char *nl;
-	SSL *ssl = c->ssl_state.ssl;
-
-	if (!ssl)
-		return false;
-	*buf = 0;
-	SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len);
-	nl = strchr(buf, '\n');
-	if (nl)
-		*nl = 0;
-	return true;
-#endif
-#ifdef HAVE_LIBGNUTLS
-	if (Conn_OPTION_ISSET(c, CONN_SSL)) {
-		const char *name_cipher, *name_mac, *name_proto, *name_keyexchange;
-		unsigned keysize;
-
-		gnutls_session_t sess = c->ssl_state.gnutls_session;
-		gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
-		name_cipher = gnutls_cipher_get_name(cipher);
-		name_mac = gnutls_mac_get_name(gnutls_mac_get(sess));
-		keysize = gnutls_cipher_get_key_size(cipher) * 8;
-		name_proto = gnutls_protocol_get_name(gnutls_protocol_get_version(sess));
-		name_keyexchange = gnutls_kx_get_name(gnutls_kx_get(sess));
-
-		return snprintf(buf, len, "%s-%s%15s Kx=%s      Enc=%s(%u) Mac=%s",
-			name_cipher, name_mac, name_proto, name_keyexchange, name_cipher, keysize, name_mac) > 0;
-	}
-	return false;
-#endif
-}
-
-
-#endif /* SSL_SUPPORT */
-/* -eof- */
-
-
--- a/src/ngircd/conn-ssl.h
+++ b/src/ngircd/conn-ssl.h
@@ -1,32 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- */
-
-#ifndef conn_ssl_h
-#define conn_ssl_h
-
-/**
- * @file
- * SSL wrapper functions (header)
- */
-
-#include "conf-ssl.h"
-#include "conn.h"
-#include "conf.h"
-
-#ifdef SSL_SUPPORT
-GLOBAL void ConnSSL_Free PARAMS(( CONNECTION *c ));
-
-GLOBAL bool ConnSSL_PrepareConnect PARAMS(( CONNECTION *c, CONF_SERVER *s ));
-
-GLOBAL int ConnSSL_Accept PARAMS(( CONNECTION *c ));
-GLOBAL int ConnSSL_Connect PARAMS(( CONNECTION *c ));
-
-GLOBAL ssize_t ConnSSL_Write PARAMS(( CONNECTION *c, const void *buf, size_t count));
-GLOBAL ssize_t ConnSSL_Read PARAMS(( CONNECTION *c, void *buf, size_t count));
-
-GLOBAL bool ConnSSL_GetCipherInfo PARAMS(( CONNECTION *c, char *buf, size_t len ));
-#endif /* SSL_SUPPORT */
-#endif /* conn_ssl_h */
-
-/* -eof- */
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -1,27 +1,25 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
- */
-
-#include "portab.h"
-
-/**
- * @file
+ *
 * Connection compression using ZLIB
 */

+
+#include "portab.h"
+
 #define CONN_MODULE

+
 #ifdef ZLIB

-/* enable more zlib related debug messages: */
-/* #define DEBUG_ZLIB */
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.5 2004/04/25 13:55:36 alex Exp $";

 #include "imp.h"
 #include <assert.h>
@@ -32,15 +30,14 @@
 #include "conn-func.h"
 #include "log.h"

-#include "array.h"
 #include "exp.h"
 #include "conn-zip.h"


-GLOBAL bool
+GLOBAL BOOLEAN
 Zip_InitConn( CONN_ID Idx )
 {
-	/* initialize zlib compression on this link */
+	/* Kompression fuer Link initialisieren */

 	assert( Idx > NONE );

@@ -51,9 +48,11 @@ Zip_InitConn( CONN_ID Idx )
 	My_Connections[Idx].zip.in.zfree = NULL;
 	My_Connections[Idx].zip.in.data_type = Z_ASCII;

-	if (inflateInit( &My_Connections[Idx].zip.in ) != Z_OK) {
-		Log(LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx);
-		return false;
+	if( inflateInit( &My_Connections[Idx].zip.in ) != Z_OK )
+	{
+		/* Fehler! */
+		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
+		return FALSE;
 	}

 	My_Connections[Idx].zip.out.total_in = 0;
@@ -62,218 +61,144 @@ Zip_InitConn( CONN_ID Idx )
 	My_Connections[Idx].zip.out.zfree = NULL;
 	My_Connections[Idx].zip.out.data_type = Z_ASCII;

-	if (deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK) {
-		Log(LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx);
-		return false;
+	if( deflateInit( &My_Connections[Idx].zip.out, Z_DEFAULT_COMPRESSION ) != Z_OK )
+	{
+		/* Fehler! */
+		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib deflate)!", Idx );
+		return FALSE;
 	}

 	My_Connections[Idx].zip.bytes_in = My_Connections[Idx].bytes_in;
 	My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;

-	Log(LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx);
-	Conn_OPTION_ADD( &My_Connections[Idx], CONN_ZIP );
+	Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
+	Conn_SetOption( Idx, CONN_ZIP );

-	return true;
+	return TRUE;
 } /* Zip_InitConn */


-/**
- * Copy data to the compression buffer of a connection. We do collect
- * some data there until it's full so that we can achieve better
- * compression ratios.
- * If the (pre-)compression buffer is full, we try to flush it ("actually
- * compress some data") and to add the new (uncompressed) data afterwards.
- * This function closes the connection on error.
- * @param Idx Connection handle.
- * @param Data Pointer to the data.
- * @param Len Length of the data to add.
- * @return true on success, false otherwise.
- */
-GLOBAL bool
-Zip_Buffer( CONN_ID Idx, const char *Data, size_t Len )
+GLOBAL BOOLEAN
+Zip_Buffer( CONN_ID Idx, CHAR *Data, INT Len )
 {
-	size_t buflen;
+	/* Daten zum Komprimieren im "Kompressions-Puffer" sammeln.
+	* Es wird TRUE bei Erfolg, sonst FALSE geliefert. */

 	assert( Idx > NONE );
 	assert( Data != NULL );
 	assert( Len > 0 );

-	buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
-	if (buflen + Len >= WRITEBUFFER_SLINK_LEN) {
-		/* compression buffer is full, flush */
-		if( ! Zip_Flush( Idx )) return false;
+	/* Ist noch Platz im Kompressions-Puffer? */
+	if( ZWRITEBUFFER_LEN - My_Connections[Idx].zip.wdatalen < Len + 50 )
+	{
+		/* Nein! Puffer zunaechst leeren ...*/
+		if( ! Zip_Flush( Idx )) return FALSE;
 	}

-	/* check again; if zip buf is still too large do not append data:
-	 * otherwise the zip wbuf would grow too large */
-	buflen = array_bytes(&My_Connections[Idx].zip.wbuf);
-	if (buflen + Len >= WRITEBUFFER_SLINK_LEN) {
-		Log(LOG_ALERT, "Zip Write buffer space exhausted: %lu bytes", buflen + Len);
-		Conn_Close(Idx, "Zip Write buffer space exhausted", NULL, false);
-		return false;
-	}
-	return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
+	/* Daten kopieren */
+	memmove( My_Connections[Idx].zip.wbuf + My_Connections[Idx].zip.wdatalen, Data, Len );
+	My_Connections[Idx].zip.wdatalen += Len;
+
+	return TRUE;
 } /* Zip_Buffer */


-/**
- * Compress data in ZIP buffer and move result to the write buffer of
- * the connection.
- * This function closes the connection on error.
- * @param Idx Connection handle.
- * @return true on success, false otherwise.
- */
-GLOBAL bool
+GLOBAL BOOLEAN
 Zip_Flush( CONN_ID Idx )
 {
-	int result;
-	unsigned char zipbuf[WRITEBUFFER_SLINK_LEN];
-	int zipbuf_used = 0;
+	/* Daten komprimieren und in Schreibpuffer kopieren.
+	* Es wird TRUE bei Erfolg, sonst FALSE geliefert. */
+
+	INT result, out_len;
 	z_stream *out;

 	out = &My_Connections[Idx].zip.out;

-	out->avail_in = (uInt)array_bytes(&My_Connections[Idx].zip.wbuf);
-	if (!out->avail_in)
-		return true;	/* nothing to do. */
+	out->next_in = (VOID *)My_Connections[Idx].zip.wbuf;
+	out->avail_in = My_Connections[Idx].zip.wdatalen;
+	out->next_out = (VOID *)(My_Connections[Idx].wbuf + My_Connections[Idx].wdatalen);
+	out->avail_out = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen;

-	out->next_in = array_start(&My_Connections[Idx].zip.wbuf);
-	assert(out->next_in != NULL);
-
-	out->next_out = zipbuf;
-	out->avail_out = (uInt)sizeof zipbuf;
-
-#ifdef DEBUG_ZIP
-	Log(LOG_DEBUG, "out->avail_in %d, out->avail_out %d",
-		out->avail_in, out->avail_out);
-#endif
 	result = deflate( out, Z_SYNC_FLUSH );
 	if(( result != Z_OK ) || ( out->avail_in > 0 ))
 	{
 		Log( LOG_ALERT, "Compression error: code %d!?", result );
-		Conn_Close( Idx, "Compression error!", NULL, false );
-		return false;
+		Conn_Close( Idx, "Compression error!", NULL, FALSE );
+		return FALSE;
 	}

-	if (out->avail_out <= 0) {
-		/* Not all data was compressed, because data became
-		 * bigger while compressing it. */
-		Log(LOG_ALERT, "Compression error: buffer overflow!?");
-		Conn_Close(Idx, "Compression error!", NULL, false);
-		return false;
-	}
+	out_len = WRITEBUFFER_LEN - My_Connections[Idx].wdatalen - out->avail_out;
+	My_Connections[Idx].wdatalen += out_len;
+	My_Connections[Idx].bytes_out += out_len;
+	My_Connections[Idx].zip.bytes_out += My_Connections[Idx].zip.wdatalen;
+	My_Connections[Idx].zip.wdatalen = 0;

-	assert(out->avail_out <= WRITEBUFFER_SLINK_LEN);
-
-	zipbuf_used = WRITEBUFFER_SLINK_LEN - out->avail_out;
-#ifdef DEBUG_ZIP
-	Log(LOG_DEBUG, "zipbuf_used: %d", zipbuf_used);
-#endif
-	if (!array_catb(&My_Connections[Idx].wbuf,
-			(char *)zipbuf, (size_t) zipbuf_used)) {
-		Log (LOG_ALERT, "Compression error: can't copy data!?");
-		Conn_Close(Idx, "Compression error!", NULL, false);
-		return false;
-	}
-
-	My_Connections[Idx].bytes_out += zipbuf_used;
-	My_Connections[Idx].zip.bytes_out += array_bytes(&My_Connections[Idx].zip.wbuf); 
-	array_trunc(&My_Connections[Idx].zip.wbuf);
-
-	return true;
+	return TRUE;
 } /* Zip_Flush */


-/**
- * uncompress data and copy it to read buffer.
- * Returns true if data has been unpacked or no
- * compressed data is currently pending in the zread buffer.
- * This function closes the connection on error.
- * @param Idx Connection handle.
- * @return true on success, false otherwise.
- */
-GLOBAL bool
+GLOBAL BOOLEAN
 Unzip_Buffer( CONN_ID Idx )
 {
-	int result;
-	unsigned char unzipbuf[READBUFFER_LEN];
-	int unzipbuf_used = 0;
-	unsigned int z_rdatalen;
-	unsigned int in_len;
-	
+	/* Daten entpacken und in Lesepuffer kopieren. Bei Fehlern
+	* wird FALSE geliefert, ansonsten TRUE. Der Fall, dass keine
+	* Daten mehr zu entpacken sind, ist _kein_ Fehler! */
+
+	INT result, in_len, out_len;
 	z_stream *in;

 	assert( Idx > NONE );

-	z_rdatalen = (unsigned int)array_bytes(&My_Connections[Idx].zip.rbuf);
-	if (z_rdatalen == 0)
-		return true;
+	if( My_Connections[Idx].zip.rdatalen <= 0 ) return TRUE;

 	in = &My_Connections[Idx].zip.in;

-	in->next_in = array_start(&My_Connections[Idx].zip.rbuf);
-	assert(in->next_in != NULL);
+	in->next_in = (VOID *)My_Connections[Idx].zip.rbuf;
+	in->avail_in = My_Connections[Idx].zip.rdatalen;
+	in->next_out = (VOID *)(My_Connections[Idx].rbuf + My_Connections[Idx].rdatalen);
+	in->avail_out = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1;

-	in->avail_in = z_rdatalen;
-	in->next_out = unzipbuf;
-	in->avail_out = (uInt)sizeof unzipbuf;
-
-#ifdef DEBUG_ZIP
-	Log(LOG_DEBUG, "in->avail_in %d, in->avail_out %d",
-		in->avail_in, in->avail_out);
-#endif
 	result = inflate( in, Z_SYNC_FLUSH );
 	if( result != Z_OK )
 	{
-		Log(LOG_ALERT, "Decompression error: %s (code=%d, ni=%d, ai=%d, no=%d, ao=%d)!?", in->msg, result, in->next_in, in->avail_in, in->next_out, in->avail_out);
-		Conn_Close(Idx, "Decompression error!", NULL, false);
-		return false;
+		Log( LOG_ALERT, "Decompression error: %s (code=%d, ni=%d, ai=%d, no=%d, ao=%d)!?", in->msg, result, in->next_in, in->avail_in, in->next_out, in->avail_out );
+		Conn_Close( Idx, "Decompression error!", NULL, FALSE );
+		return FALSE;
 	}

-	assert(z_rdatalen >= in->avail_in);
-	in_len = z_rdatalen - in->avail_in;
-	unzipbuf_used = READBUFFER_LEN - in->avail_out;
-#ifdef DEBUG_ZIP
-	Log(LOG_DEBUG, "unzipbuf_used: %d - %d = %d", READBUFFER_LEN,
-		in->avail_out, unzipbuf_used);
-#endif
-	assert(unzipbuf_used <= READBUFFER_LEN);
-	if (!array_catb(&My_Connections[Idx].rbuf, (char*) unzipbuf,
-			(size_t)unzipbuf_used)) {
-		Log (LOG_ALERT, "Decompression error: can't copy data!?");
-		Conn_Close(Idx, "Decompression error!", NULL, false);
-		return false;
-	}
-	if( in->avail_in > 0 ) {
-		array_moveleft(&My_Connections[Idx].zip.rbuf, 1, in_len );
-	} else {
-		array_trunc( &My_Connections[Idx].zip.rbuf );
-		My_Connections[Idx].zip.bytes_in += unzipbuf_used;
-	}
+	in_len = My_Connections[Idx].zip.rdatalen - in->avail_in;
+	out_len = READBUFFER_LEN - My_Connections[Idx].rdatalen - 1 - in->avail_out;
+	My_Connections[Idx].rdatalen += out_len;

-	return true;
+	if( in->avail_in > 0 )
+	{
+		/* es konnten nicht alle Daten entpackt werden, vermutlich war
+		* im Ziel-Puffer kein Platz mehr. Umkopieren ... */
+		My_Connections[Idx].zip.rdatalen -= in_len;
+		memmove( My_Connections[Idx].zip.rbuf, My_Connections[Idx].zip.rbuf + in_len, My_Connections[Idx].zip.rdatalen );
+	}
+	else My_Connections[Idx].zip.rdatalen = 0;
+	My_Connections[Idx].zip.bytes_in += out_len;
+
+	return TRUE;
 } /* Unzip_Buffer */


-/**
- * @param Idx Connection handle.
- * @return amount of sent (compressed) bytes
- */
-GLOBAL long
+GLOBAL LONG
 Zip_SendBytes( CONN_ID Idx )
 {
+	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].zip.bytes_out;
 } /* Zip_SendBytes */


-/**
- * @param Idx Connection handle.
- * @return amount of received (compressed) bytes
- */
-GLOBAL long
+GLOBAL LONG
 Zip_RecvBytes( CONN_ID Idx )
 {
+	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
+
 	assert( Idx > NONE );
 	return My_Connections[Idx].zip.bytes_in;
 } /* Zip_RecvBytes */
--- a/src/ngircd/conn-zip.h
+++ b/src/ngircd/conn-zip.h
@@ -7,29 +7,32 @@
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conn-zip.h,v 1.2 2003/12/26 15:55:07 alex Exp $
+ *
+ * Connection compression using ZLIB (header)
 */

+
 #ifdef ZLIB

 #ifndef __conn_zip_h__
 #define __conn_zip_h__

-/**
- * @file
- * Connection compression using ZLIB (header)
- */

-GLOBAL bool Zip_InitConn PARAMS(( CONN_ID Idx ));
+GLOBAL BOOLEAN Zip_InitConn PARAMS(( CONN_ID Idx ));

-GLOBAL bool Zip_Buffer PARAMS(( CONN_ID Idx, const char *Data, size_t Len ));
-GLOBAL bool Zip_Flush PARAMS(( CONN_ID Idx ));
-GLOBAL bool Unzip_Buffer PARAMS(( CONN_ID Idx ));
+GLOBAL BOOLEAN Zip_Buffer PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
+GLOBAL BOOLEAN Zip_Flush PARAMS(( CONN_ID Idx ));
+GLOBAL BOOLEAN Unzip_Buffer PARAMS(( CONN_ID Idx ));
+
+GLOBAL LONG Zip_SendBytes PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Zip_RecvBytes PARAMS(( CONN_ID Idx ));

-GLOBAL long Zip_SendBytes PARAMS(( CONN_ID Idx ));
-GLOBAL long Zip_RecvBytes PARAMS(( CONN_ID Idx ));

 #endif /* __conn_zip_h__ */

 #endif /* ZLIB */

+
 /* -eof- */
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -1,58 +1,40 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: conn.h,v 1.32 2003/12/26 15:55:07 alex Exp $
+ *
+ * Connection management (header)
 */

+
 #ifndef __conn_h__
 #define __conn_h__

-/**
- * @file
- * Connection management (header)
- */

-#include <time.h>			/* for time_t, see below */
+#include <time.h>			/* fro time_t, see below */
+
+
+#define CONN_ISCLOSING 1		/* Conn_Close() already called */

-/*
- * connection state flags. this is a bitmask -- all values must
- * be unique and a power of two.
- *
- * If you introduce new ones in between, make sure to adjust all
- * remaining ones.
- */
-#define CONN_ISCLOSING		1	/* Conn_Close() already called */
-#define CONN_ISCONNECTING	2	/* connect() in progress */
-#define CONN_RFC1459		4	/* RFC 1459 compatibility mode */
 #ifdef ZLIB
-#define CONN_ZIP		8	/* zlib compressed link */
+#define CONN_ZIP 2			/* zlib compressed link */
 #endif

-#include "conf-ssl.h"

-#ifdef SSL_SUPPORT
-#define CONN_SSL_CONNECT	16	/* wait for ssl connect to finish */
-#define CONN_SSL		32	/* this connection is SSL encrypted */
-#define CONN_SSL_WANT_WRITE	64	/* SSL/TLS library needs to write protocol data */
-#define CONN_SSL_WANT_READ	128	/* SSL/TLS library needs to read protocol data */
-#define CONN_SSL_FLAGS_ALL	(CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ)
-#endif
-typedef long CONN_ID;
+typedef INT CONN_ID;

-#include "client.h"
-#include "proc.h"

 #ifdef CONN_MODULE

 #include "defines.h"
-#include "array.h"
-#include "tool.h"
-#include "ng_ipaddr.h"
+#include "resolve.h"

 #ifdef ZLIB
 #include <zlib.h>
@@ -60,90 +42,66 @@ typedef struct _ZipData
 {
 	z_stream in;			/* "Handle" for input stream */
 	z_stream out;			/* "Handle" for output stream */
-	array rbuf;			/* Read buffer (compressed) */
-	array wbuf;			/* Write buffer (uncompressed) */
-	long bytes_in, bytes_out;	/* Counter for statistics (uncompressed!) */
+	CHAR rbuf[READBUFFER_LEN];	/* Read buffer */
+	INT rdatalen;			/* Length of data in read buffer (compressed) */
+	CHAR wbuf[WRITEBUFFER_LEN];	/* Write buffer */
+	INT wdatalen;			/* Length of data in write buffer (uncompressed) */
+	LONG bytes_in, bytes_out;	/* Counter for statistics (uncompressed!) */
 } ZIPDATA;
 #endif /* ZLIB */

 typedef struct _Connection
 {
-	int sock;			/* Socket handle */
-	ng_ipaddr_t addr;		/* Client address */
-	PROC_STAT proc_stat;		/* Status of resolver process */
-	char host[HOST_LEN];		/* Hostname */
-	array rbuf;			/* Read buffer */
-	array wbuf;			/* Write buffer */
-	time_t signon;			/* Signon ("connect") time */
+	INT sock;			/* Socket handle */
+	struct sockaddr_in addr;	/* Client address */
+	RES_STAT *res_stat;		/* Status of resolver process, if any */
+	CHAR host[HOST_LEN];		/* Hostname */
+	CHAR rbuf[READBUFFER_LEN];	/* Read buffer */
+	INT rdatalen;			/* Length of data in read buffer */
+	CHAR wbuf[WRITEBUFFER_LEN];	/* Write buffer */
+	INT wdatalen;			/* Length of data in write buffer */
+	time_t starttime;		/* Start time of link */
 	time_t lastdata;		/* Last activity */
 	time_t lastping;		/* Last PING */
 	time_t lastprivmsg;		/* Last PRIVMSG */
 	time_t delaytime;		/* Ignore link ("penalty") */
-	long bytes_in, bytes_out;	/* Received and sent bytes */
-	long msg_in, msg_out;		/* Received and sent IRC messages */
-	int flag;			/* Flag (see "irc-write" module) */
-	UINT16 options;			/* Link options / connection state */
-	UINT16 bps;			/* bytes processed within last second */
-	CLIENT *client;			/* pointer to client structure */
+	LONG bytes_in, bytes_out;	/* Received and sent bytes */
+	LONG msg_in, msg_out;		/* Received and sent IRC messages */
+	INT flag;			/* Flag (see "irc-write" module) */
+	INT options;			/* Link options */
 #ifdef ZLIB
 	ZIPDATA zip;			/* Compression information */
 #endif  /* ZLIB */
-#ifdef SSL_SUPPORT
-	struct ConnSSL_State ssl_state;	/* SSL/GNUTLS state information */
-#endif
-#ifndef STRICT_RFC
-	long auth_ping;			/** PING response expected on login */
-#endif
 } CONNECTION;

 GLOBAL CONNECTION *My_Connections;
 GLOBAL CONN_ID Pool_Size;
-GLOBAL long WCounter;
+GLOBAL LONG WCounter;

 #endif /* CONN_MODULE */


-GLOBAL void Conn_Init PARAMS((void ));
-GLOBAL void Conn_Exit PARAMS(( void ));
+GLOBAL VOID Conn_Init PARAMS((VOID ));
+GLOBAL VOID Conn_Exit PARAMS(( VOID ));

-GLOBAL void Conn_CloseAllSockets PARAMS((void));
+GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
+GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));

-GLOBAL unsigned int Conn_InitListeners PARAMS(( void ));
-GLOBAL void Conn_ExitListeners PARAMS(( void ));
+GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));

-GLOBAL void Conn_Handler PARAMS(( void ));
+GLOBAL VOID Conn_Handler PARAMS(( VOID ));

-GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... ));
+GLOBAL BOOLEAN Conn_Write PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
+GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));

-GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));
+GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));

-GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
+GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID ));

-GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd));
-GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
-GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i));
-#ifdef SSL_SUPPORT
-GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len));
-GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx));
-#else
-static inline bool
-Conn_UsesSSL(UNUSED CONN_ID Idx)
-{ return false; }
-#endif
+GLOBAL INT Conn_MaxFD;

-GLOBAL long Conn_Count PARAMS((void));
-GLOBAL long Conn_CountMax PARAMS((void));
-GLOBAL long Conn_CountAccepted PARAMS((void));
-
-#ifndef STRICT_RFC
-GLOBAL long Conn_GetAuthPing PARAMS((CONN_ID Idx));
-GLOBAL void Conn_SetAuthPing PARAMS((CONN_ID Idx, long ID));
-#endif
-
-#ifdef DEBUG
-GLOBAL void Conn_DebugDump PARAMS((void));
-#endif

 #endif

+
 /* -eof- */
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -1,115 +1,105 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: defines.h,v 1.45.2.1 2004/05/07 11:24:18 alex Exp $
+ *
+ * Global defines of ngIRCd.
 */

 #ifndef __defines_h__
 #define __defines_h__

-/**
- * @file
- * Global constants ("#defines") used by the ngIRCd.
- */

 #define NONE -1

-#define FNAME_LEN 256			/* Max. length of file name */
+#define FNAME_LEN 256			/* max. Laenge eines Dateinamen */

-#define LINE_LEN 256			/* Max. length of a line in the
-					   configuration file */
+#define LINE_LEN 256			/* max. Laenge einer Konfigurationszeile */

-#define HOST_LEN 256			/* Max. lenght of fully qualified host
-					   names (e. g. "abc.domain.tld") */
+#define HOST_LEN 256			/* max. Laenge eines Hostnamen */

-#define MAX_SERVERS 16			/* Max. count of configurable servers */
+#define MAX_LISTEN_PORTS 16		/* max. Anzahl von Listen-Ports */

-#define MAX_WHOWAS 64			/* Max. number of WHOWAS items */
-#define DEFAULT_WHOWAS 5		/* default count for WHOWAS command */
+#define MAX_OPERATORS 16		/* max. Anzahl konfigurierbarer Operatoren */

-#define CONNECTION_POOL 100		/* Size of default connection pool */
+#define MAX_SERVERS 16			/* max. Anzahl konfigurierbarer Server ("Peers") */

-#define CLIENT_ID_LEN 64		/* Max. length of an IRC ID; see RFC
-					   RFC 2812 section 1.1 and 1.2.1 */
-#define CLIENT_NICK_LEN_DEFAULT 10	/* Default nick length, see. RFC 2812
-					 * section 1.2.1 */
-#define CLIENT_NICK_LEN 32		/* Maximum nick name length */
-#define CLIENT_PASS_LEN 21		/* Max. password length */
-#define CLIENT_USER_LEN 10		/* Max. length of user name ("login")
-					   see RFC 2812, section 1.2.1 */
-#define CLIENT_NAME_LEN 32		/* Max. length of "real names" */
-#define CLIENT_HOST_LEN 64		/* Max. host name length */
-#define CLIENT_MODE_LEN 9		/* Max. lenth of all client modes */
-#define CLIENT_INFO_LEN 64		/* Max. length of server info texts */
-#define CLIENT_AWAY_LEN 128		/* Max. length of away messages */
-#define CLIENT_FLAGS_LEN 100		/* Max. length of client flags */
+#define MAX_DEFCHANNELS 16		/* max. Anzahl vorkonfigurierbarerr Channels */

-#define CHANNEL_NAME_LEN 51		/* Max. length of a channel name, see
-					   RFC 2812 section 1.3 */
-#define CHANNEL_MODE_LEN 9		/* Max. length of channel modes */
+#define MAX_SERVICES 8			/* maximum number of configurable services */

-#define COMMAND_LEN 513			/* Max. IRC command length, see. RFC
-					   2812 section 3.2 */
+#define CONNECTION_POOL 100		/* Anzahl Verbindungs-Strukturen, die blockweise alloziert werden */

-#define READBUFFER_LEN 2048		/* Size of the read buffer of a
-					   connection in bytes. */
-#define WRITEBUFFER_FLUSH_LEN 4096	/* Size of a write buffer that triggers
-					   buffer flushing if more space is
-					   needed for storing data. */
-#define WRITEBUFFER_MAX_LEN 32768	/* Maximum size of the write buffer of a
-					   connection in bytes. */
-#define WRITEBUFFER_SLINK_LEN 65536	/* Maximum size of the write buffer of a
-					   server link connection in bytes. */
+#define CLIENT_ID_LEN 64		/* max. ID-Laenge; vgl. RFC 2812, 1.1 und 1.2.1 */
+#define CLIENT_NICK_LEN 10		/* max. Nick-Laenge; vgl. RFC 2812, 1.2.1 */
+#define CLIENT_PASS_LEN 9		/* max. Laenge des Passwortes */
+#define CLIENT_USER_LEN 9		/* max. Laenge des Benutzernamen ("Login") */
+#define CLIENT_NAME_LEN 32		/* max. Laenge des "langen Benutzernamen" */
+#define CLIENT_HOST_LEN 64		/* max. Laenge des Hostname */
+#define CLIENT_MODE_LEN 8		/* max. Laenge der Client-Modes */
+#define CLIENT_INFO_LEN 64		/* max. Infotext-Laenge (Server) */
+#define CLIENT_AWAY_LEN 128		/* max. Laenger der AWAY-Nachricht */
+#define CLIENT_FLAGS_LEN 100		/* max. Laenger der Client-Flags */

-#define PROTOVER "0210"			/* Implemented IRC protocol version,
-					   see RFC 2813 section 4.1.1. */
-#define PROTOIRC "-IRC"			/* Protocol suffix, see RFC 2813
-					   section 4.1.1 */
-#define PROTOIRCPLUS "-IRC+"		/* Protocol suffix used by the IRC+
-					   protocol, see doc/Protocol.txt */
+#define CHANNEL_NAME_LEN 51		/* max. Laenge eines Channel-Namens, vgl. RFC 2812, 1.3 */
+#define CHANNEL_MODE_LEN 8		/* max. Laenge der Channel-Modes */
+#define CHANNEL_TOPIC_LEN 128		/* max. Laenge eines Channel-Topics */
+
+#define COMMAND_LEN 513			/* max. Laenge eines Befehls, vgl. RFC 2812, 3.2 */
+
+#define READBUFFER_LEN 2048		/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define WRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers je Verbindung (Bytes) */
+
+#ifdef ZLIB
+#define ZREADBUFFER_LEN 1024		/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define ZWRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers fuer Kompression (Bytes) */
+#endif
+
+#define PROTOVER "0210"			/* implementierte Protokoll-Version (RFC 2813, 4.1.1) */
+#define PROTOIRC "-IRC"			/* Protokoll-Suffix (RFC 2813, 4.1.1) */
+#define PROTOIRCPLUS "-IRC+"		/* Protokoll-Suffix f<>r IRC+-Protokoll */

 #ifdef IRCPLUS
-# define IRCPLUSFLAGS "CHLS"		/* Standard IRC+ flags */
+# define IRCPLUSFLAGS "CL"		/* IRC+-Flags, die immer zutreffen */
 #endif

-#define STARTUP_DELAY 1			/* Delay outgoing connections n seconds
-					   after startup. */
-#define RECONNECT_DELAY 3		/* Time to delay re-connect attempts
-					   in seconds. */
+#define STARTUP_DELAY 1			/* Erst n Sek. nach Start zu anderen Servern verbinden */
+#define RECONNECT_DELAY 3		/* Server-Links erst nach 3 Sekunden versuchen, wieder aufzubauen */

-#define USERMODES "aciorswx"		/* Supported user modes. */
-#define CHANMODES "biIklmnoOPstvz"	/* Supported channel modes. */
+#define USERMODES "aios"		/* unterstuetzte User-Modes */
+#define CHANMODES "biklImnoPtv"		/* unterstuetzte Channel-Modes */

-#define CONNECTED true			/* Internal status codes. */
-#define DISCONNECTED false
+#define CONNECTED TRUE			/* fuer die irc-xxx-Module */
+#define DISCONNECTED FALSE

-#define DEFAULT_AWAY_MSG "Away"		/* Away message for users connected to
-					   linked servers. */
+#define DEFAULT_AWAY_MSG "Away"		/* Away-Meldung fuer User von anderen Servern */

-#define DEFAULT_TOPIC_ID "-Server-"	/* Default ID for "topic owner". */
+#define CONFIG_FILE "/ngircd.conf"
+#define MOTD_FILE "/ngircd.motd"
+#define MOTD_PHRASE ""
+#define CHROOT_DIR ""

-#define CONFIG_FILE "/ngircd.conf"	/* Configuration file name. */
-#define MOTD_FILE "/ngircd.motd"	/* Name of the MOTD file. */
-#define CHROOT_DIR ""			/* Default chroot() directory. */
-#define PID_FILE ""			/* Default file for the process ID. */
+#define ERROR_DIR "/tmp"

-#define ERROR_DIR "/tmp"		/* Error directory used in debug mode */
+#define MAX_LOG_MSG_LEN 256		/* max. Laenge einer Log-Meldung */

-#define MAX_LOG_MSG_LEN 256		/* Max. length of a log message. */
+#define TOKEN_OUTBOUND -2		/* Kennzeichnung fuer ausgehende Server-Links im Aufbau */

-#define TOKEN_OUTBOUND -2		/* Tag for outbound server links. */
+#define NOTICE_TXTPREFIX ""		/* Kennzeichnung fuer Server-NOTICEs an User */

-#define NOTICE_TXTPREFIX ""		/* Prefix for NOTICEs from the server
-					   to users. Some servers use '*'. */
+#ifdef RENDEZVOUS
+#define RENDEZVOUS_TYPE "_ircu._tcp."	/* Service type to register with Rendezvous */
+#endif

-#define CUT_TXTSUFFIX "[CUT]"		/* Suffix for oversized messages that
-					   have been shortened and cut off. */

 #endif

+
 /* -eof- */
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -1,118 +1,111 @@
 /*
 * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001,2002 by Alexander Barton (alex@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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * Hash calculation
 */

+
 #include "portab.h"

-/**
- * @file
- * Hash calculation
- */
+static char UNUSED id[] = "$Id: hash.c,v 1.9 2002/12/26 16:25:43 alex Exp $";

 #include "imp.h"
 #include <assert.h>
 #include <string.h>

 #include "defines.h"
+#include "log.h"
 #include "tool.h"

 #include "exp.h"
 #include "hash.h"

-static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval));

-/**
- * Calculate hash value for a given string.
- *
- * @param String Input string
- * @return 32 bit hash value
- */
+LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
+
+
 GLOBAL UINT32
-Hash( const char *String )
+Hash( CHAR *String )
 {
-	char buffer[LINE_LEN];
+	/* Hash-Wert ueber String berechnen */

-	strlcpy(buffer, String, sizeof(buffer));
-	return jenkins_hash((UINT8 *)ngt_LowerStr(buffer),
-			    (UINT32)strlen(buffer), 42);
+	CHAR buffer[LINE_LEN];
+
+	strlcpy( buffer, String, sizeof( buffer ));
+	return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
 } /* Hash */

+
 /*
- * This hash function originates from lookup3.c of Bob Jenkins
- * (URL: <http://burtleburtle.net/bob/c/lookup3.c>):
+ * Die hier verwendete Hash-Funktion stammt aus lookup2.c von Bob Jenkins
+ * (URL: <http://burtleburtle.net/bob/c/lookup2.c>). Aus dem Header:
 * --------------------------------------------------------------------
- * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
- * These are functions for producing 32-bit hashes for hash table lookup.
- * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
- * are externally useful functions.  Routines to test the hash are included
- * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
- * the public domain.  It has no warranty.
+ * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
+ * hash(), hash2(), hash3, and mix() are externally useful functions.
+ * Routines to test the hash are included if SELF_TEST is defined.
+ * You can use this free for any purpose.  It has no warranty.
 * --------------------------------------------------------------------
- * Not all of his functions are used here.
+ * nicht alle seiner Funktionen werden hier genutzt.
 */

+
 #define hashsize(n) ((UINT32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))

 #define mix(a,b,c) \
 { \
-	a -= c;  a ^= rot(c, 4);  c += b; \
-	b -= a;  b ^= rot(a, 6);  a += c; \
-	c -= b;  c ^= rot(b, 8);  b += a; \
-	a -= c;  a ^= rot(c,16);  c += b; \
-	b -= a;  b ^= rot(a,19);  a += c; \
-	c -= b;  c ^= rot(b, 4);  b += a; \
+	a -= b; a -= c; a ^= (c>>13); \
+	b -= c; b -= a; b ^= (a<<8);  \
+	c -= a; c -= b; c ^= (b>>13); \
+	a -= b; a -= c; a ^= (c>>12); \
+	b -= c; b -= a; b ^= (a<<16); \
+	c -= a; c -= b; c ^= (b>>5);  \
+	a -= b; a -= c; a ^= (c>>3);  \
+	b -= c; b -= a; b ^= (a<<10); \
+	c -= a; c -= b; c ^= (b>>15); \
 } /* mix */

-#define final(a,b,c) \
-{ \
-	c ^= b; c -= rot(b,14); \
-	a ^= c; a -= rot(c,11); \
-	b ^= a; b -= rot(a,25); \
-	c ^= b; c -= rot(b,16); \
-	a ^= c; a -= rot(c,4);  \
-	b ^= a; b -= rot(a,14); \
-	c ^= b; c -= rot(b,24); \
-}

-static UINT32
-jenkins_hash(UINT8 *k, UINT32 length, UINT32 initval)
+LOCAL UINT32
+jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
 {
 	/* k: the key
 	 * length: length of the key
 	 * initval: the previous hash, or an arbitrary value
 	 */
-	UINT32 a,b,c;
+
+	register UINT32 a,b,c,len;

 	/* Set up the internal state */
-	a = b = c = 0xdeadbeef + length + initval;
+	len = length;
+	a = b = 0x9e3779b9;	/* the golden ratio; an arbitrary value */
+	c = initval;		/* the previous hash value */

 	/* handle most of the key */
-	while (length > 12) {
+	while (len >= 12)
+	{
 		a += (k[0] +((UINT32)k[1]<<8) +((UINT32)k[2]<<16) +((UINT32)k[3]<<24));
 		b += (k[4] +((UINT32)k[5]<<8) +((UINT32)k[6]<<16) +((UINT32)k[7]<<24));
 		c += (k[8] +((UINT32)k[9]<<8) +((UINT32)k[10]<<16)+((UINT32)k[11]<<24));
 		mix(a,b,c);
-		length -= 12;
-		k += 12;
+		k += 12; len -= 12;
 	}

-	/*-------------------------------- last block: affect all 32 bits of (c) */
-	switch(length)                   /* all the case statements fall through */
-
+	/* handle the last 11 bytes */
+	c += length;
+	switch( (INT)len )	/* all the case statements fall through */
 	{
-		case 12: c+=((UINT32)k[11])<<24;
-		case 11: c+=((UINT32)k[10]<<16);
-		case 10: c+=((UINT32)k[9]<<8);
-		case 9 : c+=k[8];
+		case 11: c+=((UINT32)k[10]<<24);
+		case 10: c+=((UINT32)k[9]<<16);
+		case 9 : c+=((UINT32)k[8]<<8);
+		/* the first byte of c is reserved for the length */
 		case 8 : b+=((UINT32)k[7]<<24);
 		case 7 : b+=((UINT32)k[6]<<16);
 		case 6 : b+=((UINT32)k[5]<<8);
@@ -121,11 +114,13 @@ jenkins_hash(UINT8 *k, UINT32 length, UINT32 initval)
 		case 3 : a+=((UINT32)k[2]<<16);
 		case 2 : a+=((UINT32)k[1]<<8);
 		case 1 : a+=k[0];
-			 break;
-		case 0 : return c;
+		/* case 0: nothing left to add */
 	}
-	final(a,b,c);
+	mix(a,b,c);
+
+	/* report the result */
 	return c;
 } /* jenkins_hash */

+
 /* -eof- */
--- a/src/ngircd/hash.h
+++ b/src/ngircd/hash.h
@@ -7,18 +7,21 @@
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 * Please read the file COPYING, README and AUTHORS for more information.
+ *
+ * $Id: hash.h,v 1.4 2002/12/12 12:23:43 alex Exp $
+ *
+ * Hash calculation (header)
 */

+
 #ifndef __hash_h__
 #define __hash_h__

-/**
- * @file
- * Hash calculation (header)
- */

-GLOBAL UINT32 Hash PARAMS((const char *String ));
+GLOBAL UINT32 Hash PARAMS((CHAR *String ));
+

 #endif

+
 /* -eof- */
--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -1,930 +0,0 @@
-/*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- */
-
-#include "portab.h"
-
-/**
- * @file
- * I/O abstraction interface.
- */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "array.h"
-#include "io.h"
-#include "log.h"
-
-/* Enables extra debug messages in event add/delete/callback code. */
-/* #define DEBUG_IO */
-
-typedef struct {
-#ifdef PROTOTYPES
- void (*callback)(int, short);
-#else
- void (*callback)();
-#endif
- short what;
-} io_event;
-
-#define INIT_IOEVENT		{ NULL, -1, 0, NULL }
-#define IO_ERROR		4
-
-#ifdef HAVE_EPOLL_CREATE
-#  define IO_USE_EPOLL		1
-#  ifdef HAVE_SELECT
-#    define IO_USE_SELECT	1
-#  endif
-#else
-#  ifdef HAVE_KQUEUE
-#    define IO_USE_KQUEUE	1
-#  else
-#    ifdef HAVE_SYS_DEVPOLL_H
-#      define IO_USE_DEVPOLL	1
-#    else
-#      ifdef HAVE_POLL
-#        define IO_USE_POLL	1
-#      else
-#        ifdef HAVE_SELECT
-#          define IO_USE_SELECT	1
-#        else
-#          error "no IO API available!?"
-#        endif /* HAVE_SELECT */
-#      endif /* HAVE_POLL */
-#    endif /* HAVE_SYS_DEVPOLL_H */
-#  endif /* HAVE_KQUEUE */
-#endif /* HAVE_EPOLL_CREATE */
-
-static bool library_initialized = false;
-
-#ifdef IO_USE_EPOLL
-#include <sys/epoll.h>
-
-static int io_masterfd = -1;
-static bool io_event_change_epoll(int fd, short what, const int action);
-static int io_dispatch_epoll(struct timeval *tv);
-#endif
-
-#ifdef IO_USE_KQUEUE
-#include <sys/types.h>
-#include <sys/event.h>
-static array io_evcache;
-static int io_masterfd;
-
-static int io_dispatch_kqueue(struct timeval *tv);
-static bool io_event_change_kqueue(int, short, const int action);
-#endif
-
-#ifdef IO_USE_POLL
-#include <poll.h>
-
-static array pollfds;
-static int poll_maxfd;
-
-static bool io_event_change_poll PARAMS((int fd, short what));
-#endif
-
-#ifdef IO_USE_DEVPOLL
-#include <sys/devpoll.h>
-static int io_masterfd;
-
-static bool io_event_change_devpoll(int fd, short what);
-#endif
-
-#ifdef IO_USE_SELECT
-#include "defines.h"	/* for conn.h */
-#include "proc.h"	/* for PROC_STAT (needed by conf.h) */
-#include "conn.h"	/* for CONN_ID (needed by conf.h) */
-#include "conf.h"	/* for Conf_MaxConnections */
-
-static fd_set readers;
-static fd_set writers;
-/*
- * this is the first argument for select(), i.e.
- * the largest fd registered, plus one.
- */
-static int select_maxfd;
-static int io_dispatch_select PARAMS((struct timeval *tv));
-
-#ifndef IO_USE_EPOLL
-#define io_masterfd -1
-#endif
-#endif /* IO_USE_SELECT */
-
-static array io_events;
-
-static void io_docallback PARAMS((int fd, short what));
-
-#ifdef DEBUG_IO
-static void
-io_debug(const char *s, int fd, int what)
-{
-	Log(LOG_DEBUG, "%s: %d, %d\n", s, fd, what);
-}
-#else
-static inline void
-io_debug(const char UNUSED *s,int UNUSED a, int UNUSED b)
-{ /* NOTHING */ }
-#endif
-
-static io_event *
-io_event_get(int fd)
-{
-	io_event *i;
-
-	assert(fd >= 0);
-
-	i = (io_event *) array_get(&io_events, sizeof(io_event), (size_t) fd);
-
-	assert(i != NULL);
-
-	return i;
-}
-
-
-#ifdef IO_USE_DEVPOLL
-static int
-io_dispatch_devpoll(struct timeval *tv)
-{
-	struct dvpoll dvp;
-	time_t sec = tv->tv_sec * 1000;
-	int i, total, ret, timeout = tv->tv_usec + sec;
-	short what;
-	struct pollfd p[100];
-
-	if (timeout < 0)
-		timeout = 1000;
-
-	total = 0;
-	do {
-		dvp.dp_timeout = timeout;
-		dvp.dp_nfds = 100;
-		dvp.dp_fds = p;
-		ret = ioctl(io_masterfd, DP_POLL, &dvp);
-		total += ret;
-		if (ret <= 0)
-			return total;
-		for (i=0; i < ret ; i++) {
-			what = 0;
-			if (p[i].revents & (POLLIN|POLLPRI))
-				what = IO_WANTREAD;
-
-			if (p[i].revents & POLLOUT)
-				what |= IO_WANTWRITE;
-
-			if (p[i].revents && !what) {
-				/* other flag is set, probably POLLERR */
-				what = IO_ERROR;
-			}
-			io_docallback(p[i].fd, what);
-		}
-	} while (ret == 100);
-
-	return total;
-}
-
-
-static bool
-io_event_change_devpoll(int fd, short what)
-{
-	struct pollfd p;
-
-	p.events = 0;
-
-	if (what & IO_WANTREAD)
-		p.events = POLLIN | POLLPRI;
-	if (what & IO_WANTWRITE)
-		p.events |= POLLOUT;
-
-	p.fd = fd;
-	return write(io_masterfd, &p, sizeof p) == (ssize_t)sizeof p;
-}
-
-static void
-io_close_devpoll(int fd)
-{
-	struct pollfd p;
-	p.events = POLLREMOVE;
-	p.fd = fd;
-	write(io_masterfd, &p, sizeof p);
-}
-
-static void
-io_library_init_devpoll(unsigned int eventsize)
-{
-	io_masterfd = open("/dev/poll", O_RDWR);
-	if (io_masterfd >= 0)
-		library_initialized = true;
-	Log(LOG_INFO, "IO subsystem: /dev/poll (initial maxfd %u, masterfd %d).",
-		eventsize, io_masterfd);
-}
-#else
-static inline void
-io_close_devpoll(int UNUSED x)
-{ /* NOTHING */ }
-static inline void
-io_library_init_devpoll(unsigned int UNUSED ev)
-{ /* NOTHING */ }
-#endif
-
-
-#ifdef IO_USE_POLL
-static int
-io_dispatch_poll(struct timeval *tv)
-{
-	time_t sec = tv->tv_sec * 1000;
-	int i, ret, timeout = tv->tv_usec + sec;
-	int fds_ready;
-	short what;
-	struct pollfd *p = array_start(&pollfds);
-
-	if (timeout < 0)
-		timeout = 1000;
-
-	ret = poll(p, poll_maxfd + 1, timeout);
-	if (ret <= 0)
-		return ret;
-
-	fds_ready = ret;
-	for (i=0; i <= poll_maxfd; i++) {
-		what = 0;
-		if (p[i].revents & (POLLIN|POLLPRI))
-			what = IO_WANTREAD;
-
-		if (p[i].revents & POLLOUT)
-			what |= IO_WANTWRITE;
-
-		if (p[i].revents && !what) {
-			/* other flag is set, probably POLLERR */
-			what = IO_ERROR;
-		}
-		if (what) {
-			fds_ready--;
-			io_docallback(i, what);
-		}
-		if (fds_ready <= 0)
-			break;
-	}
-
-	return ret;
-}
-
-static bool
-io_event_change_poll(int fd, short what)
-{
-	struct pollfd *p;
-	short events = 0;
-
-	if (what & IO_WANTREAD)
-		events = POLLIN | POLLPRI;
-	if (what & IO_WANTWRITE)
-		events |= POLLOUT;
-
-	p = array_alloc(&pollfds, sizeof *p, fd);
-	if (p) {
-		p->events = events;
-		p->fd = fd;
-		if (fd > poll_maxfd)
-			poll_maxfd = fd;
-	}
-	return p != NULL;
-}
-
-static void
-io_close_poll(int fd)
-{
-	struct pollfd *p;
-	p = array_get(&pollfds, sizeof *p, fd);
-	if (!p) return;
-
-	p->fd = -1;
-	if (fd == poll_maxfd) {
-		while (poll_maxfd > 0) {
-			--poll_maxfd;
-			p = array_get(&pollfds, sizeof *p, poll_maxfd);
-			if (p && p->fd >= 0)
-				break;
-		}
-	}
-}
-
-static void
-io_library_init_poll(unsigned int eventsize)
-{
-	struct pollfd *p;
-	array_init(&pollfds);
-	poll_maxfd = 0;
-	Log(LOG_INFO, "IO subsystem: poll (initial maxfd %u).",
-	    eventsize);
-	p = array_alloc(&pollfds, sizeof(struct pollfd), eventsize);
-	if (p) {
-		unsigned i;
-		p = array_start(&pollfds);
-		for (i = 0; i < eventsize; i++)
-			p[i].fd = -1;
-
-		library_initialized = true;
-	}
-}
-#else
-static inline void
-io_close_poll(int UNUSED x)
-{ /* NOTHING */ }
-static inline void
-io_library_init_poll(unsigned int UNUSED ev)
-{ /* NOTHING */ }
-#endif
-
-
-#ifdef IO_USE_SELECT
-static int
-io_dispatch_select(struct timeval *tv)
-{
-	fd_set readers_tmp;
-	fd_set writers_tmp;
-	short what;
-	int ret, i;
-	int fds_ready;
-
-	readers_tmp = readers;
-	writers_tmp = writers;
-
-	ret = select(select_maxfd + 1, &readers_tmp, &writers_tmp, NULL, tv);
-	if (ret <= 0)
-		return ret;
-
-	fds_ready = ret;
-
-	for (i = 0; i <= select_maxfd; i++) {
-		what = 0;
-		if (FD_ISSET(i, &readers_tmp)) {
-			what = IO_WANTREAD;
-			fds_ready--;
-		}
-
-		if (FD_ISSET(i, &writers_tmp)) {
-			what |= IO_WANTWRITE;
-			fds_ready--;
-		}
-		if (what)
-			io_docallback(i, what);
-		if (fds_ready <= 0)
-			break;
-	}
-
-	return ret;
-}
-
-static void
-io_library_init_select(unsigned int eventsize)
-{
-	if (library_initialized)
-		return;
-	Log(LOG_INFO, "IO subsystem: select (initial maxfd %u).",
-	    eventsize);
-	FD_ZERO(&readers);
-	FD_ZERO(&writers);
-#ifdef FD_SETSIZE
-	if (Conf_MaxConnections >= (int)FD_SETSIZE) {
-		Log(LOG_WARNING,
-		    "MaxConnections (%d) exceeds limit (%u), changed MaxConnections to %u.",
-		    Conf_MaxConnections, FD_SETSIZE, FD_SETSIZE - 1);
-
-		Conf_MaxConnections = FD_SETSIZE - 1;
-	}
-#else
-	Log(LOG_WARNING,
-	    "FD_SETSIZE undefined, don't know how many descriptors select() can handle on your platform ...");
-#endif /* FD_SETSIZE */
-	library_initialized = true;
-}
-
-static void
-io_close_select(int fd)
-{
-	io_event *i;
-
-	if (io_masterfd >= 0)	/* Are we using epoll()? */
-		return;
-
-	FD_CLR(fd, &writers);
-	FD_CLR(fd, &readers);
-
-	i = io_event_get(fd);
-	if (!i) return;
-
-	if (fd == select_maxfd) {
-		while (select_maxfd>0) {
-			--select_maxfd; /* find largest fd */
-			i = io_event_get(select_maxfd);
-			if (i && i->callback) break;
-		}
-	}
-}
-#else
-static inline void
-io_library_init_select(int UNUSED x)
-{ /* NOTHING */ }
-static inline void
-io_close_select(int UNUSED x)
-{ /* NOTHING */ }
-#endif /* SELECT */
-
-
-#ifdef IO_USE_EPOLL
-static bool
-io_event_change_epoll(int fd, short what, const int action)
-{
-	struct epoll_event ev = { 0, {0} };
-	ev.data.fd = fd;
-
-	if (what & IO_WANTREAD)
-		ev.events = EPOLLIN | EPOLLPRI;
-	if (what & IO_WANTWRITE)
-		ev.events |= EPOLLOUT;
-
-	return epoll_ctl(io_masterfd, action, fd, &ev) == 0;
-}
-
-static int
-io_dispatch_epoll(struct timeval *tv)
-{
-	time_t sec = tv->tv_sec * 1000;
-	int i, total = 0, ret, timeout = tv->tv_usec + sec;
-	struct epoll_event epoll_ev[100];
-	short type;
-
-	if (timeout < 0)
-		timeout = 1000;
-
-	do {
-		ret = epoll_wait(io_masterfd, epoll_ev, 100, timeout);
-		total += ret;
-		if (ret <= 0)
-			return total;
-
-		for (i = 0; i < ret; i++) {
-			type = 0;
-			if (epoll_ev[i].events & (EPOLLERR | EPOLLHUP))
-				type = IO_ERROR;
-
-			if (epoll_ev[i].events & (EPOLLIN | EPOLLPRI))
-				type |= IO_WANTREAD;
-
-			if (epoll_ev[i].events & EPOLLOUT)
-				type |= IO_WANTWRITE;
-
-			io_docallback(epoll_ev[i].data.fd, type);
-		}
-
-		timeout = 0;
-	} while (ret == 100);
-
-	return total;
-}
-
-static void
-io_library_init_epoll(unsigned int eventsize)
-{
-	int ecreate_hint = (int)eventsize;
-	if (ecreate_hint <= 0)
-		ecreate_hint = 128;
-	io_masterfd = epoll_create(ecreate_hint);
-	if (io_masterfd >= 0) {
-		library_initialized = true;
-		Log(LOG_INFO,
-		    "IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).",
-		    ecreate_hint, eventsize, io_masterfd);
-		return;
-	}
-#ifdef IO_USE_SELECT
-	Log(LOG_INFO, "Can't initialize epoll() IO interface, falling back to select() ...");
-#endif
-}
-#else
-static inline void
-io_library_init_epoll(unsigned int UNUSED ev)
-{ /* NOTHING */ }
-#endif /* IO_USE_EPOLL */
-
-
-#ifdef IO_USE_KQUEUE
-static bool
-io_event_kqueue_commit_cache(void)
-{
-	struct kevent *events;
-	bool ret;
-	int len = (int) array_length(&io_evcache, sizeof (struct kevent));
-
-	if (!len) /* nothing to do */
-		return true;
-
-	assert(len>0);
-
-	if (len < 0) {
-		array_free(&io_evcache);
-		return false;
-	}
-
-	events = array_start(&io_evcache);
-
-	assert(events != NULL);
-
-	ret = kevent(io_masterfd, events, len, NULL, 0, NULL) == 0;
-	if (ret)
-		array_trunc(&io_evcache);
-	return ret;
-}
-
-static bool
-io_event_change_kqueue(int fd, short what, const int action)
-{
-	struct kevent kev;
-	bool ret = true;
-
-	if (what & IO_WANTREAD) {
-		EV_SET(&kev, fd, EVFILT_READ, action, 0, 0, 0);
-		ret = array_catb(&io_evcache, (char*) &kev, sizeof (kev));
-		if (!ret)
-			ret = kevent(io_masterfd, &kev,1, NULL, 0, NULL) == 0;
-	}
-
-	if (ret && (what & IO_WANTWRITE)) {
-		EV_SET(&kev, fd, EVFILT_WRITE, action, 0, 0, 0);
-		ret = array_catb(&io_evcache, (char*) &kev, sizeof (kev));
-		if (!ret)
-			ret = kevent(io_masterfd, &kev, 1, NULL, 0, NULL) == 0;
-	}
-
-	if (array_length(&io_evcache, sizeof kev) >= 100)
-		io_event_kqueue_commit_cache();
-	return ret;
-}
-
-static int
-io_dispatch_kqueue(struct timeval *tv)
-{
-	int i, total = 0, ret;
-	struct kevent kev[100];
-	struct kevent *newevents;
-	struct timespec ts;
-	int newevents_len;
-	ts.tv_sec = tv->tv_sec;
-	ts.tv_nsec = tv->tv_usec * 1000;
-
-	do {
-		newevents_len = (int) array_length(&io_evcache, sizeof (struct kevent));
-		newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL;
-		assert(newevents_len >= 0);
-
-		ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts);
-		if (newevents && ret != -1)
-			array_trunc(&io_evcache);
-
-		total += ret;
-		if (ret <= 0)
-			return total;
-
-		for (i = 0; i < ret; i++) {
-			io_debug("dispatch_kqueue: fd, kev.flags", (int)kev[i].ident, kev[i].flags);
-			if (kev[i].flags & (EV_EOF|EV_ERROR)) {
-				if (kev[i].flags & EV_ERROR)
-					Log(LOG_ERR, "kevent fd %d: EV_ERROR (%s)",
-						(int)kev[i].ident, strerror((int)kev[i].data));
-				io_docallback((int)kev[i].ident, IO_ERROR);
-				continue;
-			}
-
-			switch (kev[i].filter) {
-			case EVFILT_READ:
-				io_docallback((int)kev[i].ident, IO_WANTREAD);
-				break;
-			case EVFILT_WRITE:
-				io_docallback((int)kev[i].ident, IO_WANTWRITE);
-				break;
-			default:
-				LogDebug("Unknown kev.filter number %d for fd %d",
-					kev[i].filter, kev[i].ident);
-				/* Fall through */
-			case EV_ERROR:
-				io_docallback((int)kev[i].ident, IO_ERROR);
-				break;
-			}
-		}
-		ts.tv_sec = 0;
-		ts.tv_nsec = 0;
-	} while (ret == 100);
-
-	return total;
-}
-
-static void
-io_library_init_kqueue(unsigned int eventsize)
-{
-	io_masterfd = kqueue();
-
-	Log(LOG_INFO,
-	    "IO subsystem: kqueue (initial maxfd %u, masterfd %d)",
-	    eventsize, io_masterfd);
-	if (io_masterfd >= 0)
-		library_initialized = true;
-}
-#else
-static inline void
-io_library_init_kqueue(unsigned int UNUSED ev)
-{ /* NOTHING */ }
-#endif
-
-
-bool
-io_library_init(unsigned int eventsize)
-{
-	if (library_initialized)
-		return true;
-
-	if ((eventsize > 0) && !array_alloc(&io_events, sizeof(io_event), (size_t)eventsize))
-		eventsize = 0;
-
-	io_library_init_epoll(eventsize);
-	io_library_init_kqueue(eventsize);
-	io_library_init_devpoll(eventsize);
-	io_library_init_poll(eventsize);
-	io_library_init_select(eventsize);
-
-	return library_initialized;
-}
-
-
-void
-io_library_shutdown(void)
-{
-#ifdef IO_USE_SELECT
-	FD_ZERO(&readers);
-	FD_ZERO(&writers);
-#endif
-#if defined(IO_USE_EPOLL) || defined(IO_USE_KQUEUE) || defined(IO_USE_DEVPOLL)
-	if (io_masterfd >= 0)
-		close(io_masterfd);
-	io_masterfd = -1;
-#endif
-#ifdef IO_USE_KQUEUE
-	array_free(&io_evcache);
-#endif
-	library_initialized = false;
-}
-
-
-bool
-io_event_setcb(int fd, void (*cbfunc) (int, short))
-{
-	io_event *i = io_event_get(fd);
-	if (!i)
-		return false;
-
-	i->callback = cbfunc;
-	return true;
-}
-
-
-static bool
-backend_create_ev(int fd, short what)
-{
-	bool ret;
-#ifdef IO_USE_DEVPOLL
-	ret = io_event_change_devpoll(fd, what);
-#endif
-#ifdef IO_USE_POLL
-	ret = io_event_change_poll(fd, what);
-#endif
-#ifdef IO_USE_EPOLL
-	ret = io_event_change_epoll(fd, what, EPOLL_CTL_ADD);
-#endif
-#ifdef IO_USE_KQUEUE
-	ret = io_event_change_kqueue(fd, what, EV_ADD|EV_ENABLE);
-#endif
-#ifdef IO_USE_SELECT
-	if (io_masterfd < 0)
-		ret = io_event_add(fd, what);
-#endif
-	return ret;
-}
-
-
-bool
-io_event_create(int fd, short what, void (*cbfunc) (int, short))
-{
-	bool ret;
-	io_event *i;
-
-	assert(fd >= 0);
-#if defined(IO_USE_SELECT) && defined(FD_SETSIZE)
-	if (io_masterfd < 0 && fd >= FD_SETSIZE) {
-		Log(LOG_ERR,
-		    "fd %d exceeds FD_SETSIZE (%u) (select can't handle more file descriptors)",
-		    fd, FD_SETSIZE);
-		return false;
-	}
-#endif
-	i = (io_event *) array_alloc(&io_events, sizeof(io_event), (size_t) fd);
-	if (!i) {
-		Log(LOG_WARNING,
-		    "array_alloc failed: could not allocate space for %d io_event structures",
-		    fd);
-		return false;
-	}
-
-	i->callback = cbfunc;
-	i->what = 0;
-	ret = backend_create_ev(fd, what);
-	if (ret)
-		i->what = what;
-	return ret;
-}
-
-
-bool
-io_event_add(int fd, short what)
-{
-	io_event *i = io_event_get(fd);
-
-	if (!i) return false;
-
-	if ((i->what & what) == what) /* event type is already registered */
-		return true;
-
-	io_debug("io_event_add: fd, what", fd, what);
-
-	i->what |= what;
-#ifdef IO_USE_EPOLL
-	if (io_masterfd >= 0)
-		return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
-#endif
-#ifdef IO_USE_KQUEUE
-	return io_event_change_kqueue(fd, what, EV_ADD | EV_ENABLE);
-#endif
-#ifdef IO_USE_DEVPOLL
-	return io_event_change_devpoll(fd, i->what);
-#endif
-#ifdef IO_USE_POLL
-	return io_event_change_poll(fd, i->what);
-#endif
-#ifdef IO_USE_SELECT
-	if (fd > select_maxfd)
-		select_maxfd = fd;
-
-	if (what & IO_WANTREAD)
-		FD_SET(fd, &readers);
-	if (what & IO_WANTWRITE)
-		FD_SET(fd, &writers);
-
-	return true;
-#endif
-	return false;
-}
-
-
-bool
-io_setnonblock(int fd)
-{
-	int flags = fcntl(fd, F_GETFL);
-	if (flags == -1)
-		return false;
-#ifndef O_NONBLOCK
-#define O_NONBLOCK O_NDELAY
-#endif
-	flags |= O_NONBLOCK;
-
-	return fcntl(fd, F_SETFL, flags) == 0;
-}
-
-bool
-io_setcloexec(int fd)
-{
-	int flags = fcntl(fd, F_GETFD);
-	if (flags == -1)
-		return false;
-#ifdef FD_CLOEXEC
-	flags |= FD_CLOEXEC;
-#endif
-
-	return fcntl(fd, F_SETFD, flags) == 0;
-}
-
-bool
-io_close(int fd)
-{
-	io_event *i;
-
-	i = io_event_get(fd);
-#ifdef IO_USE_KQUEUE
-	if (array_length(&io_evcache, sizeof (struct kevent)))	/* pending data in cache? */
-		io_event_kqueue_commit_cache();
-
-	/* both kqueue and epoll remove fd from all sets automatically on the last close
-	 * of the descriptor. since we don't know if this is the last close we'll have
-	 * to remove the set explicitly. */
-	if (i) {
-		io_event_change_kqueue(fd, i->what, EV_DELETE);
-		io_event_kqueue_commit_cache();
-	}
-#endif
-	io_close_devpoll(fd);
-	io_close_poll(fd);
-	io_close_select(fd);
-#ifdef IO_USE_EPOLL
-	io_event_change_epoll(fd, 0, EPOLL_CTL_DEL);
-#endif
-	if (i) {
-		i->callback = NULL;
-		i->what = 0;
-	}
-	return close(fd) == 0;
-}
-
-
-bool
-io_event_del(int fd, short what)
-{
-	io_event *i = io_event_get(fd);
-
-	io_debug("io_event_del: trying to delete eventtype; fd, what", fd, what);
-	if (!i) return false;
-
-	if (!(i->what & what)) /* event is already disabled */
-		return true;
-
-	i->what &= ~what;
-#ifdef IO_USE_DEVPOLL
-	return io_event_change_devpoll(fd, i->what);
-#endif
-#ifdef IO_USE_POLL
-	return io_event_change_poll(fd, i->what);
-#endif
-#ifdef IO_USE_EPOLL
-	if (io_masterfd >= 0)
-		return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
-#endif
-#ifdef IO_USE_KQUEUE
-	return io_event_change_kqueue(fd, what, EV_DISABLE);
-#endif
-#ifdef IO_USE_SELECT
-	if (what & IO_WANTWRITE)
-		FD_CLR(fd, &writers);
-
-	if (what & IO_WANTREAD)
-		FD_CLR(fd, &readers);
-	return true;
-#endif
-	return false;
-}
-
-
-int
-io_dispatch(struct timeval *tv)
-{
-#ifdef IO_USE_EPOLL
-	if (io_masterfd >= 0)
-		return io_dispatch_epoll(tv);
-#endif
-#ifdef IO_USE_SELECT
-	return io_dispatch_select(tv);
-#endif
-#ifdef IO_USE_KQUEUE
-	return io_dispatch_kqueue(tv);
-#endif
-#ifdef IO_USE_DEVPOLL
-	return io_dispatch_devpoll(tv);
-#endif
-#ifdef IO_USE_POLL
-	return io_dispatch_poll(tv);
-#endif
-	return -1;
-}
-
-
-/* call the callback function inside the struct matching fd */
-static void
-io_docallback(int fd, short what)
-{
-	io_event *i = io_event_get(fd);
-
-	io_debug("io_docallback; fd, what", fd, what);
-
-	if (i->callback) {	/* callback might be NULL if a previous callback function
-				   called io_close on this fd */
-		i->callback(fd, (what & IO_ERROR) ? i->what : what);
-	}
-	/* if error indicator is set, we return the event(s) that were registered */
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Barton	a9823b2db1	ngIRCd 0.8.3	2005-02-03 10:16:25 +00:00
Alexander Barton	3563147514	Fixed a bug that could case a root exploit when the daemon is compiled to do IDENT lookups and is logging to syslog. Bug discovered by CoKi, <coki@nosystem.com.ar>, thanks a lot! [from HEAD.] (http://www.nosystem.com.ar/advisories/advisory-11.txt)	2005-02-03 09:27:09 +00:00
Alexander Barton	81d21d4592	"ngIRCd" instead of "ngircd" ...	2005-02-03 09:20:58 +00:00
Alexander Barton	117cc7055d	Updated config.guess and config.sub	2005-01-27 00:15:15 +00:00
Alexander Barton	7f1a44dd40	Fixed wrong maintainer name ...	2005-01-27 00:01:10 +00:00
Alexander Barton	51e5d9d74d	Ooops, bad email address ...	2005-01-26 22:18:48 +00:00
Alexander Barton	93a0179a34	ngIRCd package 0.8.2-0ab1	2005-01-26 22:16:50 +00:00
Alexander Barton	314cf1238b	ngIRCd 0.8.2	2005-01-26 22:05:26 +00:00
Alexander Barton	286b29ffcd	We are in the year 2005 now! :-)	2005-01-26 22:02:36 +00:00
Alexander Barton	2283454917	Added doc/SSL.txt (from CVS HEAD) to 0.8.x branch.	2005-01-26 21:47:47 +00:00
Alexander Barton	f0b3a9cacd	Fixed a buffer overflow that could cause the daemon to crash. Bug found by Florian Westphal, <westphal@foo.fh-furtwangen.de>. [from HEAD]	2005-01-26 13:27:01 +00:00
Alexander Barton	9dc7666eed	Updated list of contributors.	2005-01-26 13:26:41 +00:00
Alexander Barton	87ce4379e8	Fixed a possible buffer underrun when reading the MOTD file. Thanks to Florian Westphal, <westphal@foo.fh-furtwangen.de>. [from HEAD].	2005-01-24 14:22:30 +00:00
Alexander Barton	0eb7ad58d0	Fixed detection of IRC lines which are too long to send. Detected by Florian Westphal, <westphal@foo.fh-furtwangen.de>. [from HEAD]	2005-01-19 23:35:42 +00:00
Alexander Barton	883251ca05	Fixed return values of our own implementation of strlcpy(). The code has been taken from rsync and they fixed it, but we didn't until today :-/ [HEAD]	2005-01-18 09:09:05 +00:00
Alexander Barton	e04d74ad3b	Version 0.8.1	2004-12-25 00:20:57 +00:00
Alexander Barton	002d9299a6	Updated config.guess and config.sub [from HEAD].	2004-12-25 00:11:42 +00:00
Alexander Barton	33cec4efd9	Added some more debug code ... [from HEAD].	2004-12-25 00:00:42 +00:00
Alexander Barton	0999dc7907	Updated list of supported/tested platforms.	2004-11-09 10:58:01 +00:00
Alexander Barton	35fe11fea4	Fixed wrong variable names in output of "ngircd --configtest". [From HEAD].	2004-09-27 11:30:52 +00:00
Alexander Barton	180fdb542b	Added functions.inc to EXTRA_DIST files. [From HEAD].	2004-09-08 09:45:53 +00:00
Alexander Barton	9cb9cca536	Fixed echo without newline for systems not understanding "echo -n"; added new file "functions.inc" for functions usable by all test scripts. [From HEAD].	2004-09-06 22:07:26 +00:00
Alexander Barton	593cc7b4e2	Reverted extension of the "make all" target in the test-suite.	2004-09-06 20:35:00 +00:00
Alexander Barton	0be284db30	Fixed wrong exit code check of "kill -0". [From HEAD].	2004-09-06 20:30:43 +00:00
Alexander Barton	e2e89067ae	Changed version number to reflect CVS branch-0-8-x.	2004-09-06 00:41:34 +00:00
Alexander Barton	f632ca2645	ed name of "default file" for ngircd-full package. And do the test if the binary is executable after reading this file. [From HEAD].	2004-09-06 00:36:49 +00:00
Alexander Barton	12497e1dd2	Updated documentation.	2004-09-04 20:50:53 +00:00
Alexander Barton	cabd09d9ae	Updated "test suite". From HEAD.	2004-09-04 20:49:36 +00:00
Alexander Barton	98b92e112a	Information for configuring ngIRCd. From HEAD.	2004-09-03 20:02:02 +00:00
Alexander Barton	2d524b1958	Fixed wrong email address.	2004-07-28 16:03:42 +00:00
Alexander Barton	d989166d3f	Added missing commas to debian control file, fixes bug #56 . Thanks to Kevin Otte (nivex@nivex.net) for the patch.	2004-07-15 08:59:09 +00:00
Alexander Barton	f7c63e9237	Debian package version 0.8.0-0ab1	2004-06-26 09:27:29 +00:00
Alexander Barton	0958133a0a	ngIRCd 0.8.0	2004-06-26 09:19:58 +00:00
Alexander Barton	205fea28b3	Updated documentation.	2004-06-26 09:12:38 +00:00
Alexander Barton	8cd18eb6b4	Added cast to integer for Solaris.	2004-06-26 09:06:27 +00:00
Alexander Barton	7f66fd908e	Fixed wrong buffer size calculation for resolver results.	2004-05-30 16:24:21 +00:00
Alexander Barton	3c33a41fe8	Version 0.8.0-pre2	2004-05-15 23:55:48 +00:00
Alexander Barton	0d0cdf4831	Fixed host name lookups when using IDENT user lookups.	2004-05-15 23:52:17 +00:00
Alexander Barton	030fef4a8a	Enhanced logging to console when running in "no-detached mode": added PID and log messages of resolver sub-processes. [from HEAD]	2004-05-15 23:51:13 +00:00
Alexander Barton	15d31d31db	"make clean" and "make maintainer-clean" remove more files now. [from HEAD]	2004-05-11 00:38:17 +00:00
Alexander Barton	2a3ec21702	Version 0.8.0-pre1	2004-05-07 11:56:19 +00:00
Alexander Barton	9f9576ce31	New "chroot" feature (from Benjamin Pineau), introducing new configuration variables "ChrootDir" and "MotdPhrase". [from HEAD]	2004-05-07 11:24:17 +00:00
				`@@ -1 +0,0 @@`
				<pkg-contents spec="1.12"><f n="ngircd.dest" o="root" g="admin" p="16877" pt="/Users/alex/Develop/ngircd/alex.git/ngircd.dest" m="false" t="file"><f n="opt" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="16877"><f n="etc" o="root" g="admin" p="16877"><f n="ngircd.motd" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="sbin" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="33261"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="share" o="root" g="admin" p="16877"><f n="doc" o="root" g="admin" p="16877"><f n="ngircd" o="root" g="admin" p="16877"><f n="AUTHORS" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Bopm.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="ChangeLog" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="COPYING" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="FAQ.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="GIT.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="HowToRelease.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="INSTALL" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="NEWS" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="PAM.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Platforms.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Protocol.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-AUX.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-BeOS.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="README-Interix.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="RFC.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="sample-ngircd.conf" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Services.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><f n="SSL.txt" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="man" o="root" g="admin" p="16877"><f n="man5" o="root" g="admin" p="16877"><f n="ngircd.conf.5" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="man8" o="root" g="admin" p="16877"><f n="ngircd.8" o="root" g="admin" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></pkg-contents>
				`@@ -1 +0,0 @@`
				<pkgref spec="1.12" uuid="46208410-4A1B-48C6-97BD-DE284F13F864"><config><identifier>de.barton.ngircd.daemon.pkg</identifier><version>17.1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom>/Users/alex/Develop/ngircd/alex.git/ngircd.dest</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>extraFiles</mod><mod>installTo</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.preinstall.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>scripts.preupgrade.path</mod><mod>requireAuthorization</mod></config><contents><file-list>02ngircd-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
				`@@ -1 +0,0 @@`
				`<pkg-contents spec="1.12"><f n="de.barton.ngircd.plist" o="root" g="wheel" p="33188" pt="/Users/alex/Develop/ngircd/alex.git/contrib/MacOSX/de.barton.ngircd.plist" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>`
				`@@ -1 +0,0 @@`
				<pkgref spec="1.12" uuid="F0954DA7-0607-4277-AE10-D882AC7C38CA"><config><identifier>de.barton.ngircd.launchscript.pkg</identifier><version>17.1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">de.barton.ngircd.plist</installFrom><installTo mod="true">/Library/LaunchDaemons</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preinstall.path</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.postinstall.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.path</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>requireAuthorization</mod><mod>extraFiles</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">preinstall.sh</preinstall><postinstall relative="true" mod="true">postinstall.sh</postinstall><preupgrade relative="true" mod="true">preinstall.sh</preupgrade><postupgrade relative="true" mod="true">postinstall.sh</postupgrade></scripts><contents><file-list>01de-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>