Changed version string back to "0.6.x-CVS".

change is a valid channel member or not (from HEAD).

.gitignore

@@ -1,17 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-ansi2knr.1
-ansi2knr.c
-ansi2knr.h
-autom4te.cache
-config.log
-config.status
-configure
-configure.lineno
-depcomp
-install-sh
-missing
-.deps
-*.a
-*.o

AUTHORS

@@ -1,41 +1,13 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2007 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                       -- AUTHORS and CONTRIBUTORS --
+                           -- AUTHORS / Autoren --
 
 
-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, <westphal@foo.fh-furtwangen.de> (fw)
-
-
-Contributors
-~~~~~~~~~~~~
-Goetz Hoffart, <goetz@hoffart.de> (goetz)
-Ilja Osthoff, <i.osthoff@gmx.net> (ilja)
-Benjamin Pineau, <ben@zouh.org>
-Sean Reifschneider, <jafo-rpms@tummy.com>
-
-
-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.13 2007/10/04 15:18:48 alex Exp $
+Alexander Barton, alex@arthur.ath.cx

ChangeLog

@@ -1,415 +1,20 @@
 
                      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
                    terms of the GNU General Public License.
 
-                               -- ChangeLog --
+                        -- ChangeLog / Aenderungen --
 
 
-ngIRCd 0.12.1 (2008-07-09)
+ngIRCd 0.6.x
 
-  - 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-seperated 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.
+  - Conn_Close() now handles recurisive calls for the same link correctly.
 
-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 complie 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 disabe 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].
-  
-  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 adress 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 recognice 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].
-  
-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>.
-
-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!
-    (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>.
-  - 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
-    Florian Westphal, <westphal@foo.fh-furtwangen.de>.
-  - 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 :-/
-    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)
-
-  - 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
-    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!
-
-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)
-  - 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.
-
-  ngIRCd 0.8.0-pre1 (2004-05-07)
-  - Two new configuration options: "ChrootDir" and "MotdPhrase", thanks to
-    Benjamin Pineau <ben@zouh.org>. Now you can force the daemon to change
-    its root and working directory to something "safe". MotdPhrase is used
-    to define an "MOTD string" instead of a whole file, useful if the
-    "real" MOTD file would be outside the "jail".
-  - INVITE- and BAN-lists become synchronized between IRC+ servers when
-    establishing new connections, if the peer supports this as well.
-  - Reorganized autogen.sh and configure scripts.
-  - Fixed a wrong assert() which could cause the daemon to exit spuriously
-    when closing down connections.
-  - Better logging of decompression errors returned by zlib.
-  - Servers other than the destination server didn't clean up the invite
-    list of an "invite-only" channel properly when an INVITE'd user joined.
-  - Changed the reply of the MODE command to match the syntax of the
-    original ircd exactly: the unnecessary but missing ":" before the last
-    parameter has been added.
-  - Fixed TRACE: don't output "Serv" lines for ourself; display more info.
-  - Results of the resolver (hostnames and IDENT names) are discarded after
-    the client is successfully registered with the server.
-  - Better logging while establishing and shutting down connections.
-  - The type of service (TOS) of all sockets is set to "interactive" now.
-  - Added short command line option "-t" as alternative to "--configtest".
-  - Added optional support for "IDENT" lookups on incoming connections. You
-    have to enable this function with the ./configure switch "--with-ident".
-    The default is not to do IDENT lookups.
-
-ngIRCd 0.7.7 (2004-02-05)
-
-  - The info text ("real name") of users is set to "-" if none has been
-    specified using the USER command (e. g. "USER user * * :"). Reason:
-    the original ircd doesn't like empty ones and would KILL such users.
-  - Fixed (optional) TCP Wrapper test which was broken and could result in
-    false results. Thanks to Fuminori Tanizaki <tany@mcnet.ad.jp>!
-  - Removed "USE_" prefixes of configuration #defines.
-
-ngIRCd 0.7.6 (2003-12-05)
-
-  - Fixed abort() ("server crash") when INVITE'ing users to nonexistent
-    channels. Bug found by <hiddenx@wp.pl>.
-  - Extended version numbering of CVS versions (added date).
-  - Enhanced/fixed doc/Protocol.txt;
-
-ngIRCd 0.7.5 (2003-11-07)
-
-  - Fixed ban behavior: users which are banned from a channel can't no
-    longer send PRIVMSG's to this channel (fixes Bug #47).
-  - Fixed and enhanced the "penalty handling" of the server: commands that
-    require more resources block the client for a short time.
-  - Changed the internal time resolution to one second.
-  - New configuration variable "MaxConnectionsIP" to limit the number of
-    simultaneous connections from a single IP that the server will accept.
-    This configuration options lowers the risk of denial of service attacks
-    (DoS), the default is 5 connections per client IP.
-  - Fixed build problems under Mac OS X 10.3.
-  - Use "-pipe" when compiling with gcc, speeds things up a little :-)
-  - Added new configuration variable "Listen" to bind all listening
-    sockets of the server to a single IP address.
-  - Suppress misleading error message of diff during make run.
-  - Enhanced test-suite and made it work on GNU/Hurd.
-  - Fixed minor typo in debug output :-)
-
-ngIRCd 0.7.1 (2003-07-18)
-
-  - Included files to build Debian packages (located in "debian/").
-  - Updated config.guess and config.sub to newer upstream versions.
-  - NJOIN propagates user channel modes correctly again ... Upsa.
-  - Made Makefile more compatible with "make -j<n>".
-  - Added support for GNU/Hurd.
-  - Fixed a compiler warning related to an unnecessary assert().
-  - Enhanced VERSION command when using debug versions.
-
-ngIRCd 0.7.0 (2003-05-01)
-
-  - "ServerName" is checked better now: a dot (".") is required.
-  - The KILL command verifies and logs more parameters.
-
-  ngIRCd 0.7.0-pre2 (2003-04-27)
-  - CVS build system fixes (made autogen.sh more portable).
-  - Fixed compilation and test-suite on Solaris (tested with 2.6).
-  - New documentation file "doc/Platforms.txt" describing the status of
-    ngIRCd on the various tested platforms.
-  - Test for broken GCC on Mac OS X and disable "-pedantic" in this case.
-  - Disable "-ansi" on Cygwin: system headers are incompatible.
-  - The server tried to connect to other servers only once when DNS or
-    socket failures occurred.
-  - Fixed --configtest: There is no variable "ServerPwd", it's "Password".
-
-  ngIRCd 0.7.0-pre1 (2003-04-22)
-  - New signal handler (more secure, actions are executed outside).
-  - GCC: the compiler is now called with more warning options enabled.
-  - Replaced a lot of str[n]cpy(), str[n]cat() and sprintf() calls with the
-    more secure functions strlcpy(), strlcat() and snprintf(). On systems
-    that don't support strlcpy() and strlcat(), these functions are included
-    in the libngportab now (with prototypes in portab.h).
-  - If the server can't close a socket, it panics now. This is an error that
-    can't occur during normal operation so there is something broken.
-  - The order of log messages during disconnects is more "natural" now ;-)
-  - Cleaned up handling of server configuration structures: modifying and
-    removing servers during runtime works more reliable now.
-  - Compression code from "conn.[ch]" is now found in new "conn-zip.[ch]"
-  - Moved some connection functions from "conn.[ch]" to "conn-func.[ch]".
-  - New command CONNECT to enable and add server links. The syntax is not
-    RFC-compatible: use "CONNECT <name> <port>" to enable and connect an
-    configured server and "CONNECT <name> <port> <host> <mypwd> <peerpwd>"
-    to add a new server (ngIRCd tries to connect new servers only once!).
-  - Added DISCONNECT command ("DISCONNECT <name>") to disable servers.
-  - Restructured the documentation: Now the main language is English. The
-    german documentation has been removed (until there is a maintainer).
-  - Enhanced killing of users caused by a nickname collision.
-  - Better error detection for status code ("numerics") forwarding.
-  - Moved tool functions to own library: "libngtool".
-  - New command TRACE (you can trace only servers at the moment).
-  - New command HELP that lists all understood commands.
-  - There should no longer remain "unknown connections" (see e.g. LUSERS)
-    if an outgoing server link can't be established.
-  - Added AC_PREREQ(2.50) to configure.in for better autoconf compatibility.
-  - Conn_Close() now handles recursive calls for the same link correctly.
-  - ngIRCd can register itself with Rendezvous: to enable support pass the
-    new switch "--with-rendezvous" to configure.
-  - 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",
-    "--with-tcp-wrappers", and "--with-rendezvous".
-  - 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 hanling of NJOIN in case of nick collisions.
-
-ngIRCd 0.6.1, 2003-01-21
+ngIRCd 0.6.1, 2002-01-21
 
   - Fixed KILL: you can't crash the server by killing yourself any more,
     ngIRCd no longer sends a QUIT to other servers after the KILL, and you
@@ -420,7 +25,7 @@ ngIRCd 0.6.1, 2003-01-21
   - The server sets a correct default AWAY message now when propagating
     between servers (bug introduced in 0.6.0).
   - Fixed up and enhanced CHANINFO command: channel keys and user limits
-    are synchronized between servers now, too.
+    are syncronized between servers now, too.
   - MODE returns the key and user limit for channel members correctly now.
   - Non-members of a channel could crash the server when trying to change
     its modes or modes of its members.
@@ -786,3 +391,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.147.2.14 2003/03/09 20:16:57 alex Exp $

INSTALL

@@ -1,246 +1,162 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2007 Alexander Barton,
+                      (c)2001,2002 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 --
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
+                         -- INSTALL / Installation --
                          
-
-I. Upgrade Information
-~~~~~~~~~~~~~~~~~~~~~~
-
-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:
-    --disable-syslog  ->  --without-syslog
-    --disable-zlib    ->  --without-zlib
-  Please call "./configure --help" to review the full list of options!
-
-Differences to version 0.5.x
-
-- Starting with version 0.6.0, other servers are identified using asynchronous
-  passwords: therefore the variable "Password" in [Server]-sections has been
-  replaced by "MyPassword" and "PeerPassword".
-
-- New configuration variables, section [Global]: MaxConnections, MaxJoins
-  (see example configuration file "doc/sample-ngircd.conf"!).
+                      Ilja Osthoff, <ilja@glide.ath.cx>
 
 
-II. Standard Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-ngIRCd is developed for UNIX-based systems, which means that the installation
-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:
-
-  1) ./autogen.sh	[only necessary when using GIT]
-  2) ./configure
-  3) make
-  4) make install
-
-(Please see details below!)
-
-Now the newly compiled executable "ngircd" is installed in its standard
-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.
-
-If no previous version of the configuration file exists (the standard name
-is /usr/local/etc/ngircd.conf), a sample configuration file containing all
-possible options will be installed there. You'll find its template in the
-doc/ directory: sample-ngircd.conf.
+ +-----------------------------------------------------------------------+
+ | Please note: English translations of some of the german documentation |
+ | files can be found in the directory "doc/en" -- please have a look!   |
+ +-----------------------------------------------------------------------+
 
 
-1): "autogen.sh"
+0. Update von frueheren Versionen
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-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.
+Unterschiede zu Version 0.5.x
 
-This step is therefore only interesting for developers.
+- Ab Version 0.6.0 werden asyncrone Passwoerter zur Identifikation anderer
+  Server, die Variable "Password" in [Server]-Abschnitten wird nicht mehr
+  unterstuetzt. Passwoerter fuer Server-Server-Links werden nun mit den
+  Variablen "MyPassword" und "PeerPassword" angegeben.
 
-autogen.sh produces the Makefile.in's, which are necessary for the configure
-script itself, and some more files for make. To run autogen.sh you'll need
-GNU autoconf and GNU automake (use recent versions! autoconf 2.53 and
-automake 1.6.1 are known to work).
-
-Again: "end users" do not need this step!
+- Neue Konfigurationsvariablen, Sektion [Global]: MaxConnections, MaxJoins
+  (vgl. auch Beispiel-Konfiguration "doc/sample-ngircd.conf"!)
 
 
-2): "./configure"
-
-The configure-script is used to detect local system dependencies.
-
-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.
-
-In addition, you can pass some command line options to "configure" to enable
-and/or disable some features of ngIRCd. All these options are shown using
-"./configure --help", too.
-
-Compiling a static binary will avoid you the hassle of feeding a chroot dir
-(if you want use the chroot feature). Just do something like:
-  CFLAGS=-static ./configure [--your-options ...]
-Then you can use a void directory as ChrootDir (like OpenSSH's /var/empty).
-
-
-3): "make"
-
-The make command uses the Makefiles produced by configure and compiles the
-ngIRCd daemon.
-
-
-4): "make install"
-
-Use "make install" to install the server and a sample configuration file on
-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.
-
-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
-
-
-III. Additional features
+I. Standard-Installation
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-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.
+ngIRCd ist fuer UNIXoide-Systeme konzipiert worden, das bedeutet, dass die
+Installation auf einem modernen UNIX-aehnlichen System kein Problem dar-
+stellen sollte. Das System muss nur von GNU automake und GNU autoconf
+("configure") unterstuetzt werden.
 
-* Syslog Logging (autodetected by default): 
-  --with-syslog[=<path>] / --without-syslog
+Die Standard-Installation sieht so aus:
 
-  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.
-
-* ZeroConf Support:
-  --with-zeroconf[=<path>] 
-
-  Compile ngIRCd with support for ZeroConf multicast DNS service registration.
-  Either the Apple ZeroConf implementation (e. g. Mac OS X) or the Howl
-  library is required. Which one is available is autodetected.
-
-* 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.
+   1) tar xzf ngircd-<Version>.tar.gz
+   2) cd ngircd-<Version>
+   3) ./autogen.sh	[nur erforderlich, wenn ueber CVS bezogen]
+   4) ./configure
+   5) make
+   6) make install
 
 
-IV. Useful make-targets
-~~~~~~~~~~~~~~~~~~~~~~~
+zu 3): "autogen.sh"
 
-The Makefile produced by the configure-script contains always these useful
-targets:
+Der erste Schritt, autogen.sh, ist nur notwendig, wenn das configure-Script
+noch nicht vorhanden ist. Dies ist nie bei offiziellen ("stabilen") Versionen
+in tar.gz-Archiven der Fall, jedoch immer, wenn der Source-Code ueber CVS
+bezogen wurde.
 
- - clean: delete every product from the compiler/linker
-   next step: -> make
+Dieser Absatz ist also eigentlich ausschliesslich fuer Entwickler interessant.
 
- - distclean: the above plus erase all generated Makefiles
-   next step: -> ./configure
+autogen.sh erzeugt die fuer das configure-Script notwendigen Makefile.in's
+sowie das configure-Script selber und weitere fuer den make-Lauf erforderliche
+Dateien. Dazu wird sowohl GNU automake als auch GNU autoconf (in aktuellen
+Versionen!) benoetigt.
 
- - maintainer-clean: erase all automatic generated files
-   next step: -> ./autogen.sh
+(nochmal: "Endanwender" mussen diesen Schritt i.d.R. nicht ausfuehren!)
 
 
-V. Sample configuration file ngircd.conf
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+zu 4): "./configure"
 
-In the sample configuration file, there are comments beginning with "#" OR
-";" -- this is only for the better understanding of the file.
+Mit dem configure-Script wird ngIRCd, wie GNU Software meistens, an das
+lokale System angepasst und die erforderlichen Makefile's erzeugt.
 
-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. 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" manual page.
+Im Optimalfall sollte configure alle benoetigten Libraries, Header etc. selber
+erkennen und entsprechend reagieren. Sollte dies einmal nicht der Fall sein,
+so zeigt "./configure --help" moegliche Optionen.
 
 
-VI. Command line options
-~~~~~~~~~~~~~~~~~~~~~~~~
+zu 5): "make"
 
-These parameters could be passed to the ngIRCd:
+Der make-Befehl bearbeitet die vom configure-Script erzeugten Makefile's und
+uebersetzt den ngIRCd.
+
+
+zu 6): "make install"
+
+Mit "make install" wird der Server und ggf. eine Beispiels-Konfiguration
+im System installiert; hierzu sind in der Regel root-Rechte erforderlich.
+Eine bereits vorhandene Konfigurationsdatei wird nie ueberschrieben.
+
+Folgende Dateien werden installiert:
+
+- /usr/local/sbin/ngircd: ausfuehrbarer Server
+- /usr/local/etc/ngircd.conf: Beispiel-Konfiguration, wenn nicht vorhanden
+
+
+II. Nuetzliche make-Targets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Die vom configure-Script erzeugten Makefile's enthalten immer die folgenden
+nuetzlichen Targets:
+
+ - clean: alle Erzeugnisse des Compilers/Linkers loeschen.
+   Naechster Schritt: -> make
+
+ - distclean: zusaetzliche alle Makefile's loeschen.
+   Naechster Schritt: -> ./configure
+
+ - maintainer-clean: alle automat. erzeugten Dateien loeschen.
+   Naechster Schritt: -> ./autogen.sh
+
+
+
+III. Konfigurationsdatei ngircd.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In der Konfigurationsdatei werden Kommentare durch "#" oder durch ";"
+eingeleitet. Dieses dient nur der besseren Lesbarkeit.
+
+Die Datei ist in drei Abschnitte unterteilt: [Global], [Operator] und
+[Server]. Im [Global]-Teil werden die grundlegenden Einstellungen vor-
+genommen, z.B. der Server-Name und die Ports, auf denen er Verbindungen
+annehmen soll. In [Operator]-Abschnitten werden Server-Operatoren fest-
+gelegt und unter [Server] werden die Einstellungen fuer die Verbindung
+mit anderen Servern konfiguriert.
+
+Die Bedeutung der einzelnen Variablen ist in der Beispiel-Konfiguration
+"doc/sample-ngircd.conf" erklaert, die bei "make install" auch als
+"ngircd.conf" in /usr/local/etc installiert wird, wenn dort noch keine
+Konfigurationsdatei vorhanden ist.
+
+
+IV. Kommandozeilen-Optionen
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Folgende Parameter koennen dem ngIRCd u.a. uebergeben werden:
 
 -f, --config <file>
-	The daemon uses the file <file> as configuration file rather than
-	the standard configuration /usr/local/etc/ngircd.conf.
+	Der Daemon wird angewiesen, statt der Standard-Konfigurationsdatei
+	/usr/local/etc/ngircd.conf die Datei <file> einzulesen.
 
 -n, --nodaemon
-	ngIRCd should be running as a foreground process.
+	ngIRCd soll im Fordergrund laufen; alle Meldungen werden zusaetzlich
+	zum Syslog auch auf der Konsole ausgegeben.
 
 -p, --passive
-	Server-links won't be automatically established.
+	Verbindungen zu anderen Servern (wie in der Konfigurationsdatei in
+	[Server]-Abschnitten definiert) werden nicht automatisch hergestellt.
 
--t, --configtest
-	Reads, validates and dumps the configuration file as interpreted
-	by the server. Then exits.
+--configtest
+	Die Konfigurationsdatei wird eingelesen, ueberprueft und so aus-
+	gegeben, wie sie vom ngIRCd interpretiert wurde. Danach beendet
+	sich der Server wieder.
 
-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.
+Mit dem Parameter "--help" werden alle unterstuetzten Parameter angezeigt,
+mit "--version" die Versionsnummer. Bei beiden Parametern beendet sich der
+Server nach der Ausgabe wieder.
+
+
+-- 
+$Id: INSTALL,v 1.9 2002/12/18 12:19:07 alex Exp $

MacOSX/Makefile.am

@@ -0,0 +1,21 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001,2002 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
+# 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 2002/03/12 14:37:51 alex Exp $
+#
+
+SUBDIRS = ngircd.pbproj
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+	rm -rf build
+
+# -eof-

MacOSX/ngircd.pbproj/Makefile.am

@@ -0,0 +1,20 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001,2002 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
+# 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.3 2002/03/12 14:37:51 alex Exp $
+#
+
+EXTRA_DIST = project.pbxproj
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

Makefile.am

@@ -1,48 +1,31 @@
 #
 # 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.
+# 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.10 2002/10/01 09:57:08 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = doc src man contrib
-
-clean-local:
-	rm -f build-stamp*
+SUBDIRS = doc MacOSX src man contrib
 
 maintainer-clean-local:
 	rm -rf autom4te.cache
 	rm -f Makefile.in Makefile aclocal.m4 configure
 	rm -f mkinstalldirs missing depcomp install-sh
-	rm -f config.log debian
-
-testsuite:
-	make -C src/testsuite check
+	rm -f config.log
 
 lint:
 	make -C src/ngircd lint
 
-srcdoc:
-	make -C doc srcdoc
-
-xcode:
-	@xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
-	 >/dev/null 2>&1 \
-	 || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 )
-	xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \
-	 -buildstyle Development
-
 rpm: distcheck
 	rpm -ta ngircd-*.tar.gz
 
-deb:
-	[ -f debian/rules ] || ln -s contrib/Debian debian
-	dpkg-buildpackage -rfakeroot
-
 # -eof-

NEWS

@@ -1,154 +1,15 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2008 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                                  -- NEWS --
+                           -- NEWS / Neuigkeiten --
 
 
-ngIRCd 0.12.1 (2008-07-09)
-
-  - Add option aliases -V (for --version) and -h (for --help).
-  - Make Listen parameter a comma-seperated 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 disabe 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 adress 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)
-
-  - Two new configuration options: "ChrootDir" and "MotdPhrase", thanks to
-    Benjamin Pineau <ben@zouh.org>. Now you can force the daemon to change
-    its root and working directory to something "safe". MotdPhrase is used
-    to define an "MOTD string" instead of a whole file, useful if the
-    "real" MOTD file would be outside the "jail".
-  - INVITE- and BAN-lists become synchronized between IRC+ servers when
-    establishing new connections, if the peer supports this as well.
-  - The type of service (TOS) of all sockets is set to "interactive" now.
-  - Added short command line option "-t" as alternative to "--configtest".
-  - Added optional support for "IDENT" lookups on incoming connections. You
-    have to enable this function with the ./configure switch "--with-ident".
-    The default is not to do IDENT lookups.
-
-ngIRCd 0.7.5 (2003-07-11)
-
-  - New configuration variable "MaxConnectionsIP" to limit the number of
-    simultaneous connections from a single IP that the server will accept.
-    This configuration options lowers the risk of denial of service attacks
-    (DoS), the default is 5 connections per client IP.
-  - Added new configuration variable "Listen" to bind all listening
-    sockets of the server to a single IP address.
-       
-ngIRCd 0.7.1 (2003-07-18)
-
-  - Added support for GNU/Hurd.
-
-ngIRCd 0.7.0 (2003-05-01)
-
-  - New command CONNECT to enable and add server links. The syntax is not
-    RFC-compatible: use "CONNECT <name> <port>" to enable and connect an
-    configured server and "CONNECT <name> <port> <host> <mypwd> <peerpwd>"
-    to add a new server (ngIRCd tries to connect new servers only once!).
-  - Added DISCONNECT command ("DISCONNECT <name>") to disable servers.
-  - New command TRACE (you can trace only servers at the moment).
-  - New command HELP that lists all understood commands.
-  - ngIRCd can register itself with Rendezvous: to enable support pass the
-    new switch "--with-rendezvous" to configure.
-  - 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",
-    "--with-tcp-wrappers", and "--with-rendezvous".
-  - Enhanced manual pages ngircd(8) and ngircd.conf(5).
-  - Documentation is now installed in $(datadir)/doc/ngircd.
-
-
-Older news (sorry, only available in german language):
-
 ngIRCd 0.6.0, 2002-12-24
 
   - beim Schliessen einer Verbindung zeigt der Server nun vor dem ERROR
@@ -278,4 +139,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.45.2.2 2002/12/24 13:53:54 alex Exp $

README

@@ -1,87 +1,105 @@
-
+ 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2007 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
-                                -- README --
+                           -- README / Liesmich --
+                           
+                      Ilja Osthoff, <ilja@glide.ath.cx>
 
 
-I. Introduction
-~~~~~~~~~~~~~~~
+ +-----------------------------------------------------------------------+
+ | Please note: English translations of some of the german documentation |
+ | files can be found in the directory "doc/en" -- please have a look!   |
+ +-----------------------------------------------------------------------+
 
-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!
+I. Einfuehrung
+~~~~~~~~~~~~~~
+
+ngIRCd ist ein Open-Source-Server fuer den Internet Relay Chat (IRC), der
+unter der GNU General Public License (http://www.gnu.org/licenses/gpl.html)
+entwickelt wird. ngIRCd steht fuer "next generation IRC daemon", er ist von
+Grund auf neu geschrieben, also nicht wie die meisten anderen IRCd's vom
+Urvater, dem Daemon des IRCNet abgeleitet.
 
 
 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.
+Zur Zeit befindet sich der ngIRCd noch in Entwicklung, manche Features sind
+noch nicht implementiert, andere nur teilweise.
 
-In the meantime ngIRCd should be quite feature complete and stable to be
-used in real IRC networks.
+Bisher (mehr oder wenig vollstaendig) implementierte IRC-Befehle:
 
-Implemented IRC-commands are:
-
-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, SQUIT,
-STATS, TIME, TOPIC, TRACE, USER, USERHOST, VERSION, WALLOPS, WHO, WHOIS,
-WHOWAS.
+ADMIN, AWAY, CHANINFO, CONNECT, DIE, ERROR, INVITE, ISON, JOIN, KICK, KILL,
+LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, NOTICE, OPER, PART,
+PASS, PING, PONG, PRIVMSG, QUIT, RESTART, SERVER, SQUIT, TIME, TOPIC,
+USERHOST, USER, VERSION, WHO, WHOIS.
 
 
-III. Features (or: why use ngIRCd?)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+III. Features (oder: warum gerade ngIRCd?)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- no problems with servers which have dynamic IP addresses
-- 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.
+- keine Probleme mit Servern, deren IP-Adresse dynamisch ist,
+- einfache, uebersichtliche Konfigurationsdatei,
+- frei verfuegbarer C-Quellcode.
+- ngIRCd wird aktiv weiterentwickelt.
+- unterstuetzte Plattformen (getestete Version): AIX (3.2.5), A/UX (3.0.1),
+  FreeBSD/i386 (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 mit Cygwin.
 
 
-IV. Documentation
+IV. Dokumentation
 ~~~~~~~~~~~~~~~~~
 
-More documentation can be found in the "doc/" directory and the homepage of
-the ngIRCd: <http://ngircd.barton.de/>.
+Im Paket enthalten ist u.a.:
+
+- README: das Dokument, das Du gerade liest :-)
+- INSTALL: Hinweise zur Installation des ngIRCd
+- NEWS: sagt der Name schon :-)
+- ChangeLog: die komplette History des ngIRCd
+- doc/FAQ.txt: haeufige Fragen und Antworten zum ngIRCd
+- doc/CVS.txt: Hinweise zum CVS-System
+- doc/RFC.txt: Infos ueber die RFC's
+- doc/sample-ngircd.conf: Beispiel-Konfigurationsdatei
+- doc/README-AUX.txt: Installationshinweise fuer A/UX
+- doc/README-BeOS.txt: dito fuer BeOS
+
+- doc/en/: englischsprachige Dokumentation
 
 
-V. Download
-~~~~~~~~~~~
+V. Bezugsquellen
+~~~~~~~~~~~~~~~~
 
-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.
+Die Homepage des ngIRCd ist: <http://arthur.ath.cx/~alex/ngircd>; dort
+findest du immer die neusten Informationen ueber den ngIRCd und die aktuellen
+freigegebenen ("stabilen") Releases.
 
-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/).
+Falls du dich fuer die aktuellen Entwicklungs-Versionen (die jedoch nicht
+immer "stabil" sind) interessierst, dann lese bitte den Punkt "CVS" auf der
+Homepage und die Datei "doc/CVS.txt", die die Verwendung des "Concurrent
+Versioning System" (CVS) beschreibt.
 
 
 VI. Bugs
 ~~~~~~~~
 
-If you find bugs in the ngIRCd (which might be there :-), please report
-them at the following URL:
+Wenn du im ngIRCd Bugs finden solltest (so was soll ja auch vorkommen :-),
+dann lege bitte einen Bug-Report ueber diese URL an:
 
-<http://ngircd.barton.de/#bugs>
+<http://arthur.ath.cx/~alex/ngircd/#bugs>
 
-There you can read about known bugs and limitations, too.
+Dort kannst du dich auch ueber bekannte Fehler informieren.
 
-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).
+Falls du noch Anregungen, Kritik, Patches etc. pp. zum ngIRCd hast, dann
+bitte einfach eine Mail an <alex@barton.de> oder <alex@arthur.ath.cx>
+schreiben.
+
+
+-- 
+$Id: README,v 1.14 2002/11/24 18:48:59 alex Exp $

autogen.sh

@@ -1,192 +1,16 @@
 #!/bin/sh
 #
-# ngIRCd -- The Next Generation IRC Daemon
-# 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.
-#
-# $Id: autogen.sh,v 1.15 2007/10/07 13:02:15 alex Exp $
+# $Id: autogen.sh,v 1.3 2002/03/12 14:37:51 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
-# installed versions of these tools on your system.
-#
-# The following strategy is used for each of aclocal, autoheader, automake,
-# and autoconf: first, "tool" (the regular name of the tool, e. g. "autoconf"
-# or "automake") is checked. If this fails, "tool<major><minor>" (for example
-# "automake16") and "tool-<major>.<minor>" (e. g. "autoconf-2.54") are tried
-# with <major> being 2 for tool of GNU autoconf and 1 for tools of automake;
-# <minor> is tried from 99 to 0. The first occurrence will be used.
-#
-# When you pass <configure-args> to autogen.sh it will call the generated
-# ./configure script on success and pass these parameters to it.
-#
-# You can tweak the behaviour using these environment variables:
-#
-# - ACLOCAL=<cmd>, AUTOHEADER=<cmd>, AUTOMAKE=<cmd>, AUTOCONF=<cmd>
-#   Name and optionally path to the particular tool.
-# - PREFIX=<path>
-#   Search the GNU autoconf and GNU automake tools in <path> first. If the
-#   generated ./configure script will be called, pass "--prefix=<path>" to it.
-# - EXIST=<tool>
-#   Use <tool> to test for aclocal, autoheader etc. pp. ...
-#   When not specified, either "type" or "which" is used.
-# - VERBOSE=1
-#   Output the detected names of the GNU automake and GNU autoconf tools.
-# - GO=1
-#   Call ./configure even if no arguments have been passed to autogen.sh.
-#
-# Examples:
-#
-# - ./autogen.sh
-#   Generates the ./configure script.
-# - GO=1 ./autogen.sh
-#   Generates the ./configure script and runs it as "./configure".
-# - VERBOSE=1 ./autogen.sh --with-ident
-#   Show tool names, generates the ./configure script, and runs it with
-#   these arguments: "./configure --with-ident".
-# - ACLOCAL=aclocal-1.6 GO=1 PREFIX=$HOME ./autogen.sh
-#   Uses "aclocal-1.6" as aclocal tool, generates the ./configure script,
-#   and runs it with these arguments: "./configure --prefix=$HOME".
-#
-
-Search()
-{
-	[ $# -eq 2 ] || exit 1
-
-	searchlist="$1"
-	major="$2"
-	minor=99
-
-	[ -n "$PREFIX" ] && searchlist="${PREFIX}/$1 ${PREFIX}/bin/$1 $searchlist"
-
-	for name in $searchlist; do
-		$EXIST "${name}" >/dev/null 2>&1
-		if [ $? -eq 0 ]; then
-			echo "${name}"
-			return 0
-		fi
-	done
-
-	while [ $minor -ge 0 ]; do
-		for name in $searchlist; do
-			$EXIST "${name}${major}${minor}" >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "${name}${major}${minor}"
-				return 0
-			fi
-			$EXIST "${name}-${major}.${minor}" >/dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				echo "${name}-${major}.${minor}"
-				return 0
-			fi
-		done
-		minor=`expr $minor - 1`
-	done
-	return 1
-}
-
-Notfound()
-{
-	echo "Error: $* not found!"
-	echo "Please install recent versions of GNU autoconf and GNU automake."
-	exit 1
-}
-
-# Reset locale settings to suppress warning messages of Perl
-unset LC_ALL
-unset LANG
-
-# Which command should be used to detect the automake/autoconf tools?
-[ -z "$EXIST" ] && existlist="type which" || existlist="$EXIST"
-EXIST=""
-for t in $existlist; do
-	$t /bin/ls >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		rm -f /tmp/test.$$
-		$t /tmp/test.$$ >/dev/null 2>&1
-		[ $? -ne 0 ] && EXIST="$t"
-	fi
-	[ -n "$EXIST" ] && break
-done
-if [ -z "$EXIST" ]; then
-	echo "Didn't detect a working command to test for the autoconf/automake tools!"
-	echo "Searchlist: $existlist"
-	exit 1
+if [ -f configure ]; then
+	echo "autogen.sh: configure-Skript existiert bereits ..."
 fi
-[ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."
 
-# We want to use GNU automake 1.9, if available (WANT_AUTOMAKE is used by
-# the wrapper scripts of Gentoo Linux, AUTOMAKE_VERSION is used by OpenBSD);
-# same applies for GNU autoconf, we want to use version 2.59. -- But only
-# set these preferences if not already set!
-if [ -z "$AUTOMAKE_VERSION" -a -z "$WANT_AUTOMAKE" ]; then
-	AUTOMAKE_VERSION=1.9
-	WANT_AUTOMAKE=1.9
-fi
-if [ -z "$AUTOCONF_VERSION" -a -z "$WANT_AUTOCONF" ]; then
-	AUTOCONF_VERSION=2.59
-	WANT_AUTOCONF=2.59
-fi
-export AUTOMAKE_VERSION WANT_AUTOMAKE AUTOCONF_VERSION WANT_AUTOCONF
-
-# Try to detect the needed tools when no environment variable already
-# specifies one:
-echo "Searching tools ..."
-[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
-[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
-[ -z "$AUTOHEADER" ] && AUTOHEADER=`Search autoheader 2`
-[ "$VERBOSE" = "1" ] && echo "AUTOHEADER=$AUTOHEADER"
-[ -z "$AUTOMAKE" ] && AUTOMAKE=`Search automake 1`
-[ "$VERBOSE" = "1" ] && echo "AUTOMAKE=$AUTOMAKE"
-[ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2`
-[ "$VERBOSE" = "1" ] && echo "AUTOCONF=$AUTOCONF"
-
-# Call ./configure when parameters have been passed to this script and
-# GO isn't already defined.
-[ -z "$GO" -a $# -gt 0 ] && GO=1
-
-# Verify that all tools have been found
-[ -z "$AUTOCONF" ] && Notfound autoconf
-[ -z "$AUTOHEADER" ] && Notfound autoheader
-[ -z "$AUTOMAKE" ] && Notfound automake
-[ -z "$AUTOCONF" ] && Notfound autoconf
-
-export AUTOCONF AUTOHEADER AUTOMAKE AUTOCONF
-
-# Generate files
-echo "Generating files ..."
-$ACLOCAL && \
-	$AUTOHEADER && \
-	$AUTOMAKE --add-missing && \
-	$AUTOCONF
-
-if [ $? -eq 0 -a -x ./configure ]; then
-	# Success: if we got some parameters we call ./configure and pass
-	# all of them to it.
-	if [ "$GO" = "1" ]; then
-		[ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
-		[ -n "$*" ] && a=" $*" || a=""
-		c="./configure${p}${a}"
-		echo "Calling \"$c\" ..."
-		$c
-		exit $?
-	else
-		echo "Okay, autogen.sh done; now run the \"configure\" script."
-		exit 0
-	fi
-else
-	# Failure!?
-	echo "Error! Check your installation of GNU automake and autoconf!"
-	exit 1
-fi
+aclocal && \
+ autoheader && \
+ automake --add-missing && \
+ autoconf && \
+ echo "Okay, autogen.sh war erfolgreich."
 
 # -eof-

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 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2007-01-18'
+timestamp='2002-03-04'
 
 # 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='2007-01-18'
 #
 # 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,7 +70,7 @@ 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
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -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,7 @@ 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* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -148,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -173,10 +169,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 +185,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/'`
@@ -240,52 +228,31 @@ case $basic_machine in
 	| a29k \
 	| 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 \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| 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 \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| 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 \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -296,9 +263,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
@@ -317,59 +281,38 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| 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-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -389,9 +332,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -406,12 +346,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -471,27 +405,12 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -514,10 +433,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -696,6 +611,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -708,9 +627,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
@@ -786,12 +702,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
+		os=-coff
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -815,61 +728,49 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        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
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -880,10 +781,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
@@ -904,20 +801,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -925,12 +808,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -989,7 +866,7 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
+        sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
@@ -997,6 +874,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -1009,14 +890,6 @@ case $basic_machine in
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1030,10 +903,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1055,8 +924,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1077,11 +946,11 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	xps | xps100)
+        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	ymp)
@@ -1111,9 +980,6 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1130,13 +996,16 @@ 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 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1151,6 +1020,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1206,23 +1079,18 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -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* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -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*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1234,21 +1102,16 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-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*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1261,9 +1124,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1285,9 +1145,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1298,7 +1155,7 @@ case $os in
 		os=-rtmk-nova
 		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1310,9 +1167,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1340,17 +1194,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1374,12 +1219,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
 		;;
@@ -1389,14 +1228,11 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1417,9 +1253,6 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1438,15 +1271,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1498,19 +1325,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1579,16 +1406,10 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1612,7 +1433,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

configure.in

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 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,29 +8,27 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
+# $Id: configure.in,v 1.69.2.6 2003/03/09 22:33:19 alex Exp $
+#
 
-# -- Initialisation --
+# -- Initialisierung --
 
+AC_INIT
 AC_PREREQ(2.50)
-AC_INIT(ngircd, 0.12.1)
-AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(1.6)
+AC_CONFIG_SRCDIR(src/config.h.in)
+AM_INIT_AUTOMAKE(ngircd,0.6.x-CVS)
 AM_CONFIG_HEADER(src/config.h)
 
-# -- Templates for config.h --
+# -- Templates fuer config.h --
 
 AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
 AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
 AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
 AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
-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([USE_SYSLOG], [Define if syslog should be used for logging])
+AH_TEMPLATE([USE_ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
-AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled])
-AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included])
-AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -40,7 +38,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 
 AC_PROG_CC
 
-# -- Helper programs --
+# -- Hilfsprogramme --
 
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -50,52 +48,31 @@ AC_PROG_RANLIB
 
 # -- Compiler Features --
 
+AC_LANG_C
+
 AM_C_PROTOTYPES
 AC_C_CONST
-AC_C_INLINE
 
-# -- Hard coded system and compiler dependencies/features/options ... --
+# -- Defines --
 
-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
+if test `uname` = "A/UX"; then
+	# unter A/UX sollte _POSIX_SOURCE definiert sein.
+	AC_MSG_RESULT([detected A/UX, defining _POSIX_SOURCE])
+	CFLAGS="$CFLAGS -D_POSIX_SOURCE"
 fi
 
-case "$target_os" in
-	hpux*)
-		# This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED
-		# (tested with HP/UX 11.11)
-		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
-		;;
-esac
+if test `uname` = "HP-UX"; then
+	# unter HP-UX 11.11 muss _XOPEN_SOURCE_EXTENDED definiert sein.
+	AC_MSG_RESULT([detected HP-UX, defining _XOPEN_SOURCE_EXTENDED])
+	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+fi
 
-# Add additional CFLAGS, eventually specified on the command line:
-test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
-
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
-
-# -- Headers --
+# -- Header --
 
 AC_HEADER_STDC
+
 AC_HEADER_TIME
+
 AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
@@ -103,14 +80,14 @@ AC_CHECK_HEADERS([ \
 	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 stdbool.h stddef.h varargs.h])
+AC_CHECK_HEADERS(arpa/inet.h ctype.h malloc.h stdint.h sys/select.h varargs.h)
 
-# -- Datatypes --
+# -- Datentypen --
 
 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;
@@ -121,8 +98,8 @@ AC_TRY_COMPILE([
 ])
 
 AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
 
+AC_TYPE_SIZE_T
 
 # -- Libraries --
 
@@ -130,292 +107,56 @@ AC_CHECK_LIB(UTIL,memmove)
 AC_CHECK_LIB(socket,bind)
 AC_CHECK_LIB(nsl,gethostent)
 
-# -- Functions --
+# -- Funktionen --
+
+AC_FUNC_MALLOC
 
 AC_FUNC_FORK
+
 AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
-	bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
-	memset realloc setsid setsockopt socket strcasecmp strchr strcspn strerror \
-	strstr waitpid],,AC_MSG_ERROR([required function missing!]))
+	bind gethostbyaddr gethostbyname gethostname inet_ntoa memmove \
+	memset select setsockopt socket strcasecmp strchr strerror \
+	strstr waitpid \
+	],,AC_MSG_ERROR([required function missing!]))
 
-AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat)
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf)
 
-# -- Configuration options --
-
-# use syslog?
+# -- Konfigurationsoptionen --
 
 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
-			AC_CHECK_LIB(be, syslog)
-			AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
-				AC_MSG_ERROR([Can't enable syslog!])
+AC_ARG_ENABLE(syslog,
+	[  --disable-syslog        disable syslog (autodetected by default)],
+	[	if test "$enableval" = "yes"; then
+			AC_CHECK_HEADER(syslog.h, x_syslog_on=yes,
+				AC_MSG_ERROR([Can't enable syslog: syslog.h not found!])
 			)
 		fi
 	],
-	[
-		AC_CHECK_LIB(be, syslog)
-		AC_CHECK_FUNCS(syslog, x_syslog_on=yes)
-	]
+	[	AC_CHECK_HEADER(syslog.h, x_syslog_on=yes) ]
 )
 if test "$x_syslog_on" = "yes"; then
-	AC_DEFINE(SYSLOG, 1)
-	AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
+	AC_DEFINE(USE_SYSLOG, 1)
+	AC_CHECK_LIB(be,syslog)
 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
-			AC_CHECK_LIB(z, deflate)
-			AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
-				AC_MSG_ERROR([Can't enable zlib!])
+AC_ARG_ENABLE(zlib,
+	[  --disable-zlib          disable zlib compression (autodetected by default)],
+	[	if test "$enableval" = "yes"; then
+			AC_CHECK_HEADER(zlib.h, x_zlib_on=yes,
+				AC_MSG_ERROR([Can't enable zlib: zlib.h not found!])
 			)
 		fi
 	],
-	[	AC_CHECK_LIB(z, deflate)
-		AC_CHECK_FUNCS(deflate, x_zlib_on=yes)
-	]
+	[	AC_CHECK_HEADER(zlib.h, x_zlib_on=yes) ]
 )
 if test "$x_zlib_on" = "yes"; then
-	AC_DEFINE(ZLIB, 1)
-	AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
+	AC_DEFINE(USE_ZLIB, 1)
+	AC_CHECK_LIB(z,deflate)
 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 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
-			AC_MSG_CHECKING(for hosts_access)
-			LIBS="-lwrap $LIBS"
-			AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity = 0;
-int deny_severity = 0;
-				],[
-				tcpd_warn("link test");
-				],[
-				AC_MSG_RESULT(yes)
-				AC_DEFINE(TCPWRAP, 1)
-				x_tcpwrap_on=yes
-				],[
-				AC_MSG_RESULT(no)
-				AC_MSG_ERROR([Can't enable TCP wrappers!])
-			])
-		fi
-	]
-)
-
-# include support for "zeroconf"?
-
-x_zeroconf_on=no
-AC_ARG_WITH(zeroconf,
-	[  --with-zeroconf         enable support for "Zeroconf"],
-	[	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(DNSServiceRegistrationCreate, x_zeroconf_on=osx,
-			[
-				AC_CHECK_LIB(pthread, pthread_mutexattr_init)
-				AC_CHECK_LIB(howl, sw_discovery_init)
-				AC_CHECK_FUNCS(sw_discovery_init, \
-				 x_zeroconf_on=howl, \
-				 AC_MSG_ERROR([Can't enable Zeroconf!]))
-			])
-		fi
-	]
-)
-if test "$x_zeroconf_on" = "osx"; then
-	AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
-	 mach/port.h],,AC_MSG_ERROR([required C header missing!]))
-	AC_DEFINE(ZEROCONF, 1)
-fi
-if test "$x_zeroconf_on" = "howl"; then
-	for dir in /usr/local/include /usr/local/include/howl* \
-	 /usr/include /usr/include/howl* \
-	 /usr/local/include/avahi* /usr/include/avahi*; do
-	 	test -d "$dir" || continue
-		AC_MSG_CHECKING([for Howl headers in $dir])
-		if test -f "$dir/rendezvous/rendezvous.h"; then
-			if test "$dir" != "/usr/local/include" -a \
-			 "$dir" != "/usr/include"; then
-				CFLAGS="-I$dir $CFLAGS"
-				CPPFLAGS="-I$dir $CPPFLAGS"
-			fi
-			AC_MSG_RESULT(yes)
-			break
-		else
-			AC_MSG_RESULT(no)
-		fi
-	done
-	AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \
-	 AC_MSG_ERROR([required C header missing!]))
-	AC_DEFINE(ZEROCONF, 1)
-fi
-
-# do IDENT requests using libident?
-
-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
-			AC_CHECK_LIB(ident, ident_id)
-			AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
-				AC_MSG_ERROR([Can't enable IDENT support!])
-			)
-		fi
-	]
-)
-if test "$x_identauth_on" = "yes"; then
-	AC_DEFINE(IDENTAUTH, 1)
-	AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
-fi
-
-# compile in IRC+ protocol support?
-
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
 	[  --disable-ircplus       disable IRC+ protocol],
@@ -425,22 +166,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
-	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)],
 	if test "$enableval" = "yes"; then
@@ -449,20 +174,14 @@ 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
 )
 if test "$x_debug_on" = "yes"; then
 	AC_DEFINE(DEBUG, 1)
-	test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
 fi
 
-# enable "strict RFC rules"?
-
-x_strict_rfc_on=no
 AC_ARG_ENABLE(strict-rfc,
 	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
 	if test "$enableval" = "yes"; then
@@ -471,47 +190,41 @@ AC_ARG_ENABLE(strict-rfc,
 	fi
 )
 
-# -- Definitions --
+
+# -- Definitionen --
 
 AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu" )
 AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor" )
 AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" )
 
-# Add additional CFLAGS, eventually specified on the command line, but after
-# running this configure script. Useful for "-Werror" for example.
-test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
+# -- Variablen --
 
-# -- Generate files --
+if test "$GCC" = "yes"; then
+	CFLAGS="-Wall $CFLAGS"
+fi
+
+the_CFLAGS="$CFLAGS"
+
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+
+# -- Ausgabe der Dateien --
 
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
-	doc/src/Makefile \
+	doc/en/Makefile \
+	MacOSX/Makefile \
+	MacOSX/ngircd.pbproj/Makefile \
 	src/Makefile \
 	src/portab/Makefile \
-	src/ipaddr/Makefile \
-	src/tool/Makefile \
 	src/ngircd/Makefile \
 	src/testsuite/Makefile \
 	man/Makefile \
 	contrib/Makefile \
-	contrib/Debian/Makefile \
-	contrib/MacOSX/Makefile \
-	contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
 ])
 
-type dpkg >/dev/null 2>&1
-if test $? -eq 0; then
-	# Generate debian/ link if the dpkg command exists
-	# (read: if we are running on a debian compatible system)
-	echo "creating Debian-specific links ..."
-	test -f debian/rules || ln -s contrib/Debian debian
-fi
+# -- Ergebnis --
 
-# -- Result --
-
-echo
-echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:"
 echo
 
 # Someone please show me a better way :)  [borrowed by OpenSSH]
@@ -519,75 +232,26 @@ 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 ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
 
-echo "             Target: ${target}"
-test "$target" != "$host" && echo "               Host: ${host}"
-echo "           Compiler: ${CC}"
-test -n "$CFLAGS"	&& echo "     Compiler flags: ${CFLAGS}"
-test -n "$CPPFLAGS"	&& echo " Preprocessor flags: ${CPPFLAGS}"
-test -n "$LDFLAGS"	&& echo "       Linker flags: ${LDFLAGS}"
-test -n "$LIBS"		&& echo "          Libraries: ${LIBS}"
+echo "                host: ${host}"
+echo "            compiler: ${CC}"
+echo "      compiler flags: ${the_CFLAGS}"
+echo "  preprocessor flags: ${CPPFLAGS}"
+echo "        linker flags: ${LDFLAGS}"
+echo "           libraries: ${LIBS}"
 echo
-echo "    'ngircd' binary: $S"
-echo " Configuration file: $C"
-echo "       Manual pages: $M"
-echo "      Documentation: $D"
+echo "     'ngircd' binary: $S"
+echo "  configuration file: $C"
+echo "        manual pages: $M"
 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 "  Enable debug code: $ECHO_C"
-test "$x_debug_on" = "yes" \
-	&& echo "yes" \
-	|| echo "no"
-
-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 "        IRC sniffer: $ECHO_C"
-test "$x_sniffer_on" = "yes" \
-	&& echo "yes" \
-	|| echo "no"
-
-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 "    Strict RFC mode: $ECHO_C"
-test "$x_strict_rfc_on" = "yes" \
-	&& echo "yes" \
-	|| echo "no"
-
-echo $ECHO_N "   Zeroconf support: $ECHO_C"
-case "$x_zeroconf_on" in
-	osx)
-		echo $ECHO_N "Apple $ECHO_C"
-		;;
-	howl)
-		echo $ECHO_N "Howl  $ECHO_C"
-		;;
-	*)
-		echo $ECHO_N "no    $ECHO_C"
-		;;
-esac
-echo $ECHO_N "      IRC+ protocol: $ECHO_C"
-test "$x_ircplus_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 "        I/O backend: $ECHO_C"
-	echo "\"$x_io_backend\""
-
-echo $ECHO_N "      IPv6 protocol: $ECHO_C"
-echo "$x_ipv6_on"
-echo
+echo $ECHO_N "      active options: $ECHO_C"
+test "$x_syslog_on" = "yes"	&& echo $ECHO_N "Syslog $ECHO_C"
+test "$x_zlib_on" = "yes"	&& echo $ECHO_N "zLib $ECHO_C"
+test "$x_debug_on" = "yes"	&& echo $ECHO_N "Debug $ECHO_C"
+test "$x_sniffer_on" = "yes"	&& echo $ECHO_N "Sniffer $ECHO_C"
+test "$x_strict_rfc_on" = "yes"	&& echo $ECHO_N "Strict-RFC $ECHO_C"
+test "$x_ircplus_on" = "yes"	&& echo $ECHO_N "IRC+ $ECHO_C"
+echo; echo
 
 # -eof-

contrib/Debian/Makefile.am

@@ -1,28 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# 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: Makefile.am,v 1.4 2004/05/11 00:32:31 alex Exp $
-#
-
-EXTRA_DIST = rules changelog compat control copyright \
-	ngircd.init ngircd.postinst
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-clean-local:
-	rm -f ngircd.postinst.debhelper ngircd.postrm.debhelper \
-	 ngircd.prerm.debhelper ngircd.substvars
-	rm -f ngircd-full.postinst.debhelper ngircd-full.postrm.debhelper \
-	 ngircd-full.prerm.debhelper ngircd-full.substvars
-	rm -rf ngircd ngircd-full
-	rm -f files
-
-# -eof-

contrib/Debian/changelog

@@ -1,254 +0,0 @@
-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.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  3 Feb 2005 10:41:55 +0100
-
-ngircd (0.8.2-0ab1) unstable; urgency=high
-
-  * New "upstream release", including security fixes.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Wed, 26 Jan 2005 23:14:12 +0100
-
-ngircd (0.8.1-0ab1) unstable; urgency=low
-
-  * New "upstream release".
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 25 Dec 2004 01:18:32 +0100
-
-ngircd (0.8.0-0ab2) unstable; urgency=low
-
-  * Added missing commas to debian control file, fixes bug #56.
-    Thanks to Kevin Otte.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Thu, 15 Jul 2004 10:53:39 +0200
-
-ngircd (0.8.0-0ab1) unstable; urgency=low
-
-  * New upstream version.
-
- -- 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
-    become synchronized between IRC+ servers when establishing new
-    connections, if the peer supports this as well."
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Mon, 26 Apr 2004 01:53:15 +0200
-
-ngircd (0.7.7+HEAD-0ab4) unstable; urgency=low
-
-  * This version includes fixes for INVITE command and the handling of the
-    invite and ban lists from CVS-HEAD.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  9 Apr 2004 23:55:13 +0200
-
-ngircd (0.7.7+HEAD-0ab3) unstable; urgency=low
-
-  * Included MODE fix from CVS-HEAD branch.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Mon,  5 Apr 2004 13:09:24 +0200
-
-ngircd (0.7.7+HEAD-0ab2) unstable; urgency=low
-
-  * Incorporated more fixes and enhancements of CVS-HEAD version,
-    e. g. better connection logging and fixed TRACE command.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 28 Feb 2004 03:20:32 +0100
-
-ngircd (0.7.7+HEAD-0ab1) unstable; urgency=low
-
-  * New upstream version. This debian package includes all features of
-    ngIRCd 0.7.7 and changes of the CVS-HEAD development tree.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  5 Feb 2004 15:23:22 +0100
-
-ngircd (0.7.6+HEAD-0ab2) unstable; urgency=low
-
-  * Included new fixes and additions from the CVS-HEAD upstream branch,
-    e. g. the setting of type of service (TOS) on sockets.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Mon, 26 Jan 2004 04:05:41 +0100
-
-ngircd (0.7.6+HEAD-0ab1) unstable; urgency=low
-
-  * Included all changes from the CVS-HEAD upstream version.
-  * Restructured debian packaging system: now there are two packages, a
-    "standard" version that includes all the default options and a "full"
-    version that additionally includes support for TCP wrappers and IDENT
-    lookups.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  1 Jan 2004 23:12:11 +0100
-
-ngircd (0.7.6-0ab1) unstable; urgency=medium
-
-  * New upstream version.
-  * Changed version numvering scheme of debian package.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  5 Dec 2003 14:26:41 +0100
-
-ngircd (0.7.5-0.2ab) unstable; urgency=low
-
-  * Updated RPM and Debian package description and configuration.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 29 Nov 2003 21:24:32 +0100
-
-ngircd (0.7.5-0.1ab) unstable; urgency=low
-
-  * New upstream version.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Fri,  7 Nov 2003 21:59:58 +0100
-
-ngircd (0.7.1-0.1ab) unstable; urgency=low
-
-  * New upstream version :-)
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Fri, 18 Jul 2003 22:53:02 +0200
-
-ngircd (0.7.0-0.7ab) unstable; urgency=low
-
-  * Fixed up post installation script (added interpreter, fixed chmod call).
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sun, 13 Jul 2003 00:52:38 +0200
-
-ngircd (0.7.0-0.6ab) unstable; urgency=low
-
-  * Added /etc/default/ngircd.
-  * Included own post installation script.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 12 Jul 2003 20:31:09 +0200
-
-ngircd (0.7.0-0.5ab) unstable; urgency=low
-
-  * Enhanced init script.
-  * Included NJOIN fix from actual CVS "HEAD" branch.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Wed,  9 Jul 2003 22:40:49 +0200
-
-ngircd (0.7.0-0.4ab) unstable; urgency=low
-
-  * Reverted use of dh_installexamples.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Thu, 22 May 2003 00:15:03 +0200
-
-ngircd (0.7.0-0.3ab) unstable; urgency=low
-
-  * Removed "debian/docs" and "debian/conffiles"; debhelper takes care of
-    this for us automagically.
-  * Excluded "etc/ngircd.conf" from dh_fixperms.
-
- -- Alexander Barton <alex@Arthur.Ath.CX>  Wed, 21 May 2003 23:25:05 +0200
-
-ngircd (0.7.0-0.2ab) unstable; urgency=low
-
-  * Fixed wrong variable substitution in init script.
-  * Added some CVS "Id-Tags" (but not checked in, yet).
-  * Removed own "Provides:" from control file.
-
- -- Alexander Barton <alex@barton.de>  Wed, 21 May 2003 12:32:34 +0200
-
-ngircd (0.7.0-0.1ab) unstable; urgency=low
-
-  * Initial Release.
-
- -- Alexander Barton <alex@barton.de>  Wed, 21 May 2003 02:36:52 +0200

contrib/Debian/compat

@@ -1 +0,0 @@
-4

contrib/Debian/control

@@ -1,49 +0,0 @@
-Source: ngircd
-Section: net
-Priority: optional
-Maintainer: Alexander Barton <alex@barton.de>
-Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap-dev, libident-dev
-Standards-Version: 3.7.2.1
-
-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.
- .
- 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
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ircd
-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.
- .
- 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.
-  - 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.

contrib/Debian/copyright

@@ -1,13 +0,0 @@
-This package was debianized by Alexander Barton <alex@barton.de> on
-Tue, 20 May 2003 15:47:40 +0200.
-
-It was downloaded from ftp://Arthur.Ath.CX/pub/Users/alex/ngircd/
-
-Upstream Author: Alexander Barton <alex@barton.de>
-
-This software is copyright (c) 1999-2003 by Alexander Barton.
-
-You are free to distribute this software under the terms of the
-GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.

contrib/Debian/ngircd.default

@@ -1,12 +0,0 @@
-#
-# Defaults for ngIRCd start and stop script
-#
-# $Id: ngircd.default,v 1.1 2003/12/31 17:20:11 alex Exp $
-#
-
-# Parameters to pass to the ngircd daemon on startup, see ngircd(8) for
-# possible options (default: empty).
-
-PARAMS=""
-
-# -eof-

contrib/Debian/ngircd.init

@@ -1,86 +0,0 @@
-#!/bin/sh
-#
-# ngIRCd start and stop script for Debian-based systems
-#
-# $Id: ngircd.init,v 1.7 2006/12/26 14:43:46 alex Exp $
-#
-
-### BEGIN INIT INFO
-# Provides:		ircd
-# Required-Start:	$local_fs
-# Required-Stop:	$local_fs
-# Should-Start:		$syslog $network
-# Should-Stop:		$syslog $network
-# Default-Start:	2 3 4 5
-# Default-Stop:		0 1 6
-# Short-Description:	Next Generation IRC Server
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/ngircd
-NAME=ngIRCd
-DESC="IRC daemon"
-PARAMS=""
-
-test -h "$0" && me=`readlink $0` || me="$0"
-BASENAME=`basename $me`
-
-test -f /etc/default/$BASENAME && . /etc/default/$BASENAME
-
-test -x $DAEMON || exit 0
-
-Check_Config()
-{
-	$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
-}
-
-Try_Start()
-{
-	[ ! -d /var/run/ircd ] || chown irc:irc /var/run/ircd
-	start-stop-daemon --start --quiet --exec $DAEMON -- $PARAMS
-	if [ $? -ne 0 ]; then
-		echo "$NAME failed!"
-		exit 1
-	fi
-	echo "$NAME."
-}
-
-case "$1" in
-  start)
-	Check_Config
-	echo -n "Starting $DESC: "
-	Try_Start
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ngircd.pid --exec $DAEMON \
-	  && echo "$NAME." \
-	  || echo "(none running)"
-	;;
-  reload|force-reload)
-	Check_Config
-	echo "Reloading $DESC configuration files."
-	start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
-	;;
-  restart)
-	Check_Config
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
-	sleep 1
-	Try_Start
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
-
-# -eof-

contrib/Debian/ngircd.postinst

@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Debian post-installation script
-# $Id: ngircd.postinst,v 1.2 2006/12/26 14:44:40 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
-
-#DEBHELPER#
-
-# -eof-

contrib/Debian/rules

@@ -1,172 +0,0 @@
-#!/usr/bin/make -f
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# 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.
-#
-# debian/rules for ngIRCd
-#
-# $Id: rules,v 1.3 2005/02/07 23:09:31 alex Exp $
-#
-# Based on the sample debian/rules that uses debhelper,
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure-ngircd: configure
-	dh_testdir
-	
-	# configure "standard" variant:
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr \
-	  --sysconfdir=/etc/ngircd \
-	  --mandir=\$${prefix}/share/man \
-	  --with-syslog --with-zlib
-
-configure-ngircd-full: configure
-	dh_testdir
-	
-	# configure "full" variant:
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr \
-	  --sysconfdir=/etc/ngircd \
-	  --mandir=\$${prefix}/share/man \
-	  --with-syslog --with-zlib --with-tcp-wrappers --with-ident
-
-build:
-	dh_clean -k
-
-build-ngircd: build-stamp-ngircd
-build-stamp-ngircd: configure-ngircd
-	dh_testdir
-	rm -f build-stamp-*
-	
-	# Add here commands to compile the "standard" package:
-	$(MAKE)
-	
-	touch build-stamp-ngircd
-
-build-ngircd-full: build-stamp-ngircd-full
-build-stamp-ngircd-full: configure-ngircd-full
-	dh_testdir
-	rm -f build-stamp-*
-	
-	# Add here commands to compile the "full" package:
-	$(MAKE)
-	
-	touch build-stamp-ngircd-full
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp*
-	rm -f $(CURDIR)/debian/ngircd-full.default
-	rm -f $(CURDIR)/debian/ngircd-full.init
-	rm -f $(CURDIR)/debian/ngircd-full.postinst
-	
-	# Add here commands to clean up after the build process:
-	-$(MAKE) clean
-	
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	dh_clean
-
-install: install-ngircd install-ngircd-full
-
-install-ngircd: build-ngircd
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	
-	# Add here commands to install the "standard" package into debian/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
-	dh_testroot
-	dh_installdirs
-	
-	# Add here commands to install the "full" package into debian/ngircd-full:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full
-	rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL*
-	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
-
-# Build architecture-independent files here.
-binary-indep:
-	# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	ln -s $(CURDIR)/debian/ngircd.default \
-	 $(CURDIR)/debian/ngircd-full.default
-	ln -s $(CURDIR)/debian/ngircd.init \
-	 $(CURDIR)/debian/ngircd-full.init
-	ln -s $(CURDIR)/debian/ngircd.postinst \
-	 $(CURDIR)/debian/ngircd-full.postinst
-	
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a -A ChangeLog
-	dh_installdocs -a
-	dh_installinit -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install 
-
-# -eof-

contrib/MacOSX/.gitignore

@@ -1 +0,0 @@
-build

contrib/MacOSX/Makefile.am

@@ -1,51 +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.
-#
-# $Id: Makefile.am,v 1.3 2008/02/17 15:31:15 alex Exp $
-#
-
-SUBDIRS = ngIRCd.xcodeproj
-
-EXTRA_DIST = de.barton.ngircd.plist.tmpl config.h cvs-version.h
-
-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 -c -m 644 -b -o root -g wheel de.barton.ngircd.plist /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
-
-clean-local:
-	rm -rf build
-
-maintainer-clean-local:
-	rm -f Makefile Makefile.in
-
-# -eof-

contrib/MacOSX/config.h

@@ -1,92 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 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: config.h,v 1.1 2007/11/19 22:11:36 alex Exp $
- *
- * Static configuration file for Mac OS X Xcode project
- */
-
-#define PACKAGE_NAME "ngircd"
-#define VERSION "??"
-#define SYSCONFDIR "/etc/ngircd"
-
-/* -- 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 support for Zeroconf should be included */
-/*#define ZEROCONF 1*/
-
-/* Define if zlib compression should be enabled */
-#define ZLIB 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 `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 if socklen_t exists */
-#define HAVE_socklen_t 1
-
-#ifdef ZEROCONF
-/* Define to 1 if you have the <DNSServiceDiscovery/DNSServiceDiscovery.h> header file. */
-#define HAVE_DNSSERVICEDISCOVERY_DNSSERVICEDISCOVERY_H 1
-/* Define to 1 if you have the `DNSServiceRegistrationCreate' function. */
-#define HAVE_DNSSERVICEREGISTRATIONCREATE 1
-#endif
-
-/* -eof- */

contrib/MacOSX/de.barton.ngircd.plist.tmpl

@@ -1,19 +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/>
-</dict>
-</plist>

contrib/MacOSX/ngIRCd.xcodeproj/.gitignore

@@ -1,2 +0,0 @@
-*.mode1v3
-*.pbxuser

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-

contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj

@@ -1,697 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 44;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		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 */; };
-		FA322D4C0CEF74B1001761B3 /* rendezvous.c in Sources */ = {isa = PBXBuildFile; fileRef = FA322D0A0CEF74B1001761B3 /* rendezvous.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 */; };
-		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>"; };
-		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>"; };
-		FA322D0A0CEF74B1001761B3 /* rendezvous.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = rendezvous.c; sourceTree = "<group>"; };
-		FA322D0B0CEF74B1001761B3 /* rendezvous.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = rendezvous.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>"; };
-		FA322D240CEF74B1001761B3 /* ngircd-test.conf */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "ngircd-test.conf"; 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>"; };
-		FA322DA10CEF752C001761B3 /* sample-ngircd.conf */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "sample-ngircd.conf"; 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>"; };
-		FA322DAA0CEF752C001761B3 /* Zeroconf.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Zeroconf.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>"; };
-		FA322DBB0CEF773C001761B3 /* cvs-version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "cvs-version.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>"; };
-		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 */,
-			);
-			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 */,
-			);
-			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 = (
-				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 */,
-				FA322D080CEF74B1001761B3 /* parse.c */,
-				FA322D090CEF74B1001761B3 /* parse.h */,
-				FA322D0A0CEF74B1001761B3 /* rendezvous.c */,
-				FA322D0B0CEF74B1001761B3 /* rendezvous.h */,
-				FA322D0C0CEF74B1001761B3 /* resolve.c */,
-				FA322D0D0CEF74B1001761B3 /* resolve.h */,
-			);
-			path = ngircd;
-			sourceTree = "<group>";
-		};
-		FA322D0E0CEF74B1001761B3 /* portab */ = {
-			isa = PBXGroup;
-			children = (
-				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 = (
-				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 */,
-				FA322D240CEF74B1001761B3 /* ngircd-test.conf */,
-				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 = (
-				FA322D750CEF7523001761B3 /* build */,
-				FA322D8D0CEF7523001761B3 /* Makefile.am */,
-				FA322D8E0CEF7523001761B3 /* ngIRCd.xcodeproj */,
-				FA322DB10CEF7565001761B3 /* config.h */,
-				FA322DBB0CEF773C001761B3 /* cvs-version.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 = (
-				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 */,
-				FA322DA10CEF752C001761B3 /* sample-ngircd.conf */,
-				FA322DA20CEF752C001761B3 /* src */,
-				FA322DA90CEF752C001761B3 /* SSL.txt */,
-				FA322DAA0CEF752C001761B3 /* Zeroconf.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>";
-		};
-/* 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";
-			hasScannedForEncodings = 1;
-			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 */,
-				FA322D4C0CEF74B1001761B3 /* rendezvous.c in Sources */,
-				FA322D4D0CEF74B1001761B3 /* resolve.c in Sources */,
-				FA322DBE0CEF7766001761B3 /* tool.c in Sources */,
-				FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */,
-				FA407F2E0DB159F400271AF1 /* ng_ipaddr.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 = (
-					ppc,
-					i386,
-				);
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
-			};
-			name = Default;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "ngIRCd" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB928708733DD80010E9CD /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB928B08733DD80010E9CD /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}

contrib/Makefile.am

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+# Copyright (c)2001,2002 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,12 +9,10 @@
 # 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 $
+# $Id: Makefile.am,v 1.1 2002/10/01 09:57:08 alex Exp $
 #
 
-SUBDIRS = Debian MacOSX
-
-EXTRA_DIST = README ngircd.spec systrace.policy
+EXTRA_DIST = ngircd.spec
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in

contrib/README

@@ -1,33 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (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.
-
-                            -- 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.
-
-ngindent
- - Script to indent the code of ngIRCd in the "standard way".
-
-ngircd.sh
- - Start script for FreeBSD.
-
-ngircd.spec
- - RPM "spec" file.
-
-systrace.policy
- - Systrace policy file for OpenBSD (and probably NetBSD).
-
-
---
-$Id: README,v 1.3 2006/07/23 11:34:32 alex Exp $

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-

contrib/ngircd.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-

contrib/ngircd.spec

@@ -1,9 +1,9 @@
 %define name    ngircd
-%define version 0.12.1
+%define version 0.6.1
 %define release 1
 %define prefix  %{_prefix}
 
-Summary:      A lightweight daemon for the Internet Relay Chat (IRC)
+Summary:      Next Generation Internet Relay Chat Daemon
 Name:         %{name}
 Version:      %{version}
 Release:      %{release}
@@ -15,18 +15,17 @@ 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),
+ngIRCd is a free open source daemon for Internet Relay Chat (IRC),
 developed under the GNU General Public License (GPL). It's written from
 scratch and is not based upon the original IRCd like many others.
 
-Advantages:
- - 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.
+Why should you use ngIRCd? Because ...
 
-ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
-mixed networks.
+   * ... there are no problems with servers on changing or non-static IP
+         addresses.
+   * ... there is a small and lean configuration file.
+   * ... there is a free, modern and open source C source code.
+   * ... it is still under active development. 
 
 %prep
 %setup

contrib/systrace.policy

@@ -1,77 +0,0 @@
-#
-# Sample systrace policy for ngIRCd on OpenBSD
-# Author: Benjamin Pineau <ben@zouh.org>
-#
-# $Id: systrace.policy,v 1.1 2004/04/28 12:16:59 alex Exp $
-#
-# Tune me, put me in /etc/systrace/usr_local_bin_ngircd and start ngIRCd
-# (with root privileges) as:
-#
-#   systrace -a /usr/local/bin/ngircd
-#
-# I didn't tried this on NetBSD, but it should work as is.
-#
-# On systems with pf, it can be supplemented by strict firewall rules:
-# for a ngircd running as '$ircuser', binding on '$ircport' and accepting
-# 30 connections:
-#
-#   block out log quick proto tcp from any port $ircport to any \
-#    user != $ircuser
-#   pass in inet proto tcp from any to any port $ircport user $ircuser \
-#    keep state (max 30) flags S/SA
-#
-
-Policy: /usr/local/bin/ngircd, Emulation: native
-	native-__sysctl: permit
-	native-fsread: filename eq "/etc/malloc.conf" then permit
-	native-fsread: filename sub "/usr/share/zoneinfo/" then permit
-	native-fsread: filename eq "/usr/local/etc/ngircd.conf" then permit
-	native-fsread: filename eq "/usr/local/etc/ngircd.motd" then permit
-	native-fsread: filename eq "/etc/ngircd.conf" then permit
-	native-fsread: filename eq "/etc/ngircd.motd" then permit
-	native-fsread: filename eq "/etc/spwd.db" then deny[eperm]
-	native-fsread: filename eq "/etc/group" then permit
-	native-fsread: filename eq "/etc/resolv.conf" then permit
-	native-fsread: filename eq "/etc/localtime" then permit
-	native-fsread: filename eq "/etc/hosts" then permit
-	native-fsread: filename sub "<non-existent filename>" then deny[enoent]
-	native-socket: sockdom eq "AF_UNIX" and socktype eq "SOCK_DGRAM" then permit
-	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
-	native-bind: sockaddr match "inet-*:6667" then permit, if user != root
-	native-connect: sockaddr eq "/dev/log" then permit, if user != root
-	native-connect: sockaddr match "inet-*:53" then permit, if user != root
-	native-setsockopt: permit, if user != root
-	native-listen: permit, if user != root
-	native-accept: permit, if user != root
-	native-sendto: true then permit, if user != root
-	native-recvfrom: permit, if user != root
-	native-read: permit
-	native-pread: permit
-	native-write: permit, if user != root
-	native-mmap: permit
-	native-munmap: permit
-	native-mprotect: permit
-	native-break: permit
-	native-umask: permit
-	native-fork: permit
-	native-setsid: permit
-	native-chdir: permit
-	native-chroot: permit
-	native-setgid: gid neq "0" then permit
-	native-setuid: uid neq "0" and uname neq "root" then permit
-	native-getuid: permit
-	native-getgid: permit
-	native-gettimeofday: permit
-	native-getpid: permit
-	native-select: permit
-	native-fcntl: permit
-	native-fstat: permit
-	native-issetugid: permit
-	native-sigaction: permit
-	native-pipe: permit
-	native-sigreturn: permit
-	native-close: permit
-	native-exit: permit
-	native-fswrite: deny[eperm]
-
-# -eof-

doc/CVS.txt

@@ -0,0 +1,64 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001,2002 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
+
+                                 -- CVS.txt --
+
+
+Die Sourcen des ngIRCd werden mit dem "Concurrent Versions System" (CVS)
+verwaltet. Somit koennen ohne Probleme mehrere Leute gleichzeitig die Sourcen
+bearbeitet.
+
+
+I. Anonymer "Nur-Lesen"-Zugang
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Anonymer Zugriff auf die CVS-Repository von ngIRCd ist im "nur-lesen"-Modus
+moeglich. Dazu sind folgende Schritte noetig:
+
+Beim CVS-Server anmelden
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd login
+
+Als Benutzername wird "anonymous" mit einem leeren Passwort verwendet.
+Nun ein "Check-Out" der Quellcodes durchfuehren:
+
+ $ cvs -d:pserver:anonymous@arthur.ath.cx:/usr/local/CVS/ngircd checkout ngircd
+
+Dadurch wird im aktuellen Verzeichnis der neue Ordner "ngircd" mit allen
+Quell-Dateien des ngIRCd erzeugt.
+
+Dieses ist der "Arbeitsordner", alle CVS-Befehle werden in Zukunft aus
+diesem Ordner bzw. einem Unterordner davon ausgefuehrt.
+
+Wichtig: wenn ngIRCd "frisch" aus dem CVS compiliert werden soll, so
+existiert das configure-Script noch nicht. Dieses muss zunaechst mit dem
+Script "autogen.sh" erzeugt werden. Letzteres setzt ein installiertes GNU
+automake und GNU autoconf voraus!
+
+CVS-Tree aktualisieren:
+
+ $ cvs update
+
+Dieser Befehl aktualisiert alle Dateien im aktuellen Verzeichnis sowie allen
+Unterverzeichnissen.
+
+ $ cvs update <filename>
+
+So kann eine einzelne Datei aktualisiert werden (auch dann, wenn sie lokal
+z.B. geloescht wurde -- praktisch, um eigene "Experimente" rueckgaengig zu
+machen ;-))
+
+
+III. Schreibzugriff
+~~~~~~~~~~~~~~~~~~~
+Wer Schreibzugriff auf die CVS-Repository wuenscht, der moege sich bitte
+mit Alex Barton, <alex@barton.de> in Verbindung setzen.
+
+
+-- 
+$Id: CVS.txt,v 1.5 2002/02/15 15:15:22 alex Exp $

doc/FAQ.txt

@@ -1,79 +1,61 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                     -- FAQ: Frequently Asked Questions --
 
 
-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.
-
-Q: Is there a homepage with further information and downloads?
-A: Yes. Please visit <http://ngircd.barton.de/>.
-
-Q: Why should I use ngIRCd instead of the original one?
-A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to
-   configure, open source (GPL), under active development.
-
-
-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
-   the Makefile.in templates must be generated using GNU automake and GNU
-   autoconf. To simplify this task run the ./autogen.sh script which will
-   execute the required tools for you; then continue with executing the
-   ./configure script as usual.
-
-Q: The ./autogen.sh script complains "aclocal: command not found".
-A: GNU automake is missing on your system but required for building CVS
-   versions of ngIRCd. Install GNU automake 1.6 or later and try again.
-
-Q: The ./autogen.sh script stops with "autoheader: command not found".
-A: GNU autoconf is missing on your system but required for building CVS
-   versions of ngIRCd. Install GNU autoconf 2.52 or later and try again.
-
-Q: The ./autogen.sh script fails and the message "automake: configure.in:
-   AM_INIT_AUTOMAKE must be used" is displayed.
-A: Most probably you are using version 1.5 of GNU automake which seems to be
-   incompatible to the build system of ngIRCd. Solution: upgrade to at least
-   version 1.6 of GNU automake.
-   (If you are using Debian 3.0 "Woody" you can try to downgrade to version
-   1.4 of GNU automake shipped with this distribution; it should work, too.)
-
-
-III. Runtime
+I. Allgemein
 ~~~~~~~~~~~~
+Q: Kann der ngIRCd im Netz zusammen mit "normalen" Servern betrieben werden?
+A: Ja. ngIRCd ist zum Original kompatibel, getestet wird dies zur Zeit mit
+   der Version 2.10.3p3 des ircd.
 
-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: Gibt es eine Homepage mit Informationen und Downloads?
+A: Ja. Die URL ist <http://arthur.ath.cx/~alex/ngircd/>.
 
 
-IV. 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.
+II. Compilieren
+~~~~~~~~~~~~~~~
+Q: Ich habe die Sourcen von ngIRCd ueber CVS installiert. Nun kann ich
+   ./configure nicht ausfuehren, da es nicht existiert!?
+A: Bei Builds direkt aus dem CVS-Tree muss das configure-Script zunaechst
+   durch GNU autoconf sowie die Makefile.in's durch GNU automake generiert
+   werden. Um dies zu vereinfachen existiert das Script "./autogen.sh".
+   GNU automake und GNU autoconf werden -- im Gegensatz zu Builds aus den
+   Sourcen eines .tar.gz-Archivs -- hierbei benoetigt!
 
-Q: What should I do if I found a bug?
-A: Please file a bug report at <http://ngircd.barton.de/bugzilla/index.cgi>!
-   The author of the particular component will be notified automagically :-)
+Q: ./autogen.sh bricht mit der Meldung "autoheader: command not found" ab.
+A: GNU autoconf ist nicht installiert, wird jedoch bei Builds direkt aus
+   dem CVS-Tree benoetigt.
+
+Q: ./autogen.sh bricht mit der Meldung "autoconf: Undefined macros:
+   AC_FUNC_MALLOC" bzw. "AC_CONFIG_SRCDIR" ab.
+A: Auf dem System ist eine zu alte Version von GNU autoconf installiert.
+   Ein Update auf z.B. Version 2.52 loest dieses Problem (eine installiete
+   alte Version sollte ggf. zunaechst entfernt werden, bei RPM-Paketen z.B.
+   mit dem Befehl "rpm -e autoconf").
+
+
+III. Bugs!?
+~~~~~~~~~~~
+Q: Gibt es eine Liste der bekannten Bugs bzw. Feature-Wuensche?
+A: Ja. Es existiert ein Bug-Tracking-System fuer den ngIRCd (Bugzilla):
+   URL: <http://arthur.ath.cx/bugzilla/ngircd/>. Dort koennen Bugs ge-
+   meldet und Feature-Wunsche kundgetan werden. Bekannte Bugs koennen in
+   der Datenbank gesucht und aufgelistet werden.
+   Einen Account zum Suchen und Melden von Bugs bzw. Feature-Wuenschen
+   kannst du dir dort selber anlegen.
+
+Q: Was mache ich, wenn ich einen Bug gefunden habe?
+A: Am besten traegst du ihn in das Bug-Tracking-System des ngIRCd ein:
+   URL: <http://arthur.ath.cx/bugzilla/ngircd/>
 
 
 -- 
-$Id: FAQ.txt,v 1.12 2008/01/02 22:47:58 alex Exp $
+$Id: FAQ.txt,v 1.2 2002/02/19 20:05:02 alex Exp $

doc/GIT.txt

@@ -1,45 +0,0 @@
-                     ngIRCd - Next Generation IRC Server
-
-                                 -- 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.
-
-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>.
-

doc/Makefile.am

@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001,2002 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,34 +9,21 @@
 # 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.10 2002/09/16 10:35:06 alex Exp $
+#
 
-SUBDIRS = src
+SUBDIRS = en
 
-EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \
-	README-BeOS.txt RFC.txt SSL.txt Zeroconf.txt sample-ngircd.conf
+EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt README-AUX.txt \
+	README-BeOS.txt RFC.txt sample-ngircd.conf
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)
-
-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 $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
-	 fi
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for f in $(documents); do \
-	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
-	 done
-
-uninstall-hook:
-	rm -rf $(DESTDIR)$(docdir)
-
-srcdoc:
-	make -C src srcdoc
+	  fi
 
 # -eof-

doc/Platforms.txt

@@ -1,77 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2006 Alexander Barton
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-                              -- Platforms.txt --
-
-
-This file lists the status of all platforms on which the ngIRCd has been
-tested. Included is the date and version of the last "official" test and
-the name of the tester/maintainer.
-
-If you successfully compiled and tested ngIRCd on a platform that isn't
-listed here, please contact Alexander Barton, <alex@barton.de>, so that this
-list can be updated. Thanks for your help!
-
-
-                              the executable works ("runs") as expected --+
-                                tests run successfully ("make check") --+ |
-                                           ngIRCd compiles ("make") --+ | |
-                                                ./configure works --+ | | |
-                                                                    | | | |
-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    0.9.x-CVS  05-06-27 alex   Y Y Y Y
-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    CVSHEAD    06-08-04 alex   Y Y Y Y
-i386/unknown/freebsd5.2.1   gcc 3.3.3    0.8.0      04-05-30 alex   Y Y Y Y
-i386/unknown/freebsd6.0     gcc 3.4.4    0.10.0-p1  06-08-04 alex   Y Y Y Y (3)
-i386/unknown/freebsd6.1     gcc 3.4.4    CVSHEAD    06-05-07 fw     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/openbsd3.9     gcc 3.3.5    0.10.0-p1  06-08-30 alex   Y Y Y Y (3)
-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.3    0.8.0      04-05-30 alex   Y Y Y Y (1)
-i386/pc/linux-gnu           gcc 4.1.2    0.10.0-p1  06-08-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.4.0   gcc 3.3      0.8.0      04-05-30 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/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
-
-
-Notes
-~~~~~
-
-(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.1.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 glic's support the epoll() IO interface.
-
-(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.
-
--- 
-$Id: Platforms.txt,v 1.18 2006/10/08 14:09:16 alex Exp $

doc/Protocol.txt

@@ -1,164 +1,115 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                        (c)2001-2007 Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                               -- Protocol.txt --
 
 
-I. Compatibility
-~~~~~~~~~~~~~~~~
+I. Kompatibilitaet
+~~~~~~~~~~~~~~~~~~
 
-The ngIRCd implements the Internet Relay Chat (IRC) protocol version 2.10
-as defined in RFC ("request for comment") 1459 and 2810-2813. These (and
-probably further relevant RFCs) are listed in doc/RFC.txt.
+Der ngIRCd haelt sich an das IRC-Protokoll Version 2.10, wie es in den RFCs
+1459 und 2810-2813 beschrieben ist. Diese (und ggf. weitere fuer den ngIRCd
+relevante) RFCs sind in RFC.txt aufgefuehrt.
 
-Unfortunately, even the "original" ircd doesn't follow these specifications
-in all details. But because the ngIRCd should be a fully compatible
-replacement for this server ("ircd") it tries to emulate these differences.
+Leider verhaelt sich aber schon der "Originalserver" nicht immer genau so,
+wie es in den RFCs beschrieben ist. Da der ngIRCd aber ein Ersatz fuer
+eben diesen Server sein soll, werden diese Abweichungen in der Regel vom
+ngIRCd emuliert um die Kompatibilitaet zu wahren.
 
-If you don't like this behavior please ./configure the ngIRCd using the
-"--enable-strict-rfc" command line option. But keep in mind: not all IRC
-clients are compatible with a server configured that way, some can't even
-connect at all! Therefore this option usually isn't desired for "normal
-server operation".
+Sollte dieses Verhalten nicht erwuenscht sein, so kann mit der configure-
+Option "--enable-strict-rfc" der ngIRCd so compiliert werden, dass er sich
+strikt an die entsprechenden RFCs haelt.
+
+ACHTUNG: an einem so compilierten Server koennen sich andere Server und
+Clients, die sich nicht genau an das Protokoll halten, u.U. nicht mehr
+anmelden oder alle Funktionen nutzen! In der Regel ist diese Option daher
+nicht erwuenscht.
 
 
-II. The IRC+ Protocol
-~~~~~~~~~~~~~~~~~~~~~
+II. Das IRC+-Protokoll
+~~~~~~~~~~~~~~~~~~~~~~
 
-Starting with version 0.5.0, the ngIRCd extends the original IRC protocol
-as defined in RFC 2810-2813. This enhanced protocol is named "IRC+". It is
-backwards compatible to the "plain" IRC protocol and will only be used by
-the ngIRCd if it detects that the peer supports it as well.
+Der ngIRCd unterstuetzt als Erweiterung zum IRC-Protokoll wie es in den RFCs
+2810-2813 beschrieben ist, das IRC+-Protokoll. Dieses Protokoll ist dabei
+kompatibel zum IRC-Protokoll und wird nur verwendet, wenn der ngIRCd fest-
+stellt, dass ein connectierter Server ebenfalls dieses erweiterte Protokoll
+unterstuetzt.
 
-The "PASS" command is used to detect the protocol and peer versions see
-RFC 2813 (section 4.1.1) and below.
+Die Protokoll- und Server-Erkennung wird mit dem "PASS"-Befehl durchgefuehrt
+(vgl. RFC 2813, Sektion 4.1.1):
 
 
-II.1 Register new server link
+II.1 neuen Server-Link registrieren
 
-     Command: PASS
-  Parameters: <password> <version> <flags> [<options>]
-     Used by: servers only (with these parameters)
+     Befehl: PASS
+  Parameter: <password> <version> <flags> [<options>]
+       Fuer: mit dieser Syntax nur Server
 
-<password> is the password for this new server link as defined in the server
-configuration which is sent to the peer or received from it.
+<password> enthaelt das Passwort fur den neu aufzubauenden Server-Link,
+so wie es in der Konfigurationsdatei definiert wurde.
 
-<version> consists of two parts and is at least 4, at most 14 characters
-long: the first four bytes contain the IRC protocol version number, whereas
-the first two bytes represent the major version, the last two bytes the
-minor version (the string "0210" indicates version 2.10, e.g.).
+<version> setzt sich aus zwei Teilen zusammen und ist mindestens 4, maximal
+14 Zeichen lang: die ersten vier Bytes enthalten die Versionsnummer des
+unterstuetzten IRC-Protokolls, wobei die ersten zwei Bytes die Major-, die
+letzten beiden die Minor-Revision angeben. Der String "0210" steht also
+fuer Protokollversion 2.10.
+Die folgenden (optionalen!) 10 Bytes enthalten eine von der jeweiligen
+Implementation abhaengige Versionsnummer. Server, die das IRC+-Protokoll
+unterstuetzen, liefern hier "-IRC+".
 
-The following optional(!) 10 bytes contain an implementation-dependent
-version number. Servers supporting the IRC+ protocol as defined in this
-document provide the string "-IRC+" here.
+<flags> setzt sich ebenfalls aus zwei Bestandteilen zusammen und ist
+maximal 100 Bytes lang. Getrennt werden die beiden Teile mit dem Zeichen
+"|". Der erste Teil enthaelt den Namen der Implementation, der ngIRCd
+liefert hier z.B. "ngIRCd", der Originalserver "IRC". Anhand dieser "ID"
+kann zwischen Serverimplementationen unterschieden werden. Der zweite Teil
+(nach dem "|") ist implementationsabhaengig und wird nur ausgewertet,
+wenn die Gegenseite das IRC+-Protokoll unterstuetzt. In diesem Fall wird
+folgende Syntax erwartet: "<serverversion>[:<serverflags>]".
 
-Example for <version>: "0210-IRC+".
+<serverversion> ist hier eine ASCII-Klartext-Darstellung der Versionsnummer,
+<serverflags> zeigt die vom Server unterstuetzten Erweiterungen an (und
+kann die leere Menge sein).
 
-<flags> consists of two parts separated with the character "|" and is at
-most 100 bytes long. The first part contains the name of the implementation
-(ngIRCd sets this to "ngircd", the original ircd to "IRC", e.g.). The second
-part is implementation-dependent and should only be parsed if the peer
-supports the IRC+ protocol as well. In this case the following syntax is
-used: "<serverversion>[:<serverflags>]".
+Mit dem optionalen Parameter <options> werden Server-Optionen uebermittelt,
+wie sie in RFC 2813, Sektion 4.1.1 definiert sind.
 
-<serverversion> is an ASCII representation of the clear-text server version
-number, <serverflags> indicates the supported IRC+ protocol extensions (and
-may be empty!).
+Folgende <serverflags> sind zur Zeit definiert:
 
-The following <serverflags> are defined at the moment:
+- o: IRC-Operatoren duerfen auch dann Channel- und Channel-User-Modes
+     aendern, wenn sie kein Channel-Operator im betroffenen Channel sind.
 
-- C: The server supports the CHANINFO command.
-
-- L: INVITE- and BAN-lists should be synchronized between servers: if the
-     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.
-
-- Z: Compressed server links are supported by the server.
-
-Example for a complete <flags> string: "ngircd|0.7.5:CZ".
-
-The optional parameter <options> is used to propagate server options as
-defined in RFC 2813, section 4.1.1.
+- C: der Server unterstuetzt den CHANINFO-Befehl.     
 
 
-II.2 Enhanced Server Handshake
+II.2 Channel-Modes, persistente Channel und Topic austauschen
 
-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.
+     Befehl: CHANINFO
+  Parameter: <channel> +<modes> [[<key> <maxusers>] <topic>]
+       Fuer: Server
 
-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.
+Mit CHANINFO Informiert ein Server den anderen ueber einen Channel: dessen
+Modes, Channel-Key, User-Limit und dessen Topic. <topic> ist optional.
 
-A server implementing the enhanced server handshake (and indicating this
-using 'H' in the <serverflags>) MUST ignore all unknown numerics to it
-silently.
+Existiert auf dem Server, der das CHANINFO empfaengt, der Channel bereits,
+so uebernimmt er die Werte jeweils nur dann, wenn er selber noch keine
+Modes bzw. kein Topic definiert hat. Ansonsten wird der jeweilige Parameter
+ignoriert.
 
-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).
+Existiert der Channel noch nicht, so wird er mit den entsprechenden Angaben
+erzeugt.
 
- - 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
-
-     Command: CHANINFO
-  Parameters: <channel> +<modes> <key> <limit> [<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. <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)
-already set. It there are already values set the server ignores the
-corresponding parameter.
-
-If the channel doesn't exists at all it will be created.
-
-The parameter <key> must be ignored if a channel has no key (the parameter
-<modes> doesn't list the "k" channel mode). In this case <key> should
-contain "*" because the parameter <key> is required by the CHANINFO syntax
-and therefore can't be omitted. The parameter <limit> must be ignored when
-a channel has no user limit (the parameter <modes> doesn't list the "l"
-channel mode). In this case <limit> should be "0".
+Hat ein Channel keinen Key (in <modes> ist der Mode "k" nicht vorhanden),
+so muss der Parameter <key> ignoriert werden (da <key> vorhanden sein muss,
+sollte in diesem Fall "*" uebergeben werden). Hat er kein User-Limit (kein
+"l" in <modes>), so muss <limit> ignoriert werden (<limit> sollte hierbei
+als "0" uebergeben werden).
 
 
 -- 
-$Id: Protocol.txt,v 1.14 2007/11/21 12:16:35 alex Exp $
+$Id: Protocol.txt,v 1.5.4.1 2003/01/08 20:36:57 alex Exp $

doc/README-AUX.txt

@@ -1,67 +1,68 @@
 
-                    ngIRCd - Next Generation IRC Server
+                     ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2005 Alexander Barton,
-                   alex@barton.de, http://www.barton.de/
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
+
+                             -- README-AUX.txt --
 
 
-                           -- README-AUX.txt --
+Seit Version 0.2.2-pre gehoert Apple A/UX zu den offiziell unterstuetzten
+Plattformen. Er ist im vollen Funktionsumfang nutzbar.
+
+Ab Version 0.5.0 compiliert zudem der ngIRCd mit dem nativen A/UX-Compiler,
+d.h. GNU C wird nicht mehr zwingend vorausgesetzt.
+
+Folgende Software wird jedoch benoetigt:
+
+  - GNU sed
+    Bezugsquellen:
+    http://www.rezepte-im-web.de/appleux/sed-3.02.tar.gz
+    ftp://arthur.ath.cx/pub/AUX/Software/Tools/sed-3.02.tar.gz
+
+    A/UX beinhaltet ein /bin/sed, dieses unterstuetzt jedoch leider nicht
+    alle Funktionen, die GNU automake/autoconf nutzen.
+    Achtung: bitte bei der Installation von GNU sed sicherstellen, dass
+    immer dieses und nie das von A/UX verwendet wird (also $PATH entsprechend
+    anpassen bzw. die A/UX-Version komplett ersetzen)!
+
+  - libUTIL.a
+    Bezugsquellen:
+    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
+
+    Diese Library beinhaltet Systemfunktionen, die auf UNIXoiden Systemen
+    gaengig, unter A/UX jedoch leider nicht verfuegbar sind. Dazu gehoert
+    u.a. memmove(), strerror() und strdup().
+
+Nachdem diese Pakete entsprechend installiert sind, reicht ein ganz normales
+"./configure" und "make" aus, um den ngIRCd unter A/UX zu compilieren.
 
 
-Since version 0.2.2-pre Apple's A/UX belongs to the officially supported 
-platforms. It is not restricted in any way.
+Noch ein paar Hinweise, wenn es doch (noch) nicht klappt:
 
-Since version 0.5.0 ngIRCd's source compiles with the native A/UX c 
-compiler. GNU C isn't a must-have anymore.
+  - auf dem System muss entweder ein install vorhanden sein, welches so
+    "broken" ist, dass configure das eigene Shell-Skript waehlt, oder eben
+    eines, welches funktioniert. Leider ist mindestens ein Binary im Um-
+    lauf, welches Probleme verursacht. Das Binary aus folgenden GNU
+    fileutils funktioniert hier aber z.B.:
+    ftp://arthur.ath.cx/pub/UNIX/AUX/Software/Tools/fileutils-4.0.tar.gz
 
-The following software packages are needed:
+  - das sich im Umlauf befindende vorcompilierte Binary der alten Bash sollte
+    unbedingt ausserhalb von /bin (z.B. unter /usr/local/bin) installiert
+    werden. Ansonsten waehlt es das configure-Script als Shell aus, leider
+    funktioniert das aber nicht.
 
- - 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
+  - da die /bin/sh von A/UX recht limitiert ist, kann sie u.a. nicht zum
+    Erzeugen des "config.status"-Scripts verwendet werden.
+    Abhilfe: /bin/sh umbenennen (z.B. in "/bin/sh.AUX") und durch einen (am
+    besten symbolischen) Link auf /bin/ksh ersetzen.
+    Dieser Schritt sollte keine Probleme nach sich ziehen und ist daher immer,
+    auch unabhaengig vom ngIRCd, empfehlenswert.
 
-   A/UX comes with /bin/sed which isn't supporting all functions needed
-   by GNU automake/autoconf.
-
-   Warning: When installing GNU sed please make sure that A/UX doesn't
-   use the old one anymore which means set the $PATH or replace /bin/sed
-   at all.
-
- - 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
-
-   This library contains functions that are common on other UNIX
-   systems but not on A/UX e.g. memmove(), strerror() und strdup().
-
-
-After installation of these packages just do a "./configure" and "make" to
-compile ngIRCd on A/UX.
-
-
-A few hints in case of errors:
-
- - Either there's an 'install' on your system which is completely broken
-   (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
-
- - The precompiled binary of the old 'bash' shouldn't be installed within
-   /bin (better do this in /usr/local/bin) because 'configure' would
-   choose it as its shell which wouldn't work.
-
- - Because of limitations of /bin/sh on A/UX it can't be used to create
-   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 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.4 2002/11/11 00:59:11 alex Exp $

doc/README-BeOS.txt

@@ -1,21 +1,15 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                              -- README-BeOS.txt --
 
 
-      +-------------------------------------------------------------+
-      | This text is only available in german at the moment, sorry! |
-      | Contributors for this text or the BeOS port are welcome :-) |
-      +-------------------------------------------------------------+
-
-
 BeOS gehoert im Moment (noch?) nicht zu den offiziell unterstuetzten Plat-
 formen: der ngIRCd enthaelt zwar bereits einige Anpassungen an BeOS und
 compiliert auch, jedoch bricht er bei jedem Connect-Versuch eines Clients
@@ -50,4 +44,4 @@ mir in Verbindung setzen (alex@barton.de), ich maile gerne meine Patches zu.
 Fuer eine Aenderung im CVS ist es aber meiner Meinung nach noch zu frueh ...
 
 -- 
-$Id: README-BeOS.txt,v 1.7 2003/05/15 21:47:57 alex Exp $
+$Id: README-BeOS.txt,v 1.3 2002/05/19 13:10:26 alex Exp $

doc/RFC.txt

@@ -1,17 +1,16 @@
 
                      ngIRCd - Next Generation IRC Server
 
-                      (c)2001-2003 by Alexander Barton,
+                      (c)2001,2002 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.
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
 
                                  -- RFC.txt --
 
 
-The Internet Relay Chat (IRC) protocol is documented in these Request for
-Comments (RFC), which you can get e.g. via <http://www.faqs.org/>:
+Das IRC-Protokoll ist in diesen RFC's (Request For Comments) dokumentiert:
 
   1459	Oikarinen, J. & D. Reed, "Internet Relay Chat Protocol",
 	May 1993, [IRC].
@@ -30,4 +29,4 @@ Comments (RFC), which you can get e.g. via <http://www.faqs.org/>:
 
 
 -- 
-$Id: RFC.txt,v 1.6 2003/03/07 20:42:20 alex Exp $
+$Id: RFC.txt,v 1.4 2002/01/23 18:20:04 alex Exp $

doc/SSL.txt

@@ -1,58 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                      (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.
-
-                                 -- SSL.txt --
-
-
-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 me the following text as a
-short "how-to", thanks Stefan!
-
-
-=== snip ===
-    ! This guide applies to stunnel 4.x !
-
-    Put this in your stunnel.conf:
-
-        [ircs]
-        accept = 6667
-        connect = 6668
-
-    This makes stunnel listen for incoming connections
-    on port 6667 and forward decrypted data to port 6668.
-    We call the connection 'ircs'. Stunnel will use this
-    name when logging connection attempts via syslog.
-    You can also use the name in /etc/hosts.{allow,deny}
-    if you run tcp-wrappers.
-
-    To make sure ngircd is listening on the port where
-    the decrypted data arrives, set
-
-        Ports = 6668
-
-    in your ngircd.conf.
-
-    Start stunnel and restart ngircd.
-
-    That's it.
-    Don't forget to activate ssl support in your irc client ;)
-=== snip ===
-
-
-Probably ngIRCd will include support for SSL in the future ...
-
-
--- 
-$Id: SSL.txt,v 1.2 2004/12/27 01:11:40 alex Exp $

doc/Zeroconf.txt

@@ -1,40 +0,0 @@
-
-                     ngIRCd - Next Generation IRC Server
-
-                        (c)2001-2006 Alexander Barton
-                    alex@barton.de, http://www.barton.de/
-
-               ngIRCd is free software and published under the
-                   terms of the GNU General Public License.
-
-			      -- Zeroconf.txt --
-
-
-ngIRCd supports one aspect of Zeroconf Networking[1]: Multicast DNS (mDNS[2])
-with DNS Service Discovery (DNS-SD[3]).
-
-To use this features you can use one of two APIs:
-
-  a) Apple "Bonjour" API as used by Mac OS X,
-  b) the Howl[4] Zeroconf library or the Howl compatibility layer
-     of the newer Avahi[5] library.
-
-When calling the configure script using the "--with-zeroconf" switch the
-avalable API will be autodetected and the required additional libraries will
-be linked to the ngircd binary as required.
-
-ngIRCd then registers a DNS-SD service for each port it is listening on using
-the service type "_ircu._tcp.".
-
-
-Links:
-
- [1] http://www.zeroconf.org/
- [2] http://www.multicastdns.org/
- [3] http://www.dns-sd.org/
- [4] http://www.porchdogsoft.com/products/howl/
- [5] http://avahi.org/
-
-
--- 
-$Id: Zeroconf.txt,v 1.2 2006/08/03 14:37:29 alex Exp $

doc/en/INSTALL

@@ -0,0 +1,139 @@
+
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001,2002 by Alexander Barton,
+                    alex@barton.de, http://www.barton.de/
+
+                  ngIRCd ist freie Software und steht unter
+                       der GNU General Public License.
+
+                                -- INSTALL --
+
+                         
+
+0. Upgrade Information
+~~~~~~~~~~~~~~~~~~~~~~
+
+Differences to version 0.5.x
+
+- Starting with version 0.6.0, other servers are identified using asyncronous
+  passwords: therefore the variable "Password" in [Server]-sections has been
+  replaced by "MyPassword" and "PeerPassword".
+
+- New configuration variables, section [Global]: MaxConnections, MaxJoins
+  (see example configuration file "doc/en/sample-ngircd.conf"!).
+
+
+I. Standard-Installation
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+ngIRCd is developed for UNIX-like systems, which means, that the installation
+on a modern UNIX-like system should be no problem. The only thing is, that
+the system should be supported by GNU automake and GNU autoconf ("configure").
+
+The normal installation is like that:
+
+   1) tar xzf ngircd-<Version>.tar.gz
+   2) cd ngircd-<Version>
+   3) ./autogen.sh	[only necessary when using CVS]
+   4) ./configure
+   5) make
+   6) make install
+
+3): "autogen.sh"
+
+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-archieves, but when using the CVS system.
+
+The next is therefore only interesting for developpers.
+
+autogen.sh produces the makefile.in's, which are necessary for the configure
+script it self, and some more files for make. For this step, there must be
+GNU automake and GNU autoconf (in recent versions).
+
+(again: "end users" do not need this step!)
+
+to 4): "./configure"
+
+The configure-script is used to detect local system dependancies.
+
+In the perfect case, configure should recognize all needed libraries, header
+and so on. If this shouldn't work, "./configure --help" shows more options.
+
+to 5): "make"
+
+The make command uses the Makefiles produced by configure and compiles the
+ngIRCd daemon.
+
+to 6): "make install"
+
+Use "make install" to install the server and a sample configuration file on
+the local system. For this step, root privileges are necessary. If there is
+already an older configuration file present, it won't be overwritten.
+
+This are the files that are installed:
+
+- /usr/local/sbin/ngircd: exectable server
+- /usr/local/etc/ngircd.conf: sample configuration, if not there
+
+
+II. Useful make-targets
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The Makefile produced by the configure-script contain always these useful
+targets:
+
+ - clean: delete every product from the compiler/linker
+   next step: -> make
+
+ - distclean: plus erase all generated Makefiles
+   next step: -> ./configure
+
+ - maintainer-clean: erease all automatic generated files
+   next step: -> ./autogen.sh
+
+
+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 code.
+
+The file is seperated in three blocks: [Global], [Operator], [Server]. In
+the [Gobal] part, there is the main configuration, like the server-name
+and the ports, on which the server should be listening. In the [Operator]
+section, the server-operators are defined and [Server] is the section,
+where the server-links are configured.
+
+The meaning of the variables in the configuration file is explained in the 
+"doc/sample-ngircd.conf", which is also the sample configuration file in
+/usr/local/etc after running "make install" (if you don't already have one).
+
+
+IV. Command line options
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+These parameters could be passed to the ngIRCd:
+
+-f, --config <file>
+	The daemon uses the file <file> as configuration file rather than
+	the standard configuration /usr/local/etc/ngircd.conf.
+
+-n, --nodaemon
+	ngIRCd should be running as a foreground process.
+
+-p, --passive
+	Server-links won't be automatically established.
+
+--configtest
+	Reads, validates and dumps the configuration file as interpreted
+	by the server. Then exits.
+
+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.
+
+
+-- 
+$Id: INSTALL,v 1.3 2002/12/18 12:19:07 alex Exp $

doc/en/Makefile.am

@@ -0,0 +1,20 @@
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001,2002 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
+# 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.2 2002/11/18 14:06:29 alex Exp $
+#
+
+EXTRA_DIST = INSTALL README sample-ngircd.conf
+
+maintainer-clean-local:
+	rm -f Makefile Makefile.in
+
+# -eof-

doc/en/README

@@ -0,0 +1,101 @@
+                     ngIRCd - Next Generation IRC Server
+
+                      (c)2001,2002 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 Realy Chat (IRC), which
+is developped 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.
+
+
+
+II. Status
+~~~~~~~~~~~
+
+At present, the ngIRCd is under active development, some features are not
+implemented, some only partly.
+
+Till today (more or less complete) implemented IRC-commands:
+
+ADMIN, AWAY, CHANINFO, CONNECT, DIE, ERROR, INVITE, ISON, JOIN, KICK, KILL,
+LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, NOTICE, OPER, PART,
+PASS, PING, PONG, PRIVMSG, QUIT, RESTART, SERVER, SQUIT, TIME, TOPIC,
+USERHOST, USER, VERSION, WHO, WHOIS.
+
+
+III. Features (or: why use ngIRCd?)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- no problems with servers which have dynamic ip-adresses
+- simple, easy understandable configuration file,
+- freely published C-Sourcecode,
+- ngIRCd will be developed on in the future.
+- 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), and Windows with Cygwin.
+
+
+IV. Documentation
+~~~~~~~~~~~~~~~~~
+
+English documentation:
+
+- doc/en/README: the file that you are reading :-)
+- doc/en/INSTALL: hints for the installation of the ngIRCd
+
+German documentation:
+
+- README: readme text in german
+- INSTALL: german installation instructions
+- NEWS: what do you think? :-) 
+- Changelog: the complete history of the ngIRCd
+- doc/FAQ.txt: frequently asked questions and answers
+- doc/CVS.txt: hints for the CVS-system
+- doc/RFC.txt: information about the RFC's
+- doc/sample-ngircd.conf: sample configuration file
+- doc/README-AUX.txt: installation hints for A/UX
+- doc/README-BeOS.txt: the same for BeOS
+
+
+V. Download
+~~~~~~~~~~~
+
+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 newest developper-versions (which are not
+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
+~~~~~~~~
+
+If you find bugs in the ngIRCd (which might be there :-), please report
+them at the following URL:
+
+<http://arthur.ath.cx/~alex/ngircd/#bugs>
+
+There you can read about kown bugs, too.
+
+If you have critics, patches or something else, please feel yourself free
+to post a mail to: <alex@barton.de> or <alex@arthur.ath.cx>
+
+
+-- 
+$Id: README,v 1.7 2002/11/24 18:48:59 alex Exp $

doc/en/sample-ngircd.conf

@@ -0,0 +1,138 @@
+# $Id: sample-ngircd.conf,v 1.4 2002/12/18 12:19:07 alex Exp $
+
+#
+# This is a sample configuration for the ngIRCd, which must adept to the
+# local preferences and needs.
+#
+# Comments are started with "#" or ";".
+#
+# Author: Alexander Barton, <alex@barton.de>
+# Translation by Ilja Osthoff, <ilja@glide.ath.cx>
+#
+
+[Global]
+
+	# In the [global] section of this file, there is the place of the
+	# main server configuration. Needed is only the variable "Name",
+	# Info you can adjust, if you like to. For all the others variables,
+	# you can use the defaults, this means you can leave it by default.
+	
+	# Server name in the IRC-network
+	Name = irc.the.net
+	
+	# Info-text of the server. This will be shown i.e. by a WHOIS- or
+	# LINKS-request.
+	Info = Server Info Text
+	
+	# Information about the server and administrator in the ADMIN-request
+	;AdminInfo1 = Description
+	;AdminInfo2 = Location
+	;AdminEMail = admin@irc.server
+ 
+	# Ports, on which the server will listen. There may be more than
+	# one port, separated with ";". (Default: 6667)
+	;Ports = 6667, 6668, 66694
+	
+	# Textfile with the "message of the day" (MOTD). This will be shown
+	# on a user connection with the server.
+	;MotdFile = /usr/local/etc/ngircd.motd
+
+	# User-ID, under which the server is started (for that the server
+	# must be started with root-rights). You can use the name of the
+	# user or the numerical ID.
+	# ATTENTION: the configuration and the MOTD file must be readable
+	# by this user, otherwise RESTART won't work!
+	;ServerUID = 65534
+
+	# Group-ID, under which the server is running (for that the server
+	# must be started with root-rights). You can use the name of the
+	# group or the numerical ID.
+	;ServerGID = 65534
+
+	# After <PingTimeout> seconds, the server will send a ping after
+	# inactivity of this client.
+	;PingTimeout = 120
+
+	# If there is an answer of a client, to which the ping was sended,
+	# not after <PongTimeout> seconds, it will be disconnected.
+	;PongTimeout = 20
+
+	# The server tries every <ConnectRetry> seconds, not yet connected
+	# or not anymore connected servers to connect.
+	;ConnectRetry = 60
+
+	# Should IRC-operators be allowed to use the MODE command even if
+	# they are not(!) channel-operators?
+	;OperCanUseMode = no
+
+	# Maximum number of simultanous connection the server is allowed
+	# to accept (<=0: unlimited):
+	;MaxConnections = -1
+
+	# Maximum number of channels a user can be member of (<=0: no limit):
+	;MaxJoins = 10
+
+[Operator]
+	# In this [operator]-section, there will be the configuration of
+	# the name and password of an IRC operator. There may be more than
+	# one operator-block (for each operator one).
+	
+	# ID of the operator (may be different of the nick)
+	;Name = TheOper
+
+	# Password of the operator
+	;Password = ThePwd
+
+[Server]
+	# In this [Server] section, there is the configuration of the
+	# servers, which are allowed to connect to your own server.
+	# There may be more than one server-block.
+	# If you configured a port for the connection, then the ngIRCd
+	# tries to connect to this port. If not, it waits for the other
+	# server.
+	#
+	# Server-groups:
+	# The ngIRCd allows "server-groups": that means, that you can assign
+	# server-groups for every server, to which you want the ngIRCd to
+	# connect to. If one server of a server-group won't answer, the
+	# ngIRCd tries the next one of this group.
+	# ATTENTION: Server-groups will only work if you defined a port!
+	
+	# IRC-name of the server
+	;Name = irc2.the.net
+   
+	# Hostname of the server
+	;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 an answer of that server.
+	;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 that server (optional)
+	;Group = 123
+
+[Channel]
+	# In the [Channel] there can be defined "persistent channels". This
+	# means, that the server creates the channel and even if all users
+	# left this channel, it will persist. There may be more than one
+	# block. Signed with the mode "P", which  can be set or unset, like
+	# normal modes.
+	
+	# Name of the channel
+	;Name = #TheName
+
+	# Topic for the channel
+	;Topic = a great topic
+	
+	# Channel-modes
+	;Modes = tn
+
+# -eof-

doc/sample-ngircd.conf

@@ -1,221 +1,164 @@
-# $Id: sample-ngircd.conf,v 1.44 2008/01/07 23:02:29 alex Exp $
+# $Id: sample-ngircd.conf,v 1.17 2002/12/18 12:19:07 alex Exp $
 
 #
-# This is a sample configuration file for the ngIRCd, which must be adepted
-# to the local preferences and needs.
+# Das ist eine Beispiel-Konfiguration fuer den ngIRCd, die an die
+# jeweiligen Beduerfnisse angepasst werden kann/muss.
 #
-# Comments are started with "#" or ";".
+# Kommentare werden mit "#" oder ";" eingeleitet.
 #
-# 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.
+# +-----------------------------------------------------------------------+
+# | Please note: English translations of some of the german documentation |
+# | files can be found in the directory "doc/en" -- please have a look!   |
+# +-----------------------------------------------------------------------+
 #
-# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
-# server interprets the configuration file as expected!
+# Autor: Alexander Barton, <alex@barton.de>
+# Erweiterungen von Ilja Osthoff, <ilja@glide.ath.cx>
 #
 
 [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!
+	#
+	# Im [Global]-Abschnitt der Konfigurationsdatei wird der Server
+	# "an sich" konfiguriert. Notwendig ist nur die Variable "Name",
+	# Info ist in der Regel ebengalls anzupassen. Fuer alle uebrigen
+	# Variablen koennen oft die Defaults benutzt werden, d.h. hier
+	# muss die Variable nicht angegeben werden.
+	#
+
+	# Servername im IRC-Netz
 	Name = irc.the.net
 
-	# Info text of the server. This will be shown by WHOIS and
-	# LINKS requests for example.
+	# Info-Text des Servers. Dieser wird z.B. bei WHOIS- oder LINKS-
+	# Abfragen entsprechend mit ausgegeben.
 	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
+	
+	# Informationen ueber den Server und Administrator fuer den
+	# ADMIN-Befehl:
+	;AdminInfo1 = Beschreibung
+	;AdminInfo2 = Standort
 	;AdminEMail = admin@irc.server
- 
-	# Ports on which the server should listen. There may be more than
-	# one port, separated with ",". (Default: 6667)
+
+	# Ports, auf denen Verbindungen angenommen werden sollen. Es koennen
+	# mehrere Ports mit "," getrennt angegeben werden. (Default: 6667)
 	;Ports = 6667, 6668, 6669
 
-	# comma seperated 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:
+	# Textdatei mit der "Message of the Day" (MOTD). Diese wird aus-
+	# gegeben, wenn sich ein User mit dem Server verbindet.
 	;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, unter der der Daemon laufen soll (dazu muss der Server
+	# jedoch mit root-Rechten gestartet werden). Es kann der Name oder
+	# die numerische ID angegeben werden.
+	# ACHTUNG: Die Konfigurations- und MOTD-Datei muessen fuer diesen
+	# Benutzer lesbar sein, ansonsten schlaegt ein RESTART fehl!
+	;ServerUID = ircd
 
-	# 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, zu der der Daemon wechseln soll (hierzu muss der Server
+	# jedoch mit root-Rechten gestartet werden). Es kann der Name oder
+	# die numerische ID angegeben werden.
+	;ServerGID = daemon
 
-	# 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
-
-	# This tells ngircd to write its current process id to a file.
-	# Note that the pidfile is written AFTER chroot and switching uid,
-	# i. e. the Directory the pidfile resides in must be writeable by
-	# the ngircd user and exist in the chroot directory.
-	;PidFile = /var/run/ngircd/ngircd.pid
-
-	# After <PingTimeout> seconds of inactivity the server will send a
-	# PING to the peer to test whether it is alive or not.
+	# Nach <PingTimeout> Sekunden verschickt der Server bei Inaktivitaet
+	# von einem Client diesem ein PING.
 	;PingTimeout = 120
 
-	# If a client fails to answer a PING with a PONG within <PongTimeout>
-	# seconds, it will be disconnected by the server.
+	# Antwortet ein Client, der ein PING bekam, nicht innerhalb von
+	# <PongTimeout> Sekunden mit einem PONG, so wird er disconnectiert.
 	;PongTimeout = 20
 
-	# The server tries every <ConnectRetry> seconds to establish a link
-	# to not yet (or no longer) connected servers.
+	# Der Server versucht alle <ConnectRetry> Sekunden, noch nicht bzw.
+	# nicht mehr connectierte Server-Links aufzubauen.
 	;ConnectRetry = 60
-
-	# Should IRC Operators be allowed to use the MODE command even if
-	# they are not(!) channel-operators?
+	
+	# Sollen IRC-Operatoren immer den MODE-Befehl in Channel benutzen
+	# koennen, auch wenn sie kein(!) Channel-Operator sind?
 	;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
+	# Maximale Anzahl von gleichzeitigen Verbindungen, die dieser
+	# Server annehmen darf (<=0: unlimitiert).
+	;MaxConnections = -1
 
-	# Allow Pre-Defined Channels only (see Section [Channels])
-	;PredefChannelsOnly = no
-
-	# Don't do any DNS lookups when a client connects to the server.
-	;NoDNS = no
-
-	# try to connect to other irc servers using ipv4 and ipv6, if possible
-	;ConnectIPv6 = yes
-	;ConnectIPv4 = yes
-
-	# Maximum number of simultaneous connection 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):
+	# Maximale Anzahl von Channels, in denen ein User zeitgleich
+	# Mitglied sein kann (<=0: unlimitiert).
 	;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
-
 [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)
+	#
+	# Mit einem [Operator]-Block wird der Name und das Passwort eines
+	# IRC-Operators konfiguriert. Es darf mehrere [Operator]-Bloecke
+	# geben (fuer jeden Operator einen).
+	#
+
+	# ID des IRC-Operators (muss nicht mit dem Nick identisch sein).
 	;Name = TheOper
 
-	# Password of the IRC operator
+	# Passwort des IRC-Operators
 	;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).
+	#
+	# In [Server]-Bloecken werden Server konfiguriert, zu denen sich
+	# dieser ngIRCd verbinden soll bzw. von denen Verbindungen angekommen
+	# werden duerfen.
+	# Es koennen mehrere Server konfiguriert werden, d.h. [Server]-
+	# Bloecke koennen mehrfach vorkommen.
+	# Wenn man fuer einen Server einen Port angegeben hat, dann versucht
+	# sich der ngIRCd mit der Gegenseite zu verbinden. Hat man keinen
+	# Port konfiguriert, dann wartet der ngIRCd darauf, dass sich die
+	# Gegenseite mit ihm verbindet.
+	#
+	# Server-Gruppen:
+	# Der ngIRCd unterstuetzt "Server-Gruppen": das bedeutet, man kann
+	# jedem Server, mit dem man sich verbinden will, einer Gruppe zu-
+	# ordnen. Wenn der ngIRCd sich dann mit einem Server aus der Gruppe
+	# verbinden will und keine Antwort erhaelt, dann wird der naechste
+	# Server aus der Gruppe versucht.
+	# Achtung: Gruppen werden nur beachtet, wenn man einen Port fur
+	# die Gegenseite angegeben hat!
+	#
+
+	# IRC-Name des Servers
 	;Name = irc2.the.net
-  
-	# Internet host name or IP address of the peer (only required when
-	# this server should establish the connection).
+
+	# DNS-Hostname des Servers
 	;Host = connect-to-host.the.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, zu dem dieser Server eine Verbindung herstellen soll. Wird
+	# kein Port angegeben, so wird auf eine Verbindung der Gegenseite
+	# gewartet.
+	;Port = 6666
 
-	# 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.
+	# Eigenes Passwort fuer diese Verbindung. Dieses Passwort muss auf
+	# dem anderen Server als "PeerPassword" konfiguriert werden.
 	;MyPassword = MySecret
 
-	# Foreign password for this connection. This password has to be
-	# configured as "MyPassword" on the other server.
+	# Passwort des Peer-Servers fuer diese Verbindung. Dieses Passwort
+	# muss auf dem anderen Server als "MyPassword" konfiguriert sein.
 	;PeerPassword = PeerSecret
 
-	# Group of this server (optional)
+	# Gruppe, zu der dieser Server gehoert (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
-
-[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
+	#
+	# Mit [Channel]-Bloecken werden "persistente Channels" definiert,
+	# die nach dem Start des Servers automatisch erzeugt werden und auch
+	# dann erhalten bleiben, wenn keine User mehr im Channel sind. Es
+	# koennen mehrere solcher Bloecke hier konfiguriert werden.
+	# Gekennzeichnet werden solche Channels mit dem Mode "P", der ganz
+	# normal gesetzt und geloescht werden kann.
+	#
+
+	# Name des Channels
 	;Name = #TheName
 
-	# Topic for this channel
-	;Topic = a great topic
+	# Topic, das gesetzt werden soll
+	;Topic = Ein tolles Topic
 
-	# Initial channel modes
-	;Modes = tnk
-
-	# initial channel password (mode k)
-	;Key = Secret
-
-	# maximum users per channel (mode l)
-	;MaxUsers = 23
-
-[Channel]
-	# More [Channel] sections, if you like ...
+	# Channel-Modes
+	;Modes = tn
 
 # -eof-

doc/src/.gitignore

@@ -1 +0,0 @@
-html

doc/src/Doxyfile

@@ -1,153 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# 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
-# 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: Doxyfile,v 1.2 2005/07/23 00:48:38 alex Exp $
-#
-
-# 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
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# 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_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = 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 EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = 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
-
-#---------------------------------------------------------------------------
-# Output formats
-#---------------------------------------------------------------------------
-
-GENERATE_HTML          = YES
-
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = header.inc.html
-HTML_FOOTER            = footer.inc.html
-HTML_STYLESHEET        = ngircd-doc.css
-
-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             = CONN_MODULE __client_c__
-
-# -eof-

doc/src/Makefile.am

@@ -1,25 +0,0 @@
-#
-# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2006 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: Makefile.am,v 1.3 2006/12/28 14:04:28 alex Exp $
-#
-
-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-

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://arthur.barton.de/cgi-bin/viewcvs.cgi/ngircd/">CVS-Repository</a>,
-  <a href="http://ngircd.barton.de/bugzilla/index.cgi">Bug-Tracker</a>.
-</p>
-
-</body>
-</html>

doc/src/header.inc.html

@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-  <title>ngIRCd Source Documentation</title>
-  <link href="ngircd-doc.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-

doc/src/ngircd-doc.css

@@ -1,77 +0,0 @@
-/*
- * Cascading Style Sheet for the ngIRCd source documentation
- *
- * $Id: ngircd-doc.css,v 1.2 2005/07/22 21:23:22 alex Exp $
- */
-
-BODY {
-	background-color: white;
-	color: black;
-	margin: 30px;
-	font-family: Geneva, sans-serif;
-	font-size: 12px;
-}
-
-A:visited { color: purple; background: transparent; }
-A:link { color: navy; background: transparent; }
-A:active { color: red; background: transparent; }
-A:hover { background: #ffa; }
-
-H1, H2, H3 {
-	font-family: Verdana, sans-serif;
-	background-color: white;
-	color: #005555;
-}
-H1 { margin-bottom: 10px; }
-H2 {
-	margin-top: 20px;
-	margin-bottom: 10px;
-}
-
-P, LI, TD, TH, DT {
-	font-family: Geneva, sans-serif;
-	font-size: 12px;
-	line-height: 1.2
-}
-
-DD { margin-bottom: 1em; }
-
-UL { list-style-type: square; }
-
-HR { margin: 2em 0px; }
-
-BODY>TABLE { padding: 1em 0px; }
-
-TD.mdRow {
-	border: 1px dotted silver;
-	background-color: #fff9dd;
-}
-
-TD.md { font-weight: bold; }
-
-TD.memItemLeft { padding-top: 4px; }
-TD.memItemRight { padding-top: 4px; }
-TD.mdescRight { font-style: italic; }
-
-DIV.qindex {
-	background-color: #eee;
-	border: 1px dotted silver;
-	padding: 3px;
-	margin-bottom: 2px;
-}
-
-DIV.nav {
-	margin: 1em 0px;
-}
-
-HR.footer { margin-top: 50px; }
-
-.comment {
-	color: gray;
-	font-style: italic;
-}
-.preprocessor { color: #f90; }
-.keyword, .keywordflow, .keywordtype { color: red; }
-.stringliteral { color: green; }
-
-/* -eof- */

man/.gitignore

@@ -1,2 +0,0 @@
-ngircd.8
-ngircd.conf.5

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

man/ngircd.8

@@ -0,0 +1,52 @@
+.\"
+.\" $Id: ngircd.8,v 1.5 2002/11/18 18:49:34 alex Exp $
+.\"
+.TH ngircd 8 "September 2002" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd \- the next generation IRC daemon
+.SH SYNOPSIS
+.B ngircd [
+.I Options
+.B ]
+.SH DESCRIPTION
+.B ngircd
+is a portable IRC daemon written from scratch. It is easy to configure,
+supports server links (even with original ircds) and runs on hosts with
+changing IP addresses (such as dial-in networks). Currently supported
+platforms (tested versions) are: 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), and Windows with Cygwin.
+.SH OPTIONS
+.IP --configtest
+read, validate and display configuration; then exit.
+.IP "-f file, --config file"
+use
+.I file
+as configuration file.
+.IP "-n, --nodaemon"
+don't fork and don't detach from controlling terminal.
+.IP "-p, --passive"
+disable automatic connections to other servers.
+.IP --version
+output version information and exit.
+.IP --help
+display brief help text and exit.
+.SH FILES
+.I /usr/local/etc/ngircd.conf
+.RS
+The system wide default configuration file.
+.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-

man/ngircd.8.tmpl

@@ -1,81 +0,0 @@
-.\"
-.\" $Id: ngircd.8.tmpl,v 1.2 2007/11/15 01:03:29 fw Exp $
-.\"
-.TH ngircd 8 "May 2008" 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 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 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 AUTHOR
-Alexander Barton,
-.UR mailto:alex@barton.de
-alex@barton.de
-.UE
-.br
-Homepage:
-.UR http://ngircd.barton.de/
-http://ngircd.barton.de/
-.UE
-.SH "SEE ALSO"
-.BR ngircd.conf (5),
-.BR ircd (8)
-.\"
-.\" -eof-

man/ngircd.conf.5

@@ -0,0 +1,26 @@
+.\"
+.\" $Id: ngircd.conf.5,v 1.6 2002/09/16 11:11:21 alex Exp $
+.\"
+.TH ngircd.conf 5 "September 2002" ngircd "ngIRCd Manual"
+.SH NAME
+ngircd.conf \- configuration file of ngircd
+.SH SYNOPSIS
+.B /usr/local/etc/ngircd.conf
+.SH DESCRIPTION
+(coming soon, please have a look at the sample configuration
+file "doc/sample-ngircd.conf" -- Thank you!)
+.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)
+.BR ircd (8)
+.\"
+.\" -eof-

man/ngircd.conf.5.tmpl

@@ -1,298 +0,0 @@
-.\"
-.\" $Id: ngircd.conf.5.tmpl,v 1.7 2007/11/23 16:26:03 fw Exp $
-.\"
-.TH ngircd.conf 5 "May 2008" 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 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
-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.
-.SH "SECTION OVERVIEW"
-The file can contain blocks of four types: [Global], [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. 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.
-.PP
-There can be more than one [Operator], [Server] and [Channel] sections
-per configuration file, but only one [Global] section.
-.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, must contain at least one dot (".").
-.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
-A comma seperated list of IP address on which the server should listen.
-If unset, the defaults value is "0.0.0.0", or, if ngircd was compiled
-with IPv6 support, "::,0.0.0.0", so the server listens on all configured
-IP addresses and interfaces by default.
-.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 which can be handy if the
-daemon should run inside a chroot directory.
-.TP
-\fBServerUID\fR
-User ID under which the server should run; you can use the name of the user
-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
-\fBPidFile\fR
-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, i. e. the
-directory the pidfile resides in must be writeable by the ngIRCd user and
-exist in the chroot directory (if configured, see above).
-.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
-\fBOperServerMode\fR
-If OperCanUseMode is enabled, this may lead the compatibility problems with
-Servers that run the ircd-irc2 Software. This Option "masks" mode requests
-by non-chanops as if they were coming from the server. Default: no.
-.TP
-\fBPredefChannelsOnly\fR
-If enabled, no new channels can be created. Useful if
-you do not want to have channels other than those defined in
-the config file.
-Default: No.
-.TP
-\fBNoDNS\fR
-If enabled, ngircd will not make DNS lookups when clients connect.
-If you configure ngircd to connect to other servers, ngircd may still
-perform a DNS lookup if required.
-Default: No.
-.TP
-\fBConnectIPv4\fR
-Set this to no if you do not want ngircd to connect to other irc servers using ipv4.
-This allows use of ngircd in ipv6-only setups.
-Default: Yes.
-.TP
-\fBConnectIPv6\fR
-Set this to no if you do not want ngircd to connect to other irc servers using ipv6.
-Default: Yes.
-.TP
-\fBMaxConnections\fR
-Maximum number of simultaneous connection the server is allowed to accept
-(0: unlimited). Default: 0.
-.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.
-.TP
-\fBMaxNickLength\fR
-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!
-.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.
-.TP
-\fBMask\fR
-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
-IRC name of the remote server.
-.TP
-\fBHost\fR
-Internet host name (or IP address) of the peer.
-.TP
-\fBBind\fR
-IP address to use as source IP for the outgoing connection. Default ist
-to let the operating system decide.
-.TP
-\fBPort\fR
-Port of the remote server to which ngIRCd should connect (active).
-If no port is assigned to a configured server, the daemon only waits for
-incoming connections (passive).
-.TP
-\fBMyPassword\fR
-Own password for this connection. This password has to be configured as
-"PeerPassword" on the other server. Must not have ':' as first character.
-.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).
-.TP
-\fBPassive\fR
-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.
-.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, including channel prefix ("#").
-.TP
-\fBTopic\fR
-Topic for this channel.
-.TP
-\fBModes\fR
-Initial channel modes.
-.TP
-\fBKey\fR
-Sets initial channel key (only relevant if mode k is set).
-.TP
-\fBMaxUsers\fR
-Set maximum user limit for this channel (only relevant if mode l is set).
-.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://ngircd.barton.de/
-http://ngircd.barton.de/
-.UE
-.SH "SEE ALSO"
-.BR ngircd (8)
-.\"
-.\" -eof-

src/.gitignore

@@ -1,3 +0,0 @@
-config.h
-config.h.in
-stamp-h1

src/Makefile.am

@@ -2,16 +2,17 @@
 # ngIRCd -- The Next Generation IRC Daemon
 # 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.
+# 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.8 2008/02/26 22:04:15 fw Exp $
+# $Id: Makefile.am,v 1.4 2002/09/09 10:00:15 alex Exp $
 #
 
-SUBDIRS = portab tool ipaddr ngircd testsuite
+SUBDIRS = portab ngircd testsuite
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in config.h config.h.in stamp-h.in

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-

src/ipaddr/ng_ipaddr.c

@@ -1,167 +0,0 @@
-/*
- * Functions for AF_ agnostic ipv4/ipv6 handling.
- *
- * (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
- */
-
-#include "portab.h"
-
-#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;
-
-	/* 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);
-	assert(ret == 0);
-	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);
-	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, 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- */

src/ipaddr/ng_ipaddr.h

@@ -1,117 +0,0 @@
-/*
- * Functions for AF_ agnostic ipv4/ipv6 handling.
- *
- * (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
- */
-
-#ifndef NG_IPADDR_HDR
-#define NG_IPADDR_HDR
-#include "portab.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 sizeof(a->sin6);
-#endif
-	assert(a->sin4.sin_family == AF_INET);
-	return 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- */

src/ngircd/.gitignore

@@ -1,5 +0,0 @@
-check-help
-check-version
-cvs-version.h
-cvs-version.new
-ngircd

src/ngircd/Makefile.am

@@ -1,81 +1,74 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2003 by 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.
+# 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.51 2008/02/26 22:04:17 fw Exp $
+# $Id: Makefile.am,v 1.31.2.1 2003/01/04 10:58:15 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = ../portab/ansi2knr
 
-INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
+INCLUDES = -I$(srcdir)/../portab
 
-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-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 numeric.c parse.c rendezvous.c resolve.c
+ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.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 resolve.c tool.c
 
-ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr
+ngircd_LDFLAGS = -L../portab
 
-ngircd_LDADD = -lngportab -lngtool -lngipaddr
+ngircd_LDADD = -lngportab
 
-noinst_HEADERS = ngircd.h array.h channel.h client.h conf.h conn.h conn-func.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 parse.h rendezvous.h resolve.h \
-	defines.h messages.h
+noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.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 resolve.h tool.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-date cvs-version.h
+
+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 || cp cvs-version.new cvs-version.h
 
 TESTS = check-version check-help
 

src/ngircd/array.c

@@ -1,345 +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.
- *
- * functions to dynamically allocate arrays.
- * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- *
- */
-
-#include "array.h"
-
-static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
-
-#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 || (0 == (x)->allocated) )
-
-#define ALIGN_32U(x)            (((x)+(unsigned)31  ) & ~((unsigned)31))
-#define ALIGN_1024U(x)          (((x)+(unsigned)1023) & ~((unsigned)1023))
-#define ALIGN_4096U(x)          (((x)+(unsigned)4095) & ~((unsigned)4095))
-
-
-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;
-	size_t aligned = 0;
-	char *tmp;
-
-	assert(size > 0);
-
-	if (pos_plus1 == 0 || !safemult_sizet(size, pos_plus1, &alloc))
-		return NULL;
-
-	if (a->allocated < alloc) {
-		if (alloc < 128) {
-			aligned = ALIGN_32U(alloc);
-		} else {
-			if (alloc < 4096) {
-				aligned = ALIGN_1024U(alloc);
-			} else {
-				aligned = ALIGN_4096U(alloc);
-			}
-		}
-#ifdef DEBUG_ARRAY
-		Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned);
-#endif
-
-		assert(aligned >= alloc);
-
-		if (aligned < alloc)	/* rounding overflow */
-			return NULL;
-
-		alloc = aligned;
-#ifdef DEBUG_ARRAY
-		Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.",
-		    a->allocated, aligned);
-#endif
-
-		tmp = realloc(a->mem, alloc);
-		if (!tmp)
-			return NULL;
-
-		a->mem = tmp;
-		a->allocated = alloc;
-
-		assert(a->allocated > a->used);
-
-		memset(a->mem + a->used, 0, a->allocated - a->used);
-
-		a->used = alloc;
-	}
-	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;
-
-	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;
-
-	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_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- */

src/ngircd/array.h

@@ -1,101 +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)
- *
- * $Id: array.h,v 1.4 2005/08/30 13:36:32 fw Exp $
- */
-
-#ifndef array_h_included
-#define array_h_included
-
-#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- */

src/ngircd/channel.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: channel.h,v 1.35 2008/02/05 16:31:35 fw Exp $
+ * $Id: channel.h,v 1.26 2002/12/16 23:05:24 alex Exp $
  *
  * Channel management (header)
  */
@@ -20,25 +20,17 @@
 
 #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 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 */
+	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
@@ -46,7 +38,7 @@ typedef struct _CLIENT2CHAN
 	struct _CLIENT2CHAN *next;
 	CLIENT *client;
 	CHANNEL *channel;
-	char modes[CHANNEL_MODE_LEN];	/* User-Modes in dem Channel */
+	CHAR modes[CHANNEL_MODE_LEN];	/* User-Modes in dem Channel */
 } CL2CHAN;
 
 #else
@@ -56,38 +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, 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, char *Reason ));
+GLOBAL VOID Channel_Quit PARAMS(( CLIENT *Client, CHAR *Reason ));
 
-GLOBAL void Channel_Kick PARAMS((  CLIENT *Client, CLIENT *Origin, char *Name, 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, 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, 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 ));
@@ -98,31 +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 *Text ));
-GLOBAL bool Channel_Notice PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text));
+GLOBAL BOOLEAN Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text ));
+
+GLOBAL CHANNEL *Channel_Create PARAMS(( 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 ));
 #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));
-#endif
 /* -eof- */

src/ngircd/client.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: client.h,v 1.46 2007/01/23 16:07:19 alex Exp $
+ * $Id: client.h,v 1.32.2.1 2002/12/22 23:42:28 alex Exp $
  *
  * Client management (header)
  */
@@ -23,35 +23,36 @@
 #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_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") */
-	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
@@ -61,93 +62,78 @@ 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 ));
 
-GLOBAL CLIENT *Client_NewLocal PARAMS(( CONN_ID Idx, char *Hostname, int Type, bool Idented ));
-GLOBAL CLIENT *Client_NewRemoteServer PARAMS(( CLIENT *Introducer, char *Hostname, CLIENT *TopServer, int Hops, int Token, char *Info, bool Idented ));
-GLOBAL CLIENT *Client_NewRemoteUser PARAMS(( CLIENT *Introducer, char *Nick, int Hops, char *User, char *Hostname, int Token, char *Modes, char *Info, bool Idented ));
+GLOBAL CLIENT *Client_ThisServer PARAMS((VOID ));
 
-GLOBAL void Client_Destroy PARAMS(( CLIENT *Client, char *LogMsg, 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_Search PARAMS((CHAR *ID ));
+GLOBAL CLIENT *Client_First PARAMS((VOID ));
+GLOBAL CLIENT *Client_Next PARAMS((CLIENT *c ));
 
-GLOBAL CLIENT *Client_GetFromToken PARAMS(( CLIENT *Client, int Token ));
+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_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 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 CLIENT *Client_Search PARAMS(( char *ID ));
-GLOBAL CLIENT *Client_First PARAMS(( void ));
-GLOBAL CLIENT *Client_Next PARAMS(( CLIENT *c ));
+GLOBAL BOOLEAN Client_HasMode PARAMS((CLIENT *Client, CHAR Mode ));
 
-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_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 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 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_HasMode PARAMS(( CLIENT *Client, char Mode ));
+GLOBAL BOOLEAN Client_ModeAdd PARAMS((CLIENT *Client, CHAR Mode ));
+GLOBAL BOOLEAN Client_ModeDel PARAMS((CLIENT *Client, CHAR Mode ));
 
-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, bool 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, bool 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 BOOLEAN Client_CheckNick PARAMS((CLIENT *Client, CHAR *Nick ));
+GLOBAL BOOLEAN Client_CheckID PARAMS((CLIENT *Client, CHAR *ID ));
 
-GLOBAL bool Client_ModeAdd PARAMS(( CLIENT *Client, char Mode ));
-GLOBAL bool Client_ModeDel PARAMS(( CLIENT *Client, char Mode ));
+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_CheckNick PARAMS(( CLIENT *Client, char *Nick ));
-GLOBAL bool 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 bool Client_IsValidNick PARAMS(( const char *Nick ));
-
-GLOBAL WHOWAS *Client_GetWhowas PARAMS(( void ));
-GLOBAL int Client_GetLastWhowasIndex PARAMS(( void ));
-
-GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN Client_IsValidNick PARAMS((CHAR *Nick ));
 
 
 #endif

src/ngircd/conf.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conf.h,v 1.49 2008/03/18 20:12:47 fw Exp $
+ * $Id: conf.h,v 1.24 2002/12/14 13:36:19 alex Exp $
  *
  * Configuration management (header)
  */
@@ -20,148 +20,91 @@
 #include <time.h>
 
 #include "defines.h"
-#include "array.h"
-#include "portab.h"
-#include "tool.h"
-#include "ng_ipaddr.h"
+
 
 typedef struct _Conf_Oper
 {
-	char name[CLIENT_PASS_LEN];	/* Name (ID) of IRC operator */
-	char pwd[CLIENT_PASS_LEN];	/* Password */
-	char *mask;
+	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 peer */
-	UINT16 port;			/* Server port */
-	int group;			/* Group of server */
+	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 */
-	ng_ipaddr_t bind_addr;		/* source address to use for outgoing connections */
-	ng_ipaddr_t dst_addr[2];	/* list of addresses to connect to */
+	RES_STAT *res_stat;		/* Status of the resolver */
 } CONF_SERVER;
 
 typedef 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" ) */
-	unsigned long maxusers;		/* maximum usercount for this channel, mode "l" */
-	array topic;			/* Initial topic */
+	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 ("Nick") of the servers */
-GLOBAL char Conf_ServerName[CLIENT_ID_LEN];
+GLOBAL CHAR Conf_ServerName[CLIENT_ID_LEN];
 
 /* Server info text */
-GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerInfo[CLIENT_INFO_LEN];
 
 /* Global server passwort */
-GLOBAL char Conf_ServerPwd[CLIENT_PASS_LEN];
+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];
+GLOBAL CHAR Conf_ServerAdmin1[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdmin2[CLIENT_INFO_LEN];
+GLOBAL CHAR Conf_ServerAdminMail[CLIENT_INFO_LEN];
 
 /* File with MOTD text */
-GLOBAL char Conf_MotdFile[FNAME_LEN];
-
-/* Phrase with MOTD text */
-GLOBAL char Conf_MotdPhrase[LINE_LEN];
+GLOBAL CHAR Conf_MotdFile[FNAME_LEN];
 
 /* Ports the server should listen on */
-GLOBAL array Conf_ListenPorts;
-
-/* Address to which the socket should be bound or empty (=all) */
-GLOBAL char *Conf_ListenAddress;
+GLOBAL UINT Conf_ListenPorts[MAX_LISTEN_PORTS];
+GLOBAL INT Conf_ListenPorts_Count;
 
 /* User and group ID the server should run with */
-GLOBAL uid_t Conf_UID;
-GLOBAL gid_t Conf_GID;
-
-/* A directory to chroot() in */
-GLOBAL char Conf_Chroot[FNAME_LEN];
-
-/* File with PID of daemon */
-GLOBAL char Conf_PidFile[FNAME_LEN];
+GLOBAL UINT Conf_UID;
+GLOBAL UINT Conf_GID;
 
 /* Timeouts for PING and PONG */
-GLOBAL int Conf_PingTimeout;
-GLOBAL int Conf_PongTimeout;
+GLOBAL INT Conf_PingTimeout;
+GLOBAL INT Conf_PongTimeout;
 
 /* Seconds between connect attempts to other servers */
-GLOBAL int Conf_ConnectRetry;
+GLOBAL INT Conf_ConnectRetry;
 
 /* Operators */
 GLOBAL CONF_OPER Conf_Oper[MAX_OPERATORS];
-GLOBAL unsigned int Conf_Oper_Count;
+GLOBAL INT Conf_Oper_Count;
 
 /* Servers */
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];
+GLOBAL INT Conf_Server_Count;
 
 /* Pre-defined channels */
 GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
-GLOBAL unsigned int Conf_Channel_Count;
-/* Pre-defined channels only */
-GLOBAL bool Conf_PredefChannelsOnly;
+GLOBAL INT Conf_Channel_Count;
 
 /* Are IRC operators allowed to always use MODE? */
-GLOBAL bool Conf_OperCanMode;
-
-/* Disable all DNS functions? */
-GLOBAL bool Conf_NoDNS;
-
-/*
- * try to connect to remote systems using the ipv6 protocol,
- * if they have an ipv6 address? (default yes)
- */
-GLOBAL bool Conf_ConnectIPv6;
-
-/* same as above, but for ipv4 hosts, default: yes  */
-GLOBAL bool Conf_ConnectIPv4;
-
-/* If an IRC op gives chanop privileges without being a chanop,
- * ircd2 will ignore the command. This enables a workaround:
- * It masks the command as coming from the server */
-GLOBAL bool Conf_OperServerMode;
+GLOBAL BOOLEAN Conf_OperCanMode;
 
 /* Maximum number of connections to this server */
-GLOBAL long Conf_MaxConnections;
+GLOBAL LONG Conf_MaxConnections;
 
 /* Maximum number of channels a user can join */
-GLOBAL int Conf_MaxJoins;
+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;
-
-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(( char *Name, UINT16 Port ));
-GLOBAL bool Conf_EnablePassiveServer PARAMS((const char *Name));
-GLOBAL bool Conf_DisableServer PARAMS(( char *Name ));
-GLOBAL bool Conf_AddServer PARAMS(( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd ));
+GLOBAL VOID Conf_Init PARAMS((VOID ));
+GLOBAL INT Conf_Test PARAMS((VOID ));
 
 
 #endif

src/ngircd/conn-func.c

@@ -1,283 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * 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"
-
-static char UNUSED id[] = "$Id: conn-func.c,v 1.12 2008/03/11 14:05:27 alex Exp $";
-
-#include "imp.h"
-#include <assert.h>
-#include <string.h>
-#include "log.h"
-
-#include "conn.h"
-#include "client.h"
-
-#include "exp.h"
-#include "conn-func.h"
-
-
-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 )
-{
-	/* Idle-Time einer Verbindung liefern (in Sekunden) */
-
-	assert( Idx > NONE );
-	return time( NULL ) - My_Connections[Idx].lastprivmsg;
-} /* Conn_GetIdle */
-
-
-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
-Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
-{
-	/* 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
-} /* Conn_SetPenalty */
-
-
-GLOBAL void
-Conn_ResetPenalty( CONN_ID Idx )
-{
-	assert( Idx > NONE );
-	My_Connections[Idx].delaytime = 0;
-} /* Conn_ResetPenalty */
-
-
-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
-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 )
-{
-	/* Connection markieren */
-
-	assert( Idx > NONE );
-	My_Connections[Idx].flag = Flag;
-} /* Conn_SetFlag */
-
-
-GLOBAL CONN_ID
-Conn_First( void )
-{
-	/* Connection-Struktur der ersten Verbindung liefern;
-	 * Ist keine Verbindung vorhanden, wird NONE geliefert. */
-
-	CONN_ID i;
-	
-	for( i = 0; i < Pool_Size; i++ )
-	{
-		if( My_Connections[i].sock != NONE ) return i;
-	}
-	return NONE;
-} /* Conn_First */
-
-
-GLOBAL CONN_ID
-Conn_Next( CONN_ID Idx )
-{
-	/* Naechste Verbindungs-Struktur liefern; existiert keine
-	 * weitere, so wird NONE geliefert. */
-
-	CONN_ID i = NONE;
-
-	assert( Idx > NONE );
-	
-	for( i = Idx + 1; i < Pool_Size; i++ )
-	{
-		if( My_Connections[i].sock != NONE ) return i;
-	}
-	return NONE;
-} /* Conn_Next */
-
-
-GLOBAL UINT16
-Conn_Options( CONN_ID Idx )
-{
-	assert( Idx > NONE );
-	return My_Connections[Idx].options;
-} /* Conn_Options */
-
-
-/**
- * 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;
-
-	assert(Idx > NONE);
-
-	/* Search client structure for this link ... */
-	c = Conn_GetClient(Idx);
-	if(c != NULL)
-		return Client_StartTime(c);
-
-	return 0;
-} /* Conn_StartTime */
-
-
-GLOBAL size_t
-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);
-	else
-#endif
-	return array_bytes(&My_Connections[Idx].wbuf);
-} /* Conn_SendQ */
-
-
-GLOBAL long
-Conn_SendMsg( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Nachrichten liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].msg_out;
-} /* Conn_SendMsg */
-
-
-GLOBAL long
-Conn_SendBytes( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (unkomprimiert) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].bytes_out;
-} /* Conn_SendBytes */
-
-
-GLOBAL size_t
-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);
-	else
-#endif
-	return array_bytes(&My_Connections[Idx].rbuf);
-} /* Conn_RecvQ */
-
-
-GLOBAL long
-Conn_RecvMsg( CONN_ID Idx )
-{
-	/* Anzahl empfangener Nachrichten liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].msg_in;
-} /* Conn_RecvMsg */
-
-
-GLOBAL long
-Conn_RecvBytes( CONN_ID Idx )
-{
-	/* Anzahl empfangener Bytes (unkomprimiert) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].bytes_in;
-} /* Conn_RecvBytes */
-
-
-GLOBAL void
-Conn_ResetWCounter( void )
-{
-	WCounter = 0;
-} /* Conn_ResetWCounter */
-
-
-GLOBAL long
-Conn_WCounter( void )
-{
-	return WCounter;
-} /* Conn_WCounter */
-
-
-/* -eof- */

src/ngircd/conn-func.h

@@ -1,63 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * 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.7 2007/10/04 15:03:56 alex Exp $
- *
- * Connection management: Global functions (header)
- */
-
-
-#ifndef __conn_func_h__
-#define __conn_func_h__
-
-
-/* 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"
-#endif
-
-
-GLOBAL void Conn_UpdateIdle PARAMS(( CONN_ID Idx ));
-GLOBAL time_t Conn_GetSignon 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 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 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_ResetWCounter PARAMS(( void ));
-GLOBAL long Conn_WCounter PARAMS(( void ));
-
-#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)
-
-#endif
-
-
-/* -eof- */

src/ngircd/conn-zip.c

@@ -1,275 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 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 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.16 2007/05/17 23:34:24 alex Exp $";
-
-#include "imp.h"
-#include <assert.h>
-#include <string.h>
-#include <zlib.h>
-
-#include "conn.h"
-#include "conn-func.h"
-#include "log.h"
-
-#include "array.h"
-#include "exp.h"
-#include "conn-zip.h"
-
-
-GLOBAL bool
-Zip_InitConn( CONN_ID Idx )
-{
-	/* Kompression fuer Link initialisieren */
-
-	assert( Idx > NONE );
-
-	My_Connections[Idx].zip.in.avail_in = 0;
-	My_Connections[Idx].zip.in.total_in = 0;
-	My_Connections[Idx].zip.in.total_out = 0;
-	My_Connections[Idx].zip.in.zalloc = NULL;
-	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 )
-	{
-		/* Fehler! */
-		Log( LOG_ALERT, "Can't initialize compression on connection %d (zlib inflate)!", Idx );
-		return false;
-	}
-
-	My_Connections[Idx].zip.out.total_in = 0;
-	My_Connections[Idx].zip.out.total_in = 0;
-	My_Connections[Idx].zip.out.zalloc = NULL;
-	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 )
-	{
-		/* 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 );
-
-	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.
- * @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, char *Data, size_t Len )
-{
-	size_t buflen;
-
-	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;
-	}
-
-	/* 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)
-		return false;
-
-	return array_catb(&My_Connections[Idx].zip.wbuf, Data, Len);
-} /* Zip_Buffer */
-
-
-/**
- * Compress data in ZIP buffer and move result to the write buffer of
- * the connection.
- * @param Idx Connection handle.
- * @retrun true on success, false otherwise.
- */
-GLOBAL bool
-Zip_Flush( CONN_ID Idx )
-{
-	int result;
-	unsigned char zipbuf[WRITEBUFFER_SLINK_LEN];
-	int zipbuf_used = 0;
-	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 = 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;
-	}
-
-	if (out->avail_out <= 0) {
-		/* Not all data was compressed, because data became
-		 * bigger while compressing it. */
-		Log (LOG_ALERT, "Compression error: buffer overvlow!?");
-		Conn_Close(Idx, "Compression error!", NULL, false);
-		return false;
-	}
-
-	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;
-} /* Zip_Flush */
-
-
-GLOBAL bool
-Unzip_Buffer( CONN_ID Idx )
-{
-	/* 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;
-	unsigned char unzipbuf[READBUFFER_LEN];
-	int unzipbuf_used = 0;
-	unsigned int z_rdatalen;
-	unsigned int in_len;
-	
-	z_stream *in;
-
-	assert( Idx > NONE );
-
-	z_rdatalen = (unsigned int)array_bytes(&My_Connections[Idx].zip.rbuf);
-	if (z_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->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;
-	}
-
-	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))
-		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;
-	}
-
-	return true;
-} /* Unzip_Buffer */
-
-
-GLOBAL long
-Zip_SendBytes( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].zip.bytes_out;
-} /* Zip_SendBytes */
-
-
-GLOBAL long
-Zip_RecvBytes( CONN_ID Idx )
-{
-	/* Anzahl gesendeter Bytes (komprimiert!) liefern */
-
-	assert( Idx > NONE );
-	return My_Connections[Idx].zip.bytes_in;
-} /* Zip_RecvBytes */
-
-
-#endif
-
-
-/* -eof- */

src/ngircd/conn-zip.h

@@ -1,38 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * 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-zip.h,v 1.4 2006/05/10 21:24:01 alex Exp $
- *
- * Connection compression using ZLIB (header)
- */
-
-
-#ifdef ZLIB
-
-#ifndef __conn_zip_h__
-#define __conn_zip_h__
-
-
-GLOBAL bool Zip_InitConn PARAMS(( CONN_ID Idx ));
-
-GLOBAL bool Zip_Buffer PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
-GLOBAL bool Zip_Flush PARAMS(( CONN_ID Idx ));
-GLOBAL bool Unzip_Buffer 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- */

src/ngircd/conn.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.46 2008/02/26 22:04:17 fw Exp $
+ * $Id: conn.h,v 1.26.2.1 2003/03/09 20:16:46 alex Exp $
  *
  * Connection management (header)
  */
@@ -18,86 +18,75 @@
 #define __conn_h__
 
 
-#include <time.h>			/* for time_t, see below */
+#include <time.h>			/* fro time_t, see below */
 
 
-#define CONN_ISCLOSING		1	/* Conn_Close() already called */
-#define CONN_ISCONNECTING	2	/* connect() in progress */
+#define CONN_ISCLOSING 1		/* Conn_Close() already called */
 
-#ifdef ZLIB
-#define CONN_ZIP		4	/* zlib compressed link */
+#ifdef USE_ZLIB
+#define CONN_ZIP 2			/* zlib compressed link */
 #endif
 
 
-typedef int CONN_ID;
-
-#include "client.h"
-
-#ifdef CONN_MODULE
-
-#include "defines.h"
-#include "resolve.h"
-#include "array.h"
-#include "tool.h"
-#include "ng_ipaddr.h"
-
-#ifdef ZLIB
-#include <zlib.h>
-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!) */
-} ZIPDATA;
-#endif /* ZLIB */
-
-typedef struct _Connection
-{
-	int sock;			/* Socket handle */
-	ng_ipaddr_t addr;		/* Client address */
-	RES_STAT res_stat;		/* Status of resolver process */
-	char host[HOST_LEN];		/* Hostname */
-	array rbuf;			/* Read buffer */
-	array wbuf;			/* Write buffer */
-	time_t signon;			/* Signon ("connect") time */
-	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 */
-	CLIENT *client;			/* pointer to client structure */
-#ifdef ZLIB
-	ZIPDATA zip;			/* Compression information */
-#endif  /* ZLIB */
-} CONNECTION;
-
-GLOBAL CONNECTION *My_Connections;
-GLOBAL CONN_ID Pool_Size;
-GLOBAL long WCounter;
-
-#endif /* CONN_MODULE */
+typedef INT CONN_ID;
 
 
-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 unsigned int Conn_InitListeners PARAMS(( void ));
-GLOBAL void Conn_ExitListeners PARAMS(( void ));
+GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
+GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));
 
-GLOBAL void Conn_Handler PARAMS(( void ));
+GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));
 
-GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... ));
+GLOBAL VOID Conn_Handler PARAMS(( VOID ));
 
-GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient ));
+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_SyncServerStruct PARAMS(( void ));
+GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
 
-GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
+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 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_ClearFlags PARAMS(( VOID ));
+GLOBAL INT Conn_Flag PARAMS(( CONN_ID Idx ));
+GLOBAL VOID Conn_SetFlag PARAMS(( CONN_ID Idx, INT Flag ));
+
+GLOBAL VOID Conn_SetServer PARAMS(( CONN_ID Idx, INT ConfServer ));
+
+GLOBAL CONN_ID Conn_First PARAMS(( VOID ));
+GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));
+
+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 ));
+
+#ifdef USE_ZLIB
+GLOBAL BOOLEAN Conn_InitZip PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_SendBytesZip PARAMS(( CONN_ID Idx ));
+GLOBAL LONG Conn_RecvBytesZip PARAMS(( CONN_ID Idx ));
 #endif
 
+GLOBAL VOID Conn_ResetWCounter PARAMS(( VOID ));
+GLOBAL LONG Conn_WCounter PARAMS(( VOID ));
+
+
+GLOBAL INT Conn_MaxFD;
+
+
+#endif
+
+
 /* -eof- */

src/ngircd/defines.h

@@ -1,6 +1,6 @@
 /*
  * 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
@@ -8,120 +8,95 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: defines.h,v 1.62 2007/11/21 12:16:36 alex Exp $
+ * $Id: defines.h,v 1.40 2002/12/16 23:10:56 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 TIME_RES 2			/* Zeit-Aufloesung des Servers in Sekunden */
 
-#define LINE_LEN 256			/* Max. length of a line in the
-					   configuration file */
+#define FNAME_LEN 256			/* max. Laenge eines Dateinamen */
 
-#define HOST_LEN 256			/* Max. lenght of fully qualified host
-					   names (e. g. "abc.domain.tld") */
+#define LINE_LEN 256			/* max. Laenge einer Konfigurationszeile */
 
-#define MAX_LISTEN_PORTS 16		/* Max. count of listening ports */
+#define HOST_LEN 256			/* max. Laenge eines Hostnamen */
 
-#define MAX_OPERATORS 16		/* Max. count of configurable IRC Ops */
+#define MAX_LISTEN_PORTS 16		/* max. Anzahl von Listen-Ports */
 
-#define MAX_SERVERS 16			/* Max. count of configurable servers */
+#define MAX_OPERATORS 16		/* max. Anzahl konfigurierbarer Operatoren */
 
-#define MAX_DEFCHANNELS 16		/* Max. count of predefined channels */
+#define MAX_SERVERS 16			/* max. Anzahl konfigurierbarer Server ("Peers") */
 
-#define MAX_SERVICES 8			/* Max. count of services */
+#define MAX_DEFCHANNELS 16		/* max. Anzahl vorkonfigurierbarerr Channels */
 
-#define MAX_WHOWAS 64			/* Max. number of WHOWAS items */
-#define DEFAULT_WHOWAS 5		/* default count for WHOWAS command */
+#define MAX_SERVICES 8			/* maximum number of configurable services */
 
-#define CONNECTION_POOL 100		/* Size of default connection pool */
+#define CONNECTION_POOL 100		/* Anzahl Verbindungs-Strukturen, die blockweise alloziert werden */
 
-#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 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 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 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. IRC command length, see. RFC
-					   2812 section 3.2 */
+#define COMMAND_LEN 513			/* max. Laenge eines Befehls, vgl. RFC 2812, 3.2 */
 
-#define READBUFFER_LEN 2048		/* Size of the read buffer of a
-					   connection in bytes. */
-#define WRITEBUFFER_LEN 4096		/* Size of the write buffer of a
-					   connection in bytes. */
-#define WRITEBUFFER_SLINK_LEN 51200	/* Size of the write buffer of a
-					   server link connection in bytes. */
+#define READBUFFER_LEN 2048		/* Laenge des Lesepuffers je Verbindung (Bytes) */
+#define WRITEBUFFER_LEN 4096		/* Laenge des Schreibpuffers je Verbindung (Bytes) */
 
-#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 */
+#ifdef USE_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 "CHL"		/* Standard IRC+ flags */
+# define IRCPLUSFLAGS "C"		/* 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 "aios"		/* Supported user modes. */
-#define CHANMODES "biIklmnoPstv"	/* 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"	/* Configuration file name. */
-#define MOTD_FILE "/ngircd.motd"	/* Name of the MOTD file. */
-#define MOTD_PHRASE ""			/* Default MOTD phrase string. */
-#define CHROOT_DIR ""			/* Default chroot() directory. */
-#define PID_FILE ""			/* Default file for the process ID. */
-
-#define ERROR_DIR "/tmp"		/* Error directory used in debug mode */
-
-#define MAX_LOG_MSG_LEN 256		/* Max. length of a log message. */
-
-#define TOKEN_OUTBOUND -2		/* Tag for outbound server links. */
-
-#define NOTICE_TXTPREFIX ""		/* Prefix for NOTICEs from the server
-					   to users. Some servers use '*'. */
-
-#define CUT_TXTSUFFIX "[CUT]"		/* Suffix for oversized messages that
-					   have been shortened and cut off. */
-
-#ifdef ZEROCONF
-#define MDNS_TYPE "_ircu._tcp."		/* Service type to register with mDNS */
+#ifdef PROTOTYPES
+# define CONFIG_FILE SYSCONFDIR"/ngircd.conf"
+# define MOTD_FILE SYSCONFDIR"/ngircd.motd"
+#else
+# define CONFIG_FILE "ngircd.conf"
+# define MOTD_FILE "ngircd.motd"
 #endif
+#define ERROR_DIR "/tmp"
+
+#define MAX_LOG_MSG_LEN 256		/* max. Laenge einer Log-Meldung */
+
+#define TOKEN_OUTBOUND -2		/* Kennzeichnung fuer ausgehende Server-Links im Aufbau */
+
+#define NOTICE_TXTPREFIX ""		/* Kennzeichnung fuer Server-NOTICEs an User */
 
 
 #endif

src/ngircd/hash.c

@@ -14,30 +14,33 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: hash.c,v 1.13 2006/10/06 21:23:47 fw Exp $";
+static char UNUSED id[] = "$Id: hash.c,v 1.6 2002/12/12 12:24:18 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(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
+LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
 
 
 GLOBAL UINT32
-Hash( const char *String )
+Hash( CHAR *String )
 {
 	/* Hash-Wert ueber String berechnen */
 
-	char buffer[LINE_LEN];
+	CHAR buffer[LINE_LEN];
 
-	strlcpy( buffer, String, sizeof( buffer ));
+	strncpy( buffer, String, LINE_LEN - 1 );
+	buffer[LINE_LEN - 1] = '\0';
+	
 	return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
 } /* Hash */
 
@@ -72,7 +75,7 @@ Hash( const char *String )
 } /* mix */
 
 
-static UINT32
+LOCAL UINT32
 jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
 {
 	/* k: the key
@@ -99,7 +102,7 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
 
 	/* handle the last 11 bytes */
 	c += length;
-	switch( (int)len )	/* all the case statements fall through */
+	switch(len)		/* all the case statements fall through */
 	{
 		case 11: c+=((UINT32)k[10]<<24);
 		case 10: c+=((UINT32)k[9]<<16);

src/ngircd/hash.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: hash.h,v 1.6 2006/10/06 21:23:47 fw Exp $
+ * $Id: hash.h,v 1.4 2002/12/12 12:23:43 alex Exp $
  *
  * Hash calculation (header)
  */
@@ -17,7 +17,8 @@
 #ifndef __hash_h__
 #define __hash_h__
 
-GLOBAL UINT32 Hash PARAMS((const char *String ));
+
+GLOBAL UINT32 Hash PARAMS((CHAR *String ));
 
 
 #endif

src/ngircd/io.c

@@ -1,894 +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.
- *
- * I/O abstraction interface.
- * Copyright (c) 2005 Florian Westphal (westphal@foo.fh-furtwangen.de)
- *
- */
-
-#include "portab.h"
-
-static char UNUSED id[] = "$Id: io.c,v 1.31 2008/04/03 20:56:44 fw Exp $";
-
-#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 "conn.h"	/* for CONN_IDX (needed by resolve.h) */
-#include "resolve.h"	/* for RES_STAT (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(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 = readers;
-	fd_set writers_tmp = writers;
-	short what;
-	int ret, i;
-	int fds_ready;
-	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_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 */
-}

src/ngircd/io.h

@@ -1,51 +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.
- *
- * I/O abstraction interface header
- *
- * $Id: io.h,v 1.4 2006/12/25 22:53:52 alex Exp $
- */
-
-#ifndef io_H_included
-#define io_H_included
-
-#include "portab.h"
-#include <sys/time.h>
-
-#define IO_WANTREAD	1
-#define IO_WANTWRITE	2
-
-/* init library.
-   sets up epoll/kqueue descriptors and tries to allocate space for ioevlen
-   file descriptors. ioevlen is just the _initial_ size, not a limit. */
-bool io_library_init PARAMS((unsigned int ioevlen));
-
-/* shutdown and free all internal data structures */
-void io_library_shutdown PARAMS((void));
-
-/* add fd to internal set, enable readability check, set callback */
-bool io_event_create PARAMS((int fd, short what, void (*cbfunc)(int, short)));
-
-/* change callback function associated with fd */
-bool io_event_setcb PARAMS((int fd, void (*cbfunc)(int, short)));
-
-/* watch fd for event of type what */
-bool io_event_add PARAMS((int fd, short what));
-
-/* do not watch fd for event of type what */
-bool io_event_del PARAMS((int fd, short what));
-
-/* remove fd from watchlist, close() fd.  */
-bool io_close PARAMS((int fd));
-
-/* set O_NONBLOCK */
-bool io_setnonblock PARAMS((int fd));
-
-/* watch fds for activity */
-int io_dispatch PARAMS((struct timeval *tv));
-
-#endif /* io_H_included */

src/ngircd/irc-channel.c

@@ -14,12 +14,10 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.45 2008/02/24 18:57:38 fw Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.21.2.5 2003/01/08 23:09:34 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "defines.h"
@@ -40,144 +38,11 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.45 2008/02/24 18:57:38 fw Exp
 #include "irc-channel.h"
 
 
-/*
- * RFC 2812, (3.2.1 Join message Command):
- *  Note that this message
- *  accepts a special argument ("0"), which is a special request to leave all
- *  channels the user is currently a member of. The server will process this
- *  message as if the user had sent a PART command (See Section 3.2.2) for
- *  each channel he is a member of.
- */
-static bool
-part_from_all_channels(CLIENT* client, CLIENT *target)
-{
-	CL2CHAN *cl2chan;
-	CHANNEL *chan;
-
-	while ((cl2chan = Channel_FirstChannelOf(target))) {
-		chan = Channel_GetChannel(cl2chan);
-		assert( chan != NULL );
-		Channel_Part(target, client, Channel_Name(chan), Client_ID(target));
-	}
-	return CONNECTED;
-}
-
-
-static bool
-join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan,
-			const char *channame, const char *key)
-{
-	bool is_invited, is_banned;
-	const char *channel_modes;
-
-	is_banned = Lists_Check(Channel_GetListBans(chan), target);
-	is_invited = Lists_Check(Channel_GetListInvites(chan), target);
-
-	if (is_banned && !is_invited) {
-		IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
-		return false;
-	}
-
-	channel_modes = Channel_Modes(chan);
-	if ((strchr(channel_modes, 'i')) && !is_invited) {
-		/* Channel is "invite-only" (and Client wasn't invited) */
-		IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame);
-		return false;
-	}
-
-	/* Is the channel protected by a key? */
-	if (strchr(channel_modes, 'k') &&
-		strcmp(Channel_Key(chan), key ? key : ""))
-	{
-		IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame);
-		return false;
-	}
-	/* Are there already too many members? */
-	if ((strchr(channel_modes, 'l')) && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) {
-		IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, Client_ID(Client), channame);
-		return false;
-	}
-	return true;
-}
-
-
-static void
-join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
-{
-	if (flags) {
-		while (*flags) {
-			Channel_UserModeAdd(chan, target, *flags);
-			flags++;
-		}
-	}
-
-	/* If channel persistent and client is ircop: make client chanop */
-	if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o'))
-		Channel_UserModeAdd(chan, target, 'o');
-}
-
-
-static void
-join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
-					const char *channame)
-{
-	char modes[8];
-
-	strlcpy(&modes[1], Channel_UserModes(chan, target), sizeof(modes) - 1);
-
-	if (modes[1])
-		modes[0] = 0x7;
-	else
-		modes[0] = '\0';
-	/* forward to other servers */
-	IRC_WriteStrServersPrefix(Client, target, "JOIN :%s%s", channame, modes);
-
-	/* tell users in this channel about the new client */
-	IRC_WriteStrChannelPrefix(Client, chan, target, false, "JOIN :%s", channame);
-	if (modes[1])
-		IRC_WriteStrChannelPrefix(Client, chan, target, false, "MODE %s +%s %s",
-						channame, &modes[1], Client_ID(target));
-}
-
-
-static bool
-join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan,
-					const char *channame)
-{
-	const char *topic;
-
-	if (Client_Type(Client) != CLIENT_USER)
-		return true;
-	/* acknowledge join */
-	if (!IRC_WriteStrClientPrefix(Client, target, "JOIN :%s", channame))
-		return false;
-
-	/* Send topic to client, if any */
-	topic = Channel_Topic(chan);
-	assert(topic != NULL);
-	if (*topic) {
-		if (!IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
-			Client_ID(Client), channame, topic))
-				return false;
-#ifndef STRICT_RFC
-		if (!IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
-			Client_ID(Client), channame,
-			Channel_TopicWho(chan),
-			Channel_TopicTime(chan)))
-				return false;
-#endif
-	}
-	/* send list of channel members to client */
-	if (!IRC_Send_NAMES(Client, chan))
-		return false;
-	return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), Channel_Name(chan));
-}
-
-
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
-	char *channame, *channame_ptr, *key, *key_ptr, *flags;
+	CHAR *channame, *key, *flags, *topic, modes[8];
+	BOOLEAN is_new_chan, is_invited, is_banned;
 	CLIENT *target;
 	CHANNEL *chan;
 
@@ -185,150 +50,212 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	assert( Req != NULL );
 
 	/* Bad number of arguments? */
-	if (Req->argc < 1 || Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	/* Who is the sender? */
-	if (Client_Type(Client) == CLIENT_SERVER)
-		target = Client_Search(Req->prefix);
-	else
-		target = Client;
-
-	if (!target)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix);
-
-	/* Is argument "0"? */
-	if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2))
-		return part_from_all_channels(Client, target);
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
 	/* Are channel keys given? */
-	if (Req->argc > 1) {
-		key = Req->argv[1];
-		key_ptr = strchr(key, ',');
-		if (key_ptr) *key_ptr = '\0';
-	} else {
-		key = key_ptr = NULL;
-	}
-	channame = Req->argv[0];
-	channame_ptr = strchr(channame, ',');
-	if (channame_ptr) *channame_ptr = '\0';
+	if( Req->argc > 1 ) key = Req->argv[1];
+	else key = NULL;
 
-	while (channame) {
-		flags = NULL;
+	/* Channel-Namen durchgehen */
+	chan = NULL;
+	channame = strtok( Req->argv[0], "," );
+	while( channame )
+	{
+		chan = flags = NULL;
 
-		/* Did the server include channel-user-modes? */
-		if (Client_Type(Client) == CLIENT_SERVER) {
-			flags = strchr(channame, 0x7);
-			if (flags) {
+		/* wird der Channel neu angelegt? */
+		if( Channel_Search( channame )) is_new_chan = FALSE;
+		else is_new_chan = TRUE;
+
+		/* Hat ein Server Channel-User-Modes uebergeben? */
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			/* Channel-Flags extrahieren */
+			flags = strchr( channame, 0x7 );
+			if( flags )
+			{
 				*flags = '\0';
 				flags++;
 			}
 		}
 
-		chan = Channel_Search(channame);
-		if (!chan && Conf_PredefChannelsOnly) {
-			 /* channel must be created, but server does not allow this */
-			IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
-			break;
-		}
-
-		/* Local client? */
-		if (Client_Type(Client) == CLIENT_USER) {
+		/* Lokaler Client? */
+		if( Client_Type( Client ) == CLIENT_USER )
+		{
 			/* Test if the user has reached his maximum channel count */
-			if ((Conf_MaxJoins > 0) && (Channel_CountForUser(Client) >= Conf_MaxJoins))
-				return IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG,
-							Client_ID(Client), channame);
-			if (!chan) /* New Channel: first user will be channel operator */
+			if( Client_Type( Client ) == CLIENT_USER )
+			{
+				if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
+				{
+					IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
+					return CONNECTED;
+				}
+			}
+
+			/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
+			if( is_new_chan )
+			{
+				/* Erster User im Channel: Operator-Flag setzen */
 				flags = "o";
+			}
 			else
-				if (!join_allowed(Client, target, chan, channame, key))
-					break;
-		} else {
-			/* Remote server: we don't need to know whether the
-			 * client is invited or not, but we have to make sure
-			 * that the "one shot" entries (generated by INVITE
-			 * commands) in this list become deleted when a user
-			 * joins a channel this way. */
-			if (chan) (void)Lists_Check(Channel_GetListInvites(chan), target);
-		}
+			{
+				/* Existierenden Channel suchen */
+				chan = Channel_Search( channame );
+				assert( chan != NULL );
 
-		/* Join channel (and create channel if it doesn't exist) */
-		if (!Channel_Join(target, channame))
-			break;
+				is_banned = Lists_CheckBanned( target, chan );
+				is_invited = Lists_CheckInvited( target, chan );
 
-		if (!chan) /* channel is new; it has been created above */
-			chan = Channel_Search(channame);
-		assert(chan != NULL);
+				/* Testen, ob Client gebanned ist */
+				if(( is_banned == TRUE ) &&  ( is_invited == FALSE ))
+				{
+					/* Client ist gebanned (und nicht invited): */
+					IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
 
-		join_set_channelmodes(chan, target, flags);
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
 
-		join_forward(Client, target, chan, channame);
+				/* Ist der Channel "invite-only"? */
+				if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
+				{
+					/* Channel ist "invite-only" und Client wurde nicht invited: */
+					IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
 
-		if (!join_send_topic(Client, target, chan, channame))
-			break; /* write error */
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
 
-		/* next channel? */
-		channame = channame_ptr;
-		if (channame) {
-			channame++;
-			channame_ptr = strchr(channame, ',');
-			if (channame_ptr) *channame_ptr = '\0';
+				/* Is the channel protected by a key? */
+				if(( strchr( Channel_Modes( chan ), 'k' )) && ( strcmp( Channel_Key( chan ), key ? key : "" ) != 0 ))
+				{
+					/* Bad channel key! */
+					IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
 
-			if (key_ptr) {
-				key = ++key_ptr;
-				key_ptr = strchr(key, ',');
-				if (key_ptr) *key_ptr = '\0';
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
+
+				/* Are there already too many members? */
+				if(( strchr( Channel_Modes( chan ), 'l' )) && ( Channel_MaxUsers( chan ) <= Channel_MemberCount( chan )))
+				{
+					/* Bad channel key! */
+					IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
+
+					/* Try next name, if any */
+					channame = strtok( NULL, "," );
+					continue;
+				}
 			}
 		}
+
+		/* Channel joinen (und ggf. anlegen) */
+		if( ! Channel_Join( target, channame ))
+		{
+			/* naechsten Namen ermitteln */
+			channame = strtok( NULL, "," );
+			continue;
+		}
+		if( ! chan ) chan = Channel_Search( channame );
+		assert( chan != NULL );
+
+		/* Modes setzen (wenn vorhanden) */
+		while( flags && *flags )
+		{
+			Channel_UserModeAdd( chan, target, *flags );
+			flags++;
+		}
+
+		/* Wenn persistenter Channel und IRC-Operator: zum Channel-OP machen */
+		if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' );
+
+		/* Muessen Modes an andere Server gemeldet werden? */
+		strcpy( &modes[1], Channel_UserModes( chan, target ));
+		if( modes[1] ) modes[0] = 0x7;
+		else modes[0] = '\0';
+
+		/* An andere Server weiterleiten */
+		IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
+
+		/* im Channel bekannt machen */
+		IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
+		if( modes[1] )
+		{
+			/* Modes im Channel bekannt machen */
+			IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
+		}
+
+		if( Client_Type( Client ) == CLIENT_USER )
+		{
+			/* an Client bestaetigen */
+			IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
+
+			/* Topic an Client schicken */
+			topic = Channel_Topic( chan );
+			if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+
+			/* Mitglieder an Client Melden */
+			IRC_Send_NAMES( Client, chan );
+			IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
+		}
+
+		/* naechsten Namen ermitteln */
+		channame = strtok( NULL, "," );
 	}
 	return CONNECTED;
 } /* IRC_JOIN */
 
 
-/**
- * Handler for the IRC "PART" command.
- */
-GLOBAL bool
-IRC_PART(CLIENT * Client, REQUEST * Req)
+GLOBAL BOOLEAN
+IRC_PART( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target;
-	char *chan;
+	CHAR *chan;
 
-	assert(Client != NULL);
-	assert(Req != NULL);
+	assert( Client != NULL );
+	assert( Req != NULL );
 
-	if (Req->argc < 1 || Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	/* Get the sender */
-	if (Client_Type(Client) == CLIENT_SERVER)
-		target = Client_Search(Req->prefix);
-	else
-		target = Client;
-	if (!target)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					  Client_ID(Client), Req->prefix);
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-	/* Loop over all the given channel names */
-	chan = strtok(Req->argv[0], ",");
-	while (chan) {
-		Channel_Part(target, Client, chan,
-			     Req->argc > 1 ? Req->argv[1] : Client_ID(target));
-		chan = strtok(NULL, ",");
+	/* Channel-Namen durchgehen */
+	chan = strtok( Req->argv[0], "," );
+	while( chan )
+	{
+		if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target )))
+		{
+			/* naechsten Namen ermitteln */
+			chan = strtok( NULL, "," );
+			continue;
+		}
+
+		/* naechsten Namen ermitteln */
+		chan = strtok( NULL, "," );
 	}
 	return CONNECTED;
 } /* IRC_PART */
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 {
 	CHANNEL *chan;
 	CLIENT *from;
-	char *topic;
-	bool r;
+	CHAR *topic;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -349,22 +276,10 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 
 	if( Req->argc == 1 )
 	{
-		/* Request actual topic */
-		topic = Channel_Topic(chan);
-		if (*topic) {
-			r = IRC_WriteStrClient(from, RPL_TOPIC_MSG,
-				Client_ID(Client), Channel_Name(chan), topic);
-#ifndef STRICT_RFC
-			r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG,
-				Client_ID(Client), Channel_Name(chan),
-				Channel_TopicWho(chan),
-				Channel_TopicTime(chan));
-#endif
-			return r;
-		}
-		else
-			 return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG,
-					Client_ID(from), Channel_Name(chan));
+		/* Topic erfragen */
+		topic = Channel_Topic( chan );
+		if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
+		else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
 	}
 
 	if( strchr( Channel_Modes( chan ), 't' ))
@@ -373,115 +288,84 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 		if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
 	}
 
-	/* Set new topic */
-	Channel_SetTopic(chan, from, Req->argv[1]);
-	Log(LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s",
-		Client_Mask(from), Channel_Name(chan),
-		Req->argv[1][0] ? Req->argv[1] : "<none>");
+	/* Topic setzen */
+	Channel_SetTopic( chan, Req->argv[1] );
+	Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
 
 	/* im Channel bekannt machen und an Server weiterleiten */
 	IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-	IRC_WriteStrChannelPrefix( Client, chan, from, false, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+	IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
 
 	if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
 	else return CONNECTED;
 } /* IRC_TOPIC */
 
 
-/**
- * Handler for the IRC "LIST" command.
- * This implementation handles the local case as well as the forwarding of the
- * LIST command to other servers in the IRC network.
- */
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_LIST( CLIENT *Client, REQUEST *Req )
 {
-	char *pattern;
+	CHAR *pattern;
 	CHANNEL *chan;
 	CLIENT *from, *target;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Bad number of prameters? */
-	if( Req->argc > 2 )
-		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
-			Client_ID( Client ), Req->command );
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	if( Req->argc > 0 )
-		pattern = strtok( Req->argv[0], "," );
-	else
-		pattern = "*";
+	if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," );
+	else pattern = "*";
 
-	/* Get sender from prefix, if any */
-	if( Client_Type( Client ) == CLIENT_SERVER )
-		from = Client_Search( Req->prefix );
-	else
-		from = Client;
-
-	if( ! from )
-		return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG,
-				Client_ID( Client ), Req->prefix );
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
 
 	if( Req->argc == 2 )
 	{
-		/* Forward to other server? */
+		/* an anderen Server forwarden */
 		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
-			return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG,
-					Client_ID( Client ), Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 
 		if( target != Client_ThisServer( ))
 		{
-			/* Target is indeed an other server, forward it! */
-			return IRC_WriteStrClientPrefix( target, from,
-					"LIST %s :%s", Client_ID( from ),
-					Req->argv[1] );
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] );
 		}
 	}
 	
 	while( pattern )
 	{
-		/* Loop through all the channels */
+		/* alle Channel durchgehen */
 		chan = Channel_First( );
 		while( chan )
 		{
-			/* Check search pattern */
+			/* Passt die Suchmaske auf diesen Channel? */
 			if( Match( pattern, Channel_Name( chan )))
 			{
-				/* Gotcha! */
-				if( ! strchr( Channel_Modes( chan ), 's' ) ||
-				    Channel_IsMemberOf( chan, from ))
-				{
-					if( ! IRC_WriteStrClient( from,
-					    RPL_LIST_MSG, Client_ID( from ),
-					    Channel_Name( chan ),
-					    Channel_MemberCount( chan ),
-					    Channel_Topic( chan )))
-						return DISCONNECTED;
-				}
+				/* Treffer! */
+				if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
 			}
 			chan = Channel_Next( chan );
 		}
 		
-		/* Get next name ... */
-		if( Req->argc > 0 )
-			pattern = strtok( NULL, "," );
-		else
-			pattern = NULL;
+		/* naechsten Namen ermitteln */
+		if( Req->argc > 0 ) pattern = strtok( NULL, "," );
+		else pattern = NULL;
 	}
 	
-	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from ));
+	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from );
 } /* IRC_LIST */
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 {
-	char modes_add[COMMAND_LEN], l[16], *ptr;
 	CLIENT *from;
 	CHANNEL *chan;
-	int arg_topic;
+	CHAR *ptr;
+	INT arg_topic;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -511,40 +395,15 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 			/* OK, this channel doesn't have modes jet, set the received ones: */
 			Channel_SetModes( chan, &Req->argv[1][1] );
 
-			if( Req->argc == 5 )
-			{
-				if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] );
-				if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] ));
-			}
-			else
-			{
-				/* Delete modes which we never want to inherit */
-				Channel_ModeDel( chan, 'l' );
-				Channel_ModeDel( chan, 'k' );
-			}
+			/* Delete modes which we never want to inherit */
+			Channel_ModeDel( chan, 'l' );
+			Channel_ModeDel( chan, 'k' );
 
-			strcpy( modes_add, "" );
-			ptr = Channel_Modes( chan );
-			while( *ptr )
-			{
-				if( *ptr == 'l' )
-				{
-					snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
-					strlcat( modes_add, l, sizeof( modes_add ));
-				}
-				if( *ptr == 'k' )
-				{
-					strlcat( modes_add, " ", sizeof( modes_add ));
-					strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add ));
-				}
-	     			ptr++;
-			}
-			
 			/* Inform members of this channel */
-			IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], Channel_Modes( chan ));
 		}
 	}
-	else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
+	else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );
 
 	if( arg_topic > 0 )
 	{
@@ -553,9 +412,8 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 		if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
 		{
 			/* OK, there is no topic jet */
-			Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
-			IRC_WriteStrChannelPrefix(Client, chan, from, false,
-			     "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan));
+			Channel_SetTopic( chan, Req->argv[arg_topic] );
+			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
 		}
 	}
 

src/ngircd/irc-channel.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-channel.h,v 1.7 2005/03/19 18:43:48 fw Exp $
+ * $Id: irc-channel.h,v 1.6 2002/12/12 12:23:43 alex Exp $
  *
  * IRC channel commands (header)
  */
@@ -18,13 +18,13 @@
 #define __irc_channel_h__
 
 
-GLOBAL bool IRC_JOIN PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_PART PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_TOPIC PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_JOIN PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PART PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_TOPIC PARAMS((CLIENT *Client, REQUEST *Req ));
 
-GLOBAL bool IRC_LIST PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LIST PARAMS((CLIENT *Client, REQUEST *Req ));
 
-GLOBAL bool IRC_CHANINFO PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_CHANINFO PARAMS((CLIENT *Client, REQUEST *Req ));
 
 
 #endif

src/ngircd/irc-info.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-info.h,v 1.6 2008/02/17 13:26:42 alex Exp $
+ * $Id: irc-info.h,v 1.2 2002/12/12 12:23:43 alex Exp $
  *
  * IRC info commands (header)
  */
@@ -18,27 +18,24 @@
 #define __irc_info_h__
 
 
-GLOBAL bool IRC_ADMIN PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_INFO PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_ISON PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_LINKS PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_LUSERS PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_MOTD PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_NAMES PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_STATS PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_SUMMON PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_TIME PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_USERHOST PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_USERS PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_VERSION PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_WHO PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_WHOIS PARAMS(( CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_WHOWAS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_ADMIN PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_ISON PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LINKS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_LUSERS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_MOTD PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NAMES PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_STATS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_TIME PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_USERHOST PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_VERSION PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHO PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHOIS PARAMS(( CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_WHOWAS PARAMS(( CLIENT *Client, REQUEST *Req ));
 
-GLOBAL bool IRC_Send_LUSERS PARAMS(( CLIENT *Client ));
-GLOBAL bool IRC_Send_NAMES PARAMS(( CLIENT *Client, CHANNEL *Chan ));
-GLOBAL bool IRC_Show_MOTD PARAMS(( CLIENT *Client ));
-GLOBAL bool IRC_Send_ISUPPORT PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_LUSERS PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_NAMES PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+GLOBAL BOOLEAN IRC_Show_MOTD PARAMS(( CLIENT *Client ));
+GLOBAL BOOLEAN IRC_Send_WHO PARAMS(( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ));
 
 
 #endif

src/ngircd/irc-login.c

@@ -1,6 +1,6 @@
 /*
  * 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
@@ -14,23 +14,23 @@
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc-login.c,v 1.27.2.2 2003/01/01 13:46:37 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "ngircd.h"
 #include "resolve.h"
-#include "conn-func.h"
 #include "conf.h"
+#include "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
-#include "irc.h"
 #include "irc-info.h"
 #include "irc-write.h"
 
@@ -38,266 +38,197 @@
 #include "irc-login.h"
 
 
-static bool Hello_User PARAMS(( CLIENT *Client ));
-static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
+LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client ));
+LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason ));
 
 
-/**
- * Handler for the IRC command "PASS".
- * See RFC 2813 section 4.1.1, and RFC 2812 section 3.1.1.
- */
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_PASS( CLIENT *Client, REQUEST *Req )
 {
-	char *type, *orig_flags;
-	int protohigh, protolow;
-
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Return an error if this is not a local client */
-	if (Client_Conn(Client) <= NONE)
-		return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG,
-					  Client_ID(Client), Req->command);
+	/* Fehler liefern, wenn kein lokaler Client */
+	if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command );
 	
-	if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) {
-		/* Not yet registered "unknown" connection, PASS with one
-		 * argument: either a regular client, service, or server
-		 * using the old RFC 1459 section 4.1.1 syntax. */
-		LogDebug("Connection %d: got PASS command ...",
-			 Client_Conn(Client));
-	} else if ((Client_Type(Client) == CLIENT_UNKNOWN ||
-		    Client_Type(Client) == CLIENT_UNKNOWNSERVER) &&
-		   (Req->argc == 3 || Req->argc == 4)) {
-		/* Not yet registered "unknown" connection or outgoing server
-		 * link, PASS with three or four argument: server using the
-		 * RFC 2813 section 4.1.1 syntax. */
-		LogDebug("Connection %d: got PASS command (new server link) ...",
-			 Client_Conn(Client));
-	} else if (Client_Type(Client) == CLIENT_UNKNOWN ||
-		   Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
-		/* Unregistered connection, but wrong number of arguments: */
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-	} else {
-		/* Registered connection, PASS command is not allowed! */
-		return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
-					  Client_ID(Client));
+	if(( Client_Type( Client ) == CLIENT_UNKNOWN ) && ( Req->argc == 1))
+	{
+		/* noch nicht registrierte unbekannte Verbindung */
+		Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client ));
+
+		/* Passwort speichern */
+		Client_SetPassword( Client, Req->argv[0] );
+
+		Client_SetType( Client, CLIENT_GOTPASS );
+		return CONNECTED;
 	}
+	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
+	{
+		CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
+		INT protohigh, protolow;
 
-	Client_SetPassword(Client, Req->argv[0]);
-	Client_SetType(Client, CLIENT_GOTPASS);
+		/* noch nicht registrierte Server-Verbindung */
+		Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
 
-	/* Protocol version */
-	if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
-		int c2, c4;
+		/* Passwort speichern */
+		Client_SetPassword( Client, Req->argv[0] );
 
-		c2 = Req->argv[1][2];
-		c4 = Req->argv[1][4];
+		/* Protokollversion ermitteln */
+		if( strlen( Req->argv[1] ) >= 4 )
+		{
+			c2 = Req->argv[1][2];
+			c4 = Req->argv[1][4];
 
-		Req->argv[1][4] = '\0';
-		protolow = atoi(&Req->argv[1][2]);
-		Req->argv[1][2] = '\0';
-		protohigh = atoi(Req->argv[1]);
+			Req->argv[1][4] = '\0';
+			protolow = atoi( &Req->argv[1][2] );
+			Req->argv[1][2] = '\0';
+			protohigh = atoi( Req->argv[1] );
 			
-		Req->argv[1][2] = c2;
-		Req->argv[1][4] = c4;
-	} else
-		protohigh = protolow = 0;
+			Req->argv[1][2] = c2;
+			Req->argv[1][4] = c4;
+		}			
+		else protohigh = protolow = 0;
 
-	/* Protocol type, see doc/Protocol.txt */
-	if (Req->argc >= 2 && strlen(Req->argv[1]) > 4)
-		type = &Req->argv[1][4];
-	else
-		type = NULL;
-	
-	/* Protocol flags/options */
-	if (Req->argc >= 4)
-		orig_flags = Req->argv[3];
-	else
-		orig_flags = "";
+		/* Protokoll-Typ */
+		if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
+		else type = NULL;
 
-	/* Implementation, version and IRC+ flags */
-	if (Req->argc >= 3) {
-		char *impl, *ptr, *serverver, *flags;
+		/* IRC-Flags (nach RFC 2813) */
+		if( Req->argc >= 4 ) ircflags = Req->argv[3];
+		else ircflags = "";
 
+		/* Implementation, Version und ngIRCd-Flags */
 		impl = Req->argv[2];
-		ptr = strchr(impl, '|');
-		if (ptr)
-			*ptr = '\0';
+		ptr = strchr( impl, '|' );
+		if( ptr ) *ptr = '\0';
 
-		if (type && strcmp(type, PROTOIRCPLUS) == 0) {
-			/* The peer seems to be a server which supports the
-			 * IRC+ protocol (see doc/Protocol.txt). */
+		if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
+		{
+			/* auf der anderen Seite laeuft ein Server, der
+			 * ebenfalls das IRC+-Protokoll versteht */
 			serverver = ptr + 1;
-			flags = strchr(serverver, ':');
-			if (flags) {
+			flags = strchr( serverver, ':' );
+			if( flags )
+			{
 				*flags = '\0';
 				flags++;
-			} else
-				flags = "";
-			Log(LOG_INFO,
-			    "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
-			    impl, serverver, protohigh, protolow, flags);
-		} else {
-			/* The peer seems to be a server supporting the
-			 * "original" IRC protocol (RFC 2813). */
-			serverver = "";
-			if (strchr(orig_flags, 'Z'))
-				flags = "Z";
-			else
-				flags = "";
-			Log(LOG_INFO,
-			    "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
-			    impl, protohigh, protolow, flags);
-		}
-		Client_SetFlags(Client, flags);
-	}
-
-	return CONNECTED;
-} /* IRC_PASS */
-
-
-/**
- * IRC "NICK" command.
- * This function implements the IRC command "NICK" which is used to register
- * with the server, to change already registered nicknames and to introduce
- * new users which are connected to other servers.
- */
-GLOBAL bool
-IRC_NICK( CLIENT *Client, REQUEST *Req )
-{
-	CLIENT *intr_c, *target, *c;
-	char *modes;
-
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-#ifndef STRICT_RFC
-	/* Some IRC clients, for example BitchX, send the NICK and USER
-	 * commands in the wrong order ... */
-	if( Client_Type( Client ) == CLIENT_UNKNOWN
-	    || Client_Type( Client ) == CLIENT_GOTPASS
-	    || Client_Type( Client ) == CLIENT_GOTNICK
-	    || Client_Type( Client ) == CLIENT_GOTUSER
-	    || Client_Type( Client ) == CLIENT_USER
-	    || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
-#else
-	if( Client_Type( Client ) == CLIENT_UNKNOWN
-	    || Client_Type( Client ) == CLIENT_GOTPASS
-	    || Client_Type( Client ) == CLIENT_GOTNICK
-	    || Client_Type( Client ) == CLIENT_USER
-	    || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
-#endif
-	{
-		/* User registration or change of nickname */
-
-		/* Wrong number of arguments? */
-		if( Req->argc != 1 )
-			return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
-						   Client_ID( Client ),
-						   Req->command );
-
-		/* Search "target" client */
-		if( Client_Type( Client ) == CLIENT_SERVER )
-		{
-			target = Client_Search( Req->prefix );
-			if( ! target )
-				return IRC_WriteStrClient( Client,
-							   ERR_NOSUCHNICK_MSG,
-							   Client_ID( Client ),
-							   Req->argv[0] );
+			}
+			else flags = "";
+			Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
 		}
 		else
 		{
-			/* Is this a restricted client? */
-			if( Client_HasMode( Client, 'r' ))
-				return IRC_WriteStrClient( Client,
-							   ERR_RESTRICTED_MSG,
-							   Client_ID( Client ));
+			/* auf der anderen Seite laeuft ein Server, der
+			 * nur das Originalprotokoll unterstuetzt */
+			serverver = "";
+			if( strchr( ircflags, 'Z' )) flags = "Z";
+			else flags = "";
+			Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
+		}
 
+		Client_SetType( Client, CLIENT_GOTPASSSERVER );
+		Client_SetFlags( Client, flags );
+
+		return CONNECTED;
+	}
+	else if(( Client_Type( Client ) == CLIENT_UNKNOWN  ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
+	{
+		/* Falsche Anzahl Parameter? */
+		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	}
+	else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+} /* IRC_PASS */
+
+
+GLOBAL BOOLEAN
+IRC_NICK( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *intr_c, *target, *c;
+	CHAR *modes;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
+#ifndef STRICT_RFC
+	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+#else
+	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+#endif
+	{
+		/* User-Registrierung bzw. Nick-Aenderung */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		/* "Ziel-Client" ermitteln */
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			target = Client_Search( Req->prefix );
+			if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+		}
+		else
+		{
+			/* Ist der Client "restricted"? */
+			if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
 			target = Client;
 		}
 
 #ifndef STRICT_RFC
-		/* If the clients tries to change to its own nickname we won't
-		 * do anything. This is how the original ircd behaves and some
-		 * clients (for example Snak) expect it to be like this.
-		 * But I doubt that this is "really the right thing" ... */
-		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 )
-			return CONNECTED;
+		/* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
+		 * wir nichts. So macht es das Original und mind. Snak hat probleme,
+		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
+		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
 #endif
 
-		/* Check that the new nickname is available. Special case:
-		 * the client only changes from/to upper to lower case. */
+		/* pruefen, ob Nick bereits vergeben. Speziallfall: der Client
+		 * will nur die Gross- und Kleinschreibung aendern. Das darf
+		 * er natuerlich machen :-) */
 		if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 )
 		{
-			if( ! Client_CheckNick( target, Req->argv[0] ))
-				return CONNECTED;
+			if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED;
 		}
 
-		if(( Client_Type( target ) != CLIENT_USER )
-		   && ( Client_Type( target ) != CLIENT_SERVER ))
+		if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
 		{
-			/* New client */
-			Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", 
-			     Client_Conn( Client ));
+			/* Neuer Client */
+			Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client ));
 
-			/* Register new nickname of this client */
+			/* Client-Nick registrieren */
 			Client_SetID( target, Req->argv[0] );
 
-			/* If we received a valid USER command already then
-			 * register the new client! */
-			if( Client_Type( Client ) == CLIENT_GOTUSER )
-				return Hello_User( Client );
-			else
-				Client_SetType( Client, CLIENT_GOTNICK );
+			/* schon ein USER da? Dann registrieren! */
+			if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client );
+			else Client_SetType( Client, CLIENT_GOTNICK );
 		}
 		else
 		{
-			/* Nickname change */
+			/* Nick-Aenderung */
 			if( Client_Conn( target ) > NONE )
 			{
-				/* Local client */
-				Log( LOG_INFO,
-				     "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
-				     Client_Mask( target ), Client_Conn( target ),
-				     Client_ID( target ), Req->argv[0] );
+				/* lokaler Client */
+				Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] );
 			}
 			else
 			{
-				/* Remote client */
-				Log( LOG_DEBUG,
-				     "User \"%s\" changed nick: \"%s\" -> \"%s\".",
-				     Client_Mask( target ), Client_ID( target ),
-				     Req->argv[0] );
+				/* Remote-Client */
+				Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
 			}
 
-			/* Inform all users and servers (which have to know)
-			 * of this nickname change */
-			if( Client_Type( Client ) == CLIENT_USER )
-				IRC_WriteStrClientPrefix( Client, Client,
-							  "NICK :%s",
-							  Req->argv[0] );
-			IRC_WriteStrServersPrefix( Client, target,
-						   "NICK :%s", Req->argv[0] );
-			IRC_WriteStrRelatedPrefix( target, target, false,
-						   "NICK :%s", Req->argv[0] );
-
-			/* Register old nickname for WHOWAS queries */
-			Client_RegisterWhowas( target );
-
-			/* Save new nickname */
+			/* alle betroffenen User und Server ueber Nick-Aenderung informieren */
+			if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
+			IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
+			IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] );
+			
+			/* neuen Client-Nick speichern */
 			Client_SetID( target, Req->argv[0] );
-
-			IRC_SetPenalty( target, 2 );
 		}
 
 		return CONNECTED;
 	}
 	else if( Client_Type( Client ) == CLIENT_SERVER )
 	{
-		/* Server introduces new client */
+		/* Server fuehrt neuen Client ein */
 
 		/* Falsche Anzahl Parameter? */
 		if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
@@ -324,7 +255,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 		}
 
 		/* Neue Client-Struktur anlegen */
-		c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], true);
+		c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], TRUE );
 		if( ! c )
 		{
 			/* Eine neue Client-Struktur konnte nicht angelegt werden.
@@ -348,13 +279,9 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_NICK */
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_USER( CLIENT *Client, REQUEST *Req )
 {
-#ifdef IDENTAUTH
-	char *ptr;
-#endif
-
 	assert( Client != NULL );
 	assert( Req != NULL );
 
@@ -364,21 +291,11 @@ IRC_USER( CLIENT *Client, REQUEST *Req )
 	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
 #endif
 	{
-		/* Wrong number of parameters? */
+		/* Falsche Anzahl Parameter? */
 		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-		/* User name */
-#ifdef IDENTAUTH
-		ptr = Client_User( Client );
-		if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false );
-#else
-		Client_SetUser( Client, Req->argv[0], false );
-#endif
-
-		/* "Real name" or user info text: Don't set it to the empty string, the original ircd
-		 * can't deal with such "real names" (e. g. "USER user * * :") ... */
-		if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] );
-		else Client_SetInfo( Client, "-" );
+		Client_SetUser( Client, Req->argv[0], FALSE );
+		Client_SetInfo( Client, Req->argv[3] );
 
 		Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client ));
 		if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client );
@@ -393,25 +310,21 @@ IRC_USER( CLIENT *Client, REQUEST *Req )
 } /* IRC_USER */
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_QUIT( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target;
-	char quitmsg[LINE_LEN];
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
-		
-	/* Wrong number of arguments? */
-	if( Req->argc > 1 )
-		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	if (Req->argc == 1)
-		strlcpy(quitmsg, Req->argv[0], sizeof quitmsg);
 
 	if ( Client_Type( Client ) == CLIENT_SERVER )
 	{
 		/* Server */
+
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
 		target = Client_Search( Req->prefix );
 		if( ! target )
 		{
@@ -420,230 +333,149 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req )
 			return CONNECTED;
 		}
 
-		Client_Destroy( target, "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
+		if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, TRUE );
+		else Client_Destroy( target, "Got QUIT command.", Req->argv[0], TRUE );
 
 		return CONNECTED;
 	}
 	else
 	{
-		if (Req->argc == 1 && quitmsg[0] != '\"') {
-			/* " " to avoid confusion */
-			strlcpy(quitmsg, "\"", sizeof quitmsg);
-			strlcat(quitmsg, Req->argv[0], sizeof quitmsg-1);
-			strlcat(quitmsg, "\"", sizeof quitmsg );
-		}
-
 		/* User, Service, oder noch nicht registriert */
-		Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true);
+		
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
+		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
 		
 		return DISCONNECTED;
 	}
 } /* IRC_QUIT */
 
 
-GLOBAL bool
-IRC_PING(CLIENT *Client, REQUEST *Req)
+GLOBAL BOOLEAN
+IRC_PING( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
 
-	assert(Client != NULL);
-	assert(Req != NULL);
+	assert( Client != NULL );
+	assert( Req != NULL );
 
-	/* Wrong number of arguments? */
-	if (Req->argc < 1)
-		return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
-					  Client_ID(Client));
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
 #ifdef STRICT_RFC
-	/* Don't ignore additional arguments when in "strict" mode */
-	if (Req->argc > 2)
-		 return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					   Client_ID(Client), Req->command);
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 #endif
 
-	if (Req->argc > 1) {
-		/* A target has been specified ... */
-		target = Client_Search(Req->argv[1]);
-
-		if (!target || Client_Type(target) != CLIENT_SERVER)
-			return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
-					Client_ID(Client), Req->argv[1]);
-
-		if (target != Client_ThisServer()) {
-			/* Ok, we have to forward the PING */
-			if (Client_Type(Client) == CLIENT_SERVER)
-				from = Client_Search(Req->prefix);
-			else
-				from = Client;
-			if (!from)
-				return IRC_WriteStrClient(Client,
-						ERR_NOSUCHSERVER_MSG,
-						Client_ID(Client), Req->prefix);
-
-			return IRC_WriteStrClientPrefix(target, from,
-					"PING %s :%s", Req->argv[0],
-					Req->argv[1] );
+	if( Req->argc > 1 )
+	{
+		/* es wurde ein Ziel-Client angegeben */
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		if( target != Client_ThisServer( ))
+		{
+			/* ok, forwarden */
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+			else from = Client;
+			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+			return IRC_WriteStrClientPrefix( target, from, "PING %s :%s", Client_ID( from ), Req->argv[1] );
 		}
 	}
 
-	if (Client_Type(Client) == CLIENT_SERVER) {
-		if (Req->prefix)
-			from = Client_Search(Req->prefix);
-		else
-			from = Client;
-	} else
-		from = Client_ThisServer();
-	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
-					Client_ID(Client), Req->prefix);
-
-	Log(LOG_DEBUG, "Connection %d: got PING, sending PONG ...",
-	    Client_Conn(Client));
-
-#ifdef STRICT_RFC
-	return IRC_WriteStrClient(Client, "PONG %s :%s",
-		Client_ID(from), Client_ID(Client));
-#else
-	/* Some clients depend on the argument being returned in the PONG
-	 * reply (not mentioned in any RFC, though) */
-	return IRC_WriteStrClient(Client, "PONG %s :%s",
-		Client_ID(from), Req->argv[0]);
-#endif
+	Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client ));
+	return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client ));
 } /* IRC_PING */
 
 
-GLOBAL bool
-IRC_PONG(CLIENT *Client, REQUEST *Req)
+GLOBAL BOOLEAN
+IRC_PONG( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
-	char *s;
 
-	assert(Client != NULL);
-	assert(Req != NULL);
+	assert( Client != NULL );
+	assert( Req != NULL );
 
-	/* Wrong number of arguments? */
-	if (Req->argc < 1)
-		return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
-					  Client_ID(Client));
-	if (Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	/* Forward? */
-	if (Req->argc == 2 && Client_Type(Client) == CLIENT_SERVER) {
-		target = Client_Search(Req->argv[0]);
-		if (!target)
-			return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
-					Client_ID(Client), Req->argv[0]);
-
-		from = Client_Search(Req->prefix);
-
-		if (target != Client_ThisServer() && target != from) {
-			/* Ok, we have to forward the message. */
-			if (!from)
-				return IRC_WriteStrClient(Client,
-						ERR_NOSUCHSERVER_MSG,
-						Client_ID(Client), Req->prefix);
-
-			if (Client_Type(Client_NextHop(target)) != CLIENT_SERVER)
-				s = Client_ID(from);
-			else
-				s = Req->argv[0];
-			return IRC_WriteStrClientPrefix(target, from,
-				 "PONG %s :%s", s, Req->argv[1]);
+	/* forwarden? */
+	if( Req->argc == 2 )
+	{
+		target = Client_Search( Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		if( target != Client_ThisServer( ))
+		{
+			/* ok, forwarden */
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+			else from = Client;
+			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+			return IRC_WriteStrClientPrefix( target, from, "PONG %s :%s", Client_ID( from ), Req->argv[1] );
 		}
 	}
 
-	/* The connection timestamp has already been updated when the data has
-	 * been read from so socket, so we don't need to update it here. */
+	/* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
+	 * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
 
-	if (Client_Conn(Client) > NONE)
-		Log(LOG_DEBUG,
-			"Connection %d: received PONG. Lag: %ld seconds.",
-			Client_Conn(Client),
-			time(NULL) - Conn_LastPing(Client_Conn(Client)));
-	else
-		 Log(LOG_DEBUG,
-			"Connection %d: received PONG.", Client_Conn(Client));
+	if( Client_Conn( Client ) > NONE ) Log( LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", Client_Conn( Client ), time( NULL ) - Conn_LastPing( Client_Conn( Client )));
+	else Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client ));
 
 	return CONNECTED;
 } /* IRC_PONG */
 
 
-static bool
-Hello_User(CLIENT * Client)
+LOCAL BOOLEAN
+Hello_User( CLIENT *Client )
 {
-	assert(Client != NULL);
+	assert( Client != NULL );
 
-	/* Check password ... */
-	if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) {
-		/* Bad password! */
-		Log(LOG_ERR,
-		    "User \"%s\" rejected (connection %d): Bad password!",
-		    Client_Mask(Client), Client_Conn(Client));
-		Conn_Close(Client_Conn(Client), NULL, "Bad password", true);
+	/* Passwort ueberpruefen */
+	if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
+	{
+		/* Falsches Passwort */
+		Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
+		Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
 		return DISCONNECTED;
 	}
 
-	Log(LOG_NOTICE, "User \"%s\" registered (connection %d).",
-	    Client_Mask(Client), Client_Conn(Client));
+	Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
 
-	/* Inform other servers */
-	IRC_WriteStrServers(NULL, "NICK %s 1 %s %s 1 +%s :%s",
-			    Client_ID(Client), Client_User(Client),
-			    Client_Hostname(Client), Client_Modes(Client),
-			    Client_Info(Client));
+	/* Andere Server informieren */
+	IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
 
-	if (!IRC_WriteStrClient
-	    (Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client)))
-		return false;
-	if (!IRC_WriteStrClient
-	    (Client, RPL_YOURHOST_MSG, Client_ID(Client),
-	     Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU,
-	     TARGET_VENDOR, TARGET_OS))
-		return false;
-	if (!IRC_WriteStrClient
-	    (Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr))
-		return false;
-	if (!IRC_WriteStrClient
-	    (Client, RPL_MYINFO_MSG, Client_ID(Client),
-	     Client_ID(Client_ThisServer()), PACKAGE_VERSION, USERMODES,
-	     CHANMODES))
-		return false;
+	if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
+	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
+	if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
+	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;
 
-	/* Features supported by this server (005 numeric, ISUPPORT),
-	 * see <http://www.irc.org/tech_docs/005.html> for details. */
-	if (!IRC_Send_ISUPPORT(Client))
-		return DISCONNECTED;
+	/* Features */
+	if( ! IRC_WriteStrClient( Client, RPL_FEATURE_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;
 
-	Client_SetType(Client, CLIENT_USER);
+	Client_SetType( Client, CLIENT_USER );
 
-	if (!IRC_Send_LUSERS(Client))
-		return DISCONNECTED;
-	if (!IRC_Show_MOTD(Client))
-		return DISCONNECTED;
-
-	/* Suspend the client for a second ... */
-	IRC_SetPenalty(Client, 1);
+	if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED;
+	if( ! IRC_Show_MOTD( Client )) return DISCONNECTED;
 
 	return CONNECTED;
 } /* Hello_User */
 
 
-static void
-Kill_Nick( char *Nick, char *Reason )
+LOCAL VOID
+Kill_Nick( CHAR *Nick, CHAR *Reason )
 {
-	REQUEST r;
+	CLIENT *c;
 
 	assert( Nick != NULL );
 	assert( Reason != NULL );
 
-	r.prefix = (char *)Client_ThisServer( );
-	r.argv[0] = Nick;
-	r.argv[1] = Reason;
-	r.argc = 2;
-
 	Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason );
-	IRC_KILL( Client_ThisServer( ), &r );
+
+	/* andere Server benachrichtigen */
+	IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason );
+
+	/* Ggf. einen eigenen Client toeten */
+	c = Client_Search( Nick );
+	if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE );
 } /* Kill_Nick */
 
 

src/ngircd/irc-login.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-login.h,v 1.6 2005/03/19 18:43:48 fw Exp $
+ * $Id: irc-login.h,v 1.5 2002/12/12 12:23:43 alex Exp $
  *
  * Login and logout (header)
  */
@@ -18,12 +18,12 @@
 #define __irc_login_h__
 
 
-GLOBAL bool IRC_PASS PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_NICK PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_USER PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PASS PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_NICK PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_USER PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PING PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req ));
 
 
 #endif

src/ngircd/irc-mode.c

@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 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
@@ -14,16 +14,18 @@
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.24.2.5 2003/01/21 21:05:19 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
+#include "defines.h"
 #include "irc-write.h"
 #include "lists.h"
 #include "log.h"
@@ -36,16 +38,19 @@
 #include "irc-mode.h"
 
 
-static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
-static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
+LOCAL BOOLEAN Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
+LOCAL BOOLEAN Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
 
-static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern));
-static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern));
+LOCAL BOOLEAN Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+LOCAL BOOLEAN Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
 
-static bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask ));
+LOCAL BOOLEAN Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+LOCAL BOOLEAN Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+
+LOCAL BOOLEAN Send_ListChange PARAMS(( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask ));
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_MODE( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *cl, *origin;
@@ -64,34 +69,28 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
 		if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 	}
 	else origin = Client;
-
+	
 	/* Channel or user mode? */
-	cl = NULL; chan = NULL;
-	if (Client_IsValidNick(Req->argv[0]))
-		cl = Client_Search(Req->argv[0]);
-	if (Channel_IsValidName(Req->argv[0]))
-		chan = Channel_Search(Req->argv[0]);
+	cl = chan = NULL;
+	if( Client_IsValidNick( Req->argv[0] )) cl = Client_Search( Req->argv[0] );
+	if( Channel_IsValidName( Req->argv[0] )) chan = Channel_Search( Req->argv[0] );
 
-	if (cl)
-		return Client_Mode(Client, Req, origin, cl);
-	if (chan)
-		return Channel_Mode(Client, Req, origin, chan);
+	if( cl ) return Client_Mode( Client, Req, origin, cl );
+	if( chan ) return Channel_Mode( Client, Req, origin, chan );
 
 	/* No target found! */
-	return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-			Client_ID(Client), Req->argv[0]);
+	return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
 } /* IRC_MODE */
 
 
-static bool
+LOCAL BOOLEAN
 Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 {
 	/* Handle client mode requests */
 
-	char the_modes[COMMAND_LEN], x[2], *mode_ptr;
-	bool ok, set;
-	int mode_arg;
-	size_t len;
+	CHAR the_modes[COMMAND_LEN], x[2], *mode_ptr;
+	BOOLEAN ok, set;
+	INT mode_arg;
 
 	/* Is the client allowed to request or change the modes? */
 	if( Client_Type( Client ) == CLIENT_USER )
@@ -107,8 +106,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 	mode_ptr = Req->argv[mode_arg];
 
 	/* Initial state: set or unset modes? */
-	if( *mode_ptr == '+' ) set = true;
-	else if( *mode_ptr == '-' ) set = false;
+	if( *mode_ptr == '+' ) set = TRUE;
+	else if( *mode_ptr == '-' ) set = FALSE;
 	else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin ));
 
 	/* Prepare reply string */
@@ -135,20 +134,18 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 				if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
 				{
 					/* Action modifier ("+"/"-") must be changed ... */
-					len = strlen( the_modes ) - 1;
-					if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' ))
+					if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
 					{
 						/* Adjust last action modifier in result */
-						the_modes[len] = *mode_ptr;
+						the_modes[strlen( the_modes ) - 1] = *mode_ptr;
 					}
 					else
 					{
 						/* Append modifier character to result string */
-						x[0] = *mode_ptr;
-						strlcat( the_modes, x, sizeof( the_modes ));
+						x[0] = *mode_ptr; strcat( the_modes, x );
 					}
-					if( *mode_ptr == '+' ) set = true;
-					else set = false;
+					if( *mode_ptr == '+' ) set = TRUE;
+					else set = FALSE;
 				}
 				continue;
 		}
@@ -157,35 +154,37 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 		x[0] = '\0';
 		switch( *mode_ptr )
 		{
-			case 'i': /* Invisible */
-			case 's': /* Server messages */
-			case 'w': /* Wallops messages */
-				x[0] = *mode_ptr;
-				break;
-
-			case 'a': /* Away */
+			case 'a':
+				/* Away */
 				if( Client_Type( Client ) == CLIENT_SERVER )
 				{
 					x[0] = 'a';
-					Client_SetAway( Origin, DEFAULT_AWAY_MSG );
+					Client_SetAway( Client, DEFAULT_AWAY_MSG );
 				}
 				else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
 				break;
-
-			case 'o': /* IRC operator (only unsettable!) */
+			case 'i':
+				/* Invisible */
+				x[0] = 'i';
+				break;
+			case 'o':
+				/* IRC operator (only unsetable!) */
 				if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
 				{
-					Client_SetOperByMe( Target, false );
+					Client_SetOperByMe( Target, FALSE );
 					x[0] = 'o';
 				}
 				else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
 				break;
-
-			case 'r': /* Restricted (only settable) */
+			case 'r':
+				/* Restricted (only setable) */
 				if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r';
 				else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
 				break;
-
+			case 's':
+				/* Server messages */
+				x[0] = 's';
+				break;
 			default:
 				Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
 				if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
@@ -200,13 +199,13 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
 		if( set )
 		{
 			/* Set mode */
-			if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
+			if( Client_ModeAdd( Target, x[0] )) strcat( the_modes, x );
 
 		}
 		else
 		{
 			/* Unset mode */
-			if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
+			if( Client_ModeDel( Target, x[0] )) strcat( the_modes, x );
 		}		
 	}
 client_exit:
@@ -215,8 +214,7 @@ client_exit:
 	if( the_modes[1] )
 	{
 		/* Remoce needless action modifier characters */
-		len = strlen( the_modes ) - 1;
-		if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) the_modes[len] = '\0';
+		if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
 
 		if( Client_Type( Client ) == CLIENT_SERVER )
 		{
@@ -226,151 +224,128 @@ client_exit:
 		else
 		{
 			/* Send reply to client and inform other servers */
-			ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes );
+			ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s", Client_ID( Target ), the_modes );
 			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes );
 		}
 		Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( Target ), Client_Modes( Target ));
 	}
-	
-	IRC_SetPenalty( Client, 1 );	
+		
 	return ok;
 } /* Client_Mode */
 
 
-static bool
-Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel)
-{
-	char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], argadd[CLIENT_PASS_LEN];
-	const char *mode_ptr;
-
-	/* Member or not? -- That's the question! */
-	if (!Channel_IsMemberOf(Channel, Origin))
-		return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
-			Client_ID(Origin), Channel_Name(Channel), Channel_Modes(Channel));
-
-	/* The sender is a member: generate extended reply */
-	strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
-	mode_ptr = the_modes;
-	the_args[0] = '\0';
-
-	while(*mode_ptr) {
-		switch(*mode_ptr) {
-		case 'l':
-			snprintf(argadd, sizeof(argadd), " %lu", Channel_MaxUsers(Channel));
-			strlcat(the_args, argadd, sizeof(the_args));
-			break;
-		case 'k':
-			strlcat(the_args, " ", sizeof(the_args));
-			strlcat(the_args, Channel_Key(Channel), sizeof(the_args));
-			break;
-		}
-		mode_ptr++;
-	}
-	if (the_args[0])
-		strlcat(the_modes, the_args, sizeof(the_modes));
-
-	return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
-		Client_ID(Origin), Channel_Name(Channel), the_modes);
-}
-
-
-static bool
+LOCAL BOOLEAN
 Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 {
 	/* Handle channel and channel-user modes */
 
-	char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
-	bool ok, set, modeok = true, skiponce, use_servermode = false, retval;
-	int mode_arg, arg_arg;
+	CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
+	BOOLEAN ok, set, modeok, skiponce;
+	INT mode_arg, arg_arg;
 	CLIENT *client;
-	long l;
-	size_t len;
+	LONG l;
 
 	/* Mode request: let's answer it :-) */
-	if (Req->argc <= 1)
-		return Channel_Mode_Answer_Request(Origin, Channel);
+	if( Req->argc == 1 )
+	{
+		/* Member or not? -- That's the question! */
+		if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), Channel_Modes( Channel ));
+
+		/* The sender is a member: generate extended reply */
+		strcpy( the_modes, Channel_Modes( Channel ));
+		mode_ptr = the_modes;
+		strcpy( the_args, "" );
+		while( *mode_ptr )
+		{
+			switch( *mode_ptr )
+			{
+				case 'l':
+					snprintf( argadd, sizeof( argadd ), " %ld", Channel_MaxUsers( Channel ));
+					strcat( the_args, argadd );
+					break;
+				case 'k':
+					strcat( the_args, " " );
+					strcat( the_args, Channel_Key( Channel ));
+					break;
+			}
+			mode_ptr++;
+		}
+		if( the_args[0] ) strcat( the_modes, the_args );
+
+		return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), the_modes );
+	}
 
 	/* Is the user allowed to change modes? */
-	if (Client_Type(Client) == CLIENT_USER) {
+	if( Client_Type( Client ) == CLIENT_USER )
+	{
 		/* Is the originating user on that channel? */
-		if (!Channel_IsMemberOf(Channel, Origin))
-			return IRC_WriteStrClient(Origin, ERR_NOTONCHANNEL_MSG,
-				Client_ID(Origin), Channel_Name(Channel));
-		modeok = false;
-		/* channel operator? */
-		if (strchr(Channel_UserModes(Channel, Origin), 'o'))
-			modeok = true;
-		else if(Conf_OperCanMode) {
-			/* IRC-Operators can use MODE as well */
-			if (Client_OperByMe(Origin)) {
-				modeok = true;
-				if (Conf_OperServerMode)
-					use_servermode = true; /* Change Origin to Server */
-			}
+		if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+
+		/* Is he channel operator? */
+		if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE;
+		else modeok = FALSE;
+		if( Conf_OperCanMode )
+		{
+			/* auch IRC-Operatoren duerfen MODE verwenden */
+			if( Client_OperByMe( Origin )) modeok = TRUE;
 		}
 	}
+	else modeok = TRUE;
 
 	mode_arg = 1;
 	mode_ptr = Req->argv[mode_arg];
-	if (Req->argc > mode_arg + 1)
-		arg_arg = mode_arg + 1;
-	else
-		arg_arg = -1;
+	if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1;
+	else arg_arg = -1;
 
 	/* Initial state: set or unset modes? */
-	skiponce = false;
-	switch (*mode_ptr) {
-	case '-': set = false; break;
-	case '+': set = true; break;
-	default:
-		set = true;
-		skiponce = true;
-	}
+	skiponce = FALSE;
+	if( *mode_ptr == '-' ) set = FALSE;
+	else if( *mode_ptr == '+' ) set = TRUE;
+	else set = skiponce = TRUE;
 
 	/* Prepare reply string */
-	strcpy(the_modes, set ? "+" : "-");
-	the_args[0] = '\0';
+	if( set ) strcpy( the_modes, "+" );
+	else strcpy( the_modes, "-" );
+	strcpy( the_args, " " );
 
 	x[1] = '\0';
 	ok = CONNECTED;
-	while (mode_ptr) {
-		if (! skiponce)
-			mode_ptr++;
-		if (!*mode_ptr) {
+	while( mode_ptr )
+	{
+		if( ! skiponce ) mode_ptr++;
+		if( ! *mode_ptr )
+		{
 			/* Try next argument if there's any */
-			if (arg_arg > mode_arg)
-				mode_arg = arg_arg;
-			else
-				mode_arg++;
-
-			if (mode_arg >= Req->argc)
-				break;
-			mode_ptr = Req->argv[mode_arg];
-
-			if (Req->argc > mode_arg + 1)
-				arg_arg = mode_arg + 1;
-			else
-				arg_arg = -1;
+			if( arg_arg > mode_arg ) mode_arg = arg_arg;
+			else mode_arg++;
+			if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg];
+			else break;
+			if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1;
+			else arg_arg = -1;
 		}
-		skiponce = false;
+		skiponce = FALSE;
 
-		switch (*mode_ptr) {
-		case '+':
-		case '-':
-			if (((*mode_ptr == '+') && !set) || ((*mode_ptr == '-') && set)) {
-				/* Action modifier ("+"/"-") must be changed ... */
-				len = strlen( the_modes ) - 1;
-				if ((the_modes[len] == '+') || (the_modes[len] == '-')) {
-					/* Adjust last action modifier in result */
-					the_modes[len] = *mode_ptr;
-				} else {
-					/* Append modifier character to result string */
-					x[0] = *mode_ptr;
-					strlcat(the_modes, x, sizeof(the_modes));
+		switch( *mode_ptr )
+		{
+			case '+':
+			case '-':
+				if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
+				{
+					/* Action modifier ("+"/"-") must be changed ... */
+					if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
+					{
+						/* Adjust last action modifier in result */
+						the_modes[strlen( the_modes ) - 1] = *mode_ptr;
+					}
+					else
+					{
+						/* Append modifier character to result string */
+						x[0] = *mode_ptr; strcat( the_modes, x );
+					}
+					if( *mode_ptr == '+' ) set = TRUE;
+					else set = FALSE;
 				}
-				set = *mode_ptr == '+';
-			}
-			continue;
+				continue;
 		}
 
 		/* Are there arguments left? */
@@ -380,199 +355,250 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
 		x[0] = '\0';
 		argadd[0] = '\0';
 		client = NULL;
-		switch (*mode_ptr) {
-		/* --- Channel modes --- */
-		case 'i': /* Invite only */
-		case 'm': /* Moderated */
-		case 'n': /* Only members can write */
-		case 's': /* Secret channel */
-		case 't': /* Topic locked */
-			if (modeok)
-				x[0] = *mode_ptr;
-			else
-				ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
-			break;
-		case 'k': /* Channel key */
-			if (! set) {
-				if (modeok)
-					x[0] = *mode_ptr;
-				else
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
+		switch( *mode_ptr )
+		{
+			/* Channel modes */
+			case 'i':
+				/* Invite-Only */
+				if( modeok ) x[0] = 'i';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
 				break;
-			}
-			if (arg_arg > mode_arg) {
-				if (modeok) {
-					Channel_ModeDel(Channel, 'k');
-					Channel_SetKey(Channel, Req->argv[arg_arg]);
-					strlcpy(argadd, Channel_Key(Channel), sizeof(argadd));
-					x[0] = *mode_ptr;
-				} else {
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
+			case 'm':
+				/* Moderated */
+				if( modeok ) x[0] = 'm';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 'n':
+				/* kein Schreiben in den Channel von aussen */
+				if( modeok ) x[0] = 'n';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 't':
+				/* Topic Lock */
+				if( modeok ) x[0] = 't';
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+				break;
+			case 'P':
+				/* Persistent channel */
+				if( modeok )
+				{
+					if( set && ( ! Client_OperByMe( Client )))
+					{
+						/* Only IRC operators are allowed to set P mode */
+						ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+					}
+					else x[0] = 'P';
 				}
-				Req->argv[arg_arg][0] = '\0';
-				arg_arg++;
-			} else {
-				ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command);
-			}
-			break;
-		case 'l': /* Member limit */
-			if (!set) {
-				if (modeok)
-					x[0] = *mode_ptr;
-				else
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
+				else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
 				break;
-			}
-			if (arg_arg > mode_arg) {
-				if (modeok) {
-					l = atol(Req->argv[arg_arg]);
-					if (l > 0 && l < 0xFFFF) {
-						Channel_ModeDel(Channel, 'l');
-						Channel_SetMaxUsers(Channel, l);
-						snprintf(argadd, sizeof(argadd), "%ld", l);
+
+			/* Channel user modes */
+			case 'o':
+				/* Channel operator */
+			case 'v':
+				/* Voice */
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						client = Client_Search( Req->argv[arg_arg] );
+						if( client ) x[0] = *mode_ptr;
+						else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
+			case 'k':
+				/* Channel key */
+				if( ! set )
+				{
+					if( modeok ) x[0] = *mode_ptr;
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					break;
+				}
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						Channel_ModeDel( Channel, 'k' );
+						Channel_SetKey( Channel, Req->argv[arg_arg] );
+						strcpy( argadd, Channel_Key( Channel ));
 						x[0] = *mode_ptr;
 					}
-				} else {
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
 				}
-				Req->argv[arg_arg][0] = '\0';
-				arg_arg++;
-			} else {
-				ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command);
-			}
-			break;
-		case 'P': /* Persistent channel */
-			if (modeok) {
-				/* Only IRC operators are allowed to
-				 * set the 'P' channel mode! */
-				if (set && !(Client_OperByMe(Client) || Client_Type(Client) == CLIENT_SERVER))
-					ok = IRC_WriteStrClient(Origin, ERR_NOPRIVILEGES_MSG, Client_ID(Origin));
-				else
-						x[0] = 'P';
-			} else
-				ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
-			break;
-		/* --- Channel user modes --- */
-		case 'o': /* Channel operator */
-		case 'v': /* Voice */
-			if (arg_arg > mode_arg) {
-				if (modeok) {
-					client = Client_Search(Req->argv[arg_arg]);
-					if (client)
-						x[0] = *mode_ptr;
-					else
-						ok = IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->argv[arg_arg]);
-				} else {
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin), Channel_Name(Channel));
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
+			case 'l':
+				/* Member limit */
+				if( ! set )
+				{
+					if( modeok ) x[0] = *mode_ptr;
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					break;
 				}
-				Req->argv[arg_arg][0] = '\0';
-				arg_arg++;
-			} else {
-				ok = IRC_WriteStrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command);
-			}
-			break;
-		/* --- Channel lists --- */
-		case 'I': /* Invite lists */
-		case 'b': /* Ban lists */
-			if (arg_arg > mode_arg) {
-				/* modify list */
-				if (modeok) {
-					ok = set ? Add_Ban_Invite(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg])
-						 : Del_Ban_Invite(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]);
-				} else {
-					ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG,
-							Client_ID(Origin), Channel_Name(Channel));
+				if( arg_arg > mode_arg )
+				{
+					if( modeok )
+					{
+						l = atol( Req->argv[arg_arg] );
+						if( l > 0 && l < 0xFFFF )
+						{
+							Channel_ModeDel( Channel, 'l' );
+							Channel_SetMaxUsers( Channel, l );
+							sprintf( argadd, "%ld", l );
+							x[0] = *mode_ptr;
+						}
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
 				}
-				Req->argv[arg_arg][0] = '\0';
-				arg_arg++;
-			} else {
-				if (*mode_ptr == 'I')
-					Channel_ShowInvites(Origin, Channel);
-				else
-					Channel_ShowBans(Origin, Channel);
-			}
-			break;
-		default:
-			Log(LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?",
-				set ? '+' : '-', *mode_ptr, Client_ID(Origin), Channel_Name(Channel));
-			if (Client_Type(Client) != CLIENT_SERVER)
-				ok = IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID(Origin), set ? '+' : '-', *mode_ptr);
-			x[0] = '\0';
-			goto chan_exit;
-		} /* switch() */
+				else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+				break;
 
-		if (!ok)
-			break;
+			/* Channel lists */
+			case 'I':
+				/* Invite lists */
+				if( arg_arg > mode_arg )
+				{
+					/* modify list */
+					if( modeok )
+					{
+						if( set ) Add_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
+						else Del_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else Lists_ShowInvites( Origin, Channel );
+				break;
+			case 'b':
+				/* Ban lists */
+				if( arg_arg > mode_arg )
+				{
+					/* modify list */
+					if( modeok )
+					{
+						if( set ) Add_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
+						else Del_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
+					}
+					else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+					Req->argv[arg_arg][0] = '\0';
+					arg_arg++;
+				}
+				else Lists_ShowBans( Origin, Channel );
+				break;
+
+			default:
+				Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel ));
+				if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
+				x[0] = '\0';
+				goto chan_exit;
+		}
+		if( ! ok ) break;
 
 		/* Is there a valid mode change? */
-		if (!x[0])
-			continue;
+		if( ! x[0] ) continue;
 
 		/* Validate target client */
-		if (client && (!Channel_IsMemberOf(Channel, client))) {
-			if (!IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
-				Client_ID(Origin), Client_ID(client), Channel_Name(Channel)))
-					break;
-
+		if( client && ( ! Channel_IsMemberOf( Channel, client )))
+		{
+			if( ! IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( client ), Channel_Name( Channel ))) break;
 			continue;
 		}
 
-		if (client) {
-			/* Channel-User-Mode */
-			retval = set ? Channel_UserModeAdd(Channel, client, x[0]) : Channel_UserModeDel(Channel, client, x[0]);
-			if (retval) {
-				strlcat(the_args, " ", sizeof(the_args));
-				strlcat(the_args, Client_ID(client), sizeof(the_args));
-				strlcat(the_modes, x, sizeof(the_modes));
-				Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"",
-					Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client));
+		if( set )
+		{
+			/* Set mode */
+			if( client )
+			{
+				/* Channel-User-Mode */
+				if( Channel_UserModeAdd( Channel, client, x[0] ))
+				{
+					strcat( the_args, Client_ID( client ));
+					strcat( the_args, " " ); strcat( the_modes, x );
+					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
+				}
 			}
-		} else {
-			/* Channel-Mode */
-			retval = set ? Channel_ModeAdd(Channel, x[0]) : Channel_ModeDel(Channel, x[0]);
-			if (retval) {
-				strlcat(the_modes, x, sizeof(the_modes));
-				Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel));
+			else
+			{
+				/* Channel-Mode */
+				if( Channel_ModeAdd( Channel, x[0] ))
+				{
+					strcat( the_modes, x );
+					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
+				}
+			}
+		}
+		else
+		{
+			/* Unset mode */
+			if( client )
+			{
+				/* Channel-User-Mode */
+				if( Channel_UserModeDel( Channel, client, x[0] ))
+				{
+					strcat( the_args, Client_ID( client ));
+					strcat( the_args, " " ); strcat( the_modes, x );
+					Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
+				}
+			}
+			else
+			{
+				/* Channel-Mode */
+				if( Channel_ModeDel( Channel, x[0] ))
+				{
+					strcat( the_modes, x );
+					Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
+				}
 			}
 		}
 
 		/* Are there additional arguments to add? */
-		if (argadd[0]) {
-			strlcat(the_args, " ", sizeof(the_args));
-			strlcat(the_args, argadd, sizeof(the_args));
+		if( argadd[0] )
+		{
+			if( the_args[strlen( the_args ) - 1] != ' ' ) strcat( the_args, " " );
+			strcat( the_args, argadd );
 		}
 	}
 chan_exit:
-	/* Are there changed modes? */
-	if (the_modes[1]) {
-		/* Clean up mode string */
-		len = strlen(the_modes) - 1;
-		if ((the_modes[len] == '+') || (the_modes[len] == '-'))
-			the_modes[len] = '\0';
 
-		if (Client_Type(Client) == CLIENT_SERVER) {
+	/* Are there changed modes? */
+	if( the_modes[1] )
+	{
+		/* Clean up mode string */
+		if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
+
+		/* Clean up argument string if there are none */
+		if( ! the_args[1] ) the_args[0] = '\0';
+
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
 			/* Forward mode changes to channel users and other servers */
-			IRC_WriteStrServersPrefix(Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args);
-			IRC_WriteStrChannelPrefix(Client, Channel, Origin, false, "MODE %s %s%s", Channel_Name(Channel), the_modes, the_args);
-		} else {
-			if (use_servermode)
-				Origin = Client_ThisServer();
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+		}
+		else
+		{
 			/* Send reply to client and inform other servers and channel users */
-			ok = IRC_WriteStrClientPrefix(Client, Origin, "MODE %s %s%s",
-					Channel_Name(Channel), the_modes, the_args);
-			IRC_WriteStrServersPrefix(Client, Origin, "MODE %s %s%s",
-					Channel_Name(Channel), the_modes, the_args);
-			IRC_WriteStrChannelPrefix(Client, Channel, Origin, false, "MODE %s %s%s",
-						Channel_Name(Channel), the_modes, the_args);
+			ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+			IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
 		}
 	}
 
-	IRC_SetPenalty(Client, 1);
 	return CONNECTED;
 } /* Channel_Mode */
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_AWAY( CLIENT *Client, REQUEST *Req )
 {
 	assert( Client != NULL );
@@ -599,82 +625,87 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
 } /* IRC_AWAY */
 
 
-static bool
-Add_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)
+LOCAL BOOLEAN
+Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 {
-	const char *mask;
-	bool already;
-	bool ret;
+	CHAR *mask;
 
 	assert( Client != NULL );
 	assert( Channel != NULL );
 	assert( Pattern != NULL );
-	assert(what == 'I' || what == 'b');
-
-	mask = Lists_MakeMask(Pattern);
-
-	already = Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask);
-	if (!already) {
-		if (what == 'I')
-			ret = Channel_AddInvite(Channel, mask, false);
-		else
-			ret = Channel_AddBan(Channel, mask);
-		if (!ret)
-			return CONNECTED;
-	}
-	if (already && (Client_Type(Prefix) == CLIENT_SERVER))
-		return CONNECTED;
-
-	if (what == 'I')
-		return Send_ListChange("+I", Prefix, Client, Channel, mask);
-	return Send_ListChange("+b", Prefix, Client, Channel, mask);
-}
-
-
-static bool
-Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)
-{
-	const char *mask;
-	struct list_head *list;
-
-	assert( Client != NULL );
-	assert( Channel != NULL );
-	assert( Pattern != NULL );
-	assert(what == 'I' || what == 'b');
 
 	mask = Lists_MakeMask( Pattern );
 
-	if (what == 'I')
-		list = Channel_GetListInvites(Channel);
-	else
-		list = Channel_GetListBans(Channel);
+	if( ! Lists_AddInvited( Prefix, mask, Channel, FALSE )) return CONNECTED;
+	return Send_ListChange( "+I", Prefix, Client, Channel, mask );
+} /* Add_Invite */
 
-	Lists_Del(list, mask);
-	if (what == 'I')
-		return Send_ListChange( "-I", Prefix, Client, Channel, mask );
+
+LOCAL BOOLEAN
+Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+
+	if( ! Lists_AddBanned( Prefix, mask, Channel )) return CONNECTED;
+	return Send_ListChange( "+b", Prefix, Client, Channel, mask );
+} /* Add_Ban */
+
+
+LOCAL BOOLEAN
+Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+	Lists_DelInvited( mask, Channel );
+	return Send_ListChange( "-I", Prefix, Client, Channel, mask );
+} /* Del_Invite */
+
+
+LOCAL BOOLEAN
+Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+{
+	CHAR *mask;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+	assert( Pattern != NULL );
+
+	mask = Lists_MakeMask( Pattern );
+	Lists_DelBanned( mask, Channel );
 	return Send_ListChange( "-b", Prefix, Client, Channel, mask );
-}
+} /* Del_Ban */
 
 
-static bool
-Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask )
+LOCAL BOOLEAN
+Send_ListChange( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask )
 {
 	/* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */
 
-	bool ok;
+	BOOLEAN ok;
 
 	if( Client_Type( Client ) == CLIENT_USER )
 	{
 		/* Bestaetigung an Client */
 		ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
 	}
-	else ok = true;
+	else ok = TRUE;
 
 	/* an andere Server */
 	IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
 
 	/* und lokale User im Channel */
-	IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+	IRC_WriteStrChannelPrefix( Client, Channel, Prefix, FALSE, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
 	
 	return ok;
 } /* Send_ListChange */

src/ngircd/irc-mode.h

@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-mode.h,v 1.6 2005/03/19 18:43:48 fw Exp $
+ * $Id: irc-mode.h,v 1.5 2002/12/12 12:23:43 alex Exp $
  *
  * IRC commands for mode changes (header)
  */
@@ -18,8 +18,8 @@
 #define __irc_mode_h__
 
 
-GLOBAL bool IRC_MODE PARAMS((CLIENT *Client, REQUEST *Req ));
-GLOBAL bool IRC_AWAY PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_MODE PARAMS((CLIENT *Client, REQUEST *Req ));
+GLOBAL BOOLEAN IRC_AWAY PARAMS((CLIENT *Client, REQUEST *Req ));
 
 
 #endif

src/ngircd/irc-op.c

@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by 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
@@ -14,17 +14,17 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
+static char UNUSED id[] = "$Id: irc-op.c,v 1.11 2002/12/12 12:24:18 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
+#include "defines.h"
 #include "irc-write.h"
 #include "lists.h"
 #include "log.h"
@@ -35,7 +35,7 @@ static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
 #include "irc-op.h"
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_KICK( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
@@ -59,24 +59,24 @@ IRC_KICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_KICK */	
 
 
-GLOBAL bool
+GLOBAL BOOLEAN
 IRC_INVITE( CLIENT *Client, REQUEST *Req )
 {
 	CHANNEL *chan;
 	CLIENT *target, *from;
-	bool remember = false;
+	BOOLEAN remember = FALSE;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Wrong number of parameters? */
+	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
 	else from = Client;
 	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 	
-	/* Search user */
+	/* User suchen */
 	target = Client_Search( Req->argv[0] );
 	if(( ! target ) || ( Client_Type( target ) != CLIENT_USER )) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
 
@@ -84,38 +84,36 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
 
 	if( chan )
 	{
-		/* Channel exists. Is the user a valid member of the channel? */
+		/* Der Channel existiert bereits; ist der User Mitglied? */
 		if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] );
 
-		/* Is the channel "invite-only"? */
+		/* Ist der Channel "invite-only"? */
 		if( strchr( Channel_Modes( chan ), 'i' ))
 		{
-			/* Yes. The user must be channel operator! */
+			/* Ja. Der User muss Channel-Operator sein! */
 			if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
-			remember = true;
+			remember = TRUE;
 		}
 
-		/* Is the target user already member of the channel? */
+		/* Ist der Ziel-User bereits Mitglied? */
 		if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] );
-
-		/* If the target user is banned on that channel: remember invite */
-		if( Lists_Check(Channel_GetListBans(chan), target )) remember = true;
-
-		if (remember) {
-			/* We must remember this invite */
-			if( ! Channel_AddInvite(chan, Client_Mask( target ), true))
-				return CONNECTED;
-		}
 	}
 
-	LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
+	/* Wenn der User gebanned ist, so muss das Invite auch gespeichert werden */
+	if( Lists_CheckBanned( target, chan )) remember = TRUE;
 
-	/* Inform target client */
+	Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
+	if( remember )
+	{
+		if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED;
+	}
+	
+	/* an Ziel-Client forwarden ... */
 	IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );
 
 	if( Client_Conn( target ) > NONE )
 	{
-		/* The target user is local, so we have to send the status code */
+		/* lokaler Ziel-Client, Status-Code melden */
 		if( ! IRC_WriteStrClientPrefix( from, target, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED;
 	}