- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Fix up last Debian changelog entry
by alex＠arthur.barton.de 30 Mär '09

30 Mär '09

Module: ngircd.git Branch: master Commit: 166ab3925e8f3960cc761201a8fd96a026bf317c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=166ab392… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 30 13:44:04 2009 +0200 Fix up last Debian changelog entry --- contrib/Debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 1e88c6a..2efb45d 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,6 +1,6 @@ -ngircd (14~rc1-0ab1 unstable; urgency=low +ngircd (14~rc1-0ab1) unstable; urgency=low - * New "upstream" release candidate for 1 for ngIRCd Release 14. + * New "upstream" release candidate 1 for ngIRCd Release 14. -- Alexander Barton <alex(a)barton.de> Sun, 29 Mar 2009 17:09:17 +0200

1 0

Tag rel-14-rc1: Alexander Barton : ngIRCd release 14~rc1
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: refs/tags/rel-14-rc1 Tag: 3049bd4dca90a976ed1ea3e9834683f4e765b194 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=3049bd4dca9… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 17:24:36 2009 +0200 ngIRCd release 14~rc1

1 0

Alexander Barton : ngIRCd release 14~rc1
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: master Commit: 1f6a5744f62956704e11c2acef3778cdf5e1d46a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f6a5744… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 17:16:02 2009 +0200 ngIRCd release 14~rc1 --- ChangeLog | 3 ++- NEWS | 3 ++- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1794f4..d6acd2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,8 +10,9 @@ -- ChangeLog -- -ngIRCd Release 14~rc1 +ngIRCd Release 14 + ngIRCd 14~rc1 (2009-03-29) - Updated Debian/Linux init script (see contrib/Debian/ngircd.init). - Allow creation of persistent modeless channels. - The INFO command reports the compile time now (if available). diff --git a/NEWS b/NEWS index 2d3cbce..27276cf 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,9 @@ -- NEWS -- -ngIRCd Release 14~rc1 +ngIRCd Release 14 + ngIRCd 14~rc1 (2009-03-29) - Allow creation of persistent modeless channels. - The INFO command reports the compile time now (if available). - Support individual channel keys for pre-defined channels: introduce diff --git a/configure.in b/configure.in index be03945..98d9ac7 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 13) +AC_INIT(ngircd, 14~rc1) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 1e1b0e0..1e88c6a 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (14~rc1-0ab1 unstable; urgency=low + + * New "upstream" release candidate for 1 for ngIRCd Release 14. + + -- Alexander Barton <alex(a)barton.de> Sun, 29 Mar 2009 17:09:17 +0200 + ngircd (13-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 13. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index dc3dfd8..5800637 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 13 +%define version 14~rc1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Updated NEWS and ChangeLog files
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: master Commit: 156569d263a9fe9e6eb64df1730e7a9d73dcdb85 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=156569d2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 17:05:37 2009 +0200 Updated NEWS and ChangeLog files --- ChangeLog | 2 ++ NEWS | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0d1365..f1794f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ ngIRCd Release 14~rc1 + - Updated Debian/Linux init script (see contrib/Debian/ngircd.init). + - Allow creation of persistent modeless channels. - The INFO command reports the compile time now (if available). - Spell check and enhance ngIRCd manual pages. - Channel mode changes: break on syntax errors in MODE command. diff --git a/NEWS b/NEWS index 4e1fa0d..2d3cbce 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ ngIRCd Release 14~rc1 + - Allow creation of persistent modeless channels. + - The INFO command reports the compile time now (if available). - Support individual channel keys for pre-defined channels: introduce new configuration variable "KeyFile" in [Channel] sections in ngircd.conf, here a file can be configured for each pre-defined channel which contains

1 0

Alexander Barton : Updated Debian/Linux init script
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: master Commit: c3a8d6a73edd66a26ec731dd4bb02a8c272e3d9c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c3a8d6a7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 16:37:06 2009 +0200 Updated Debian/Linux init script - PidFile, ServerUID and ServerGID are read from actual server configuration - Exit code and behaviour is more LSB compliant - New "status" and "test" sub-functions --- contrib/Debian/ngircd.init | 154 +++++++++++++++++++++++++++++++------------ 1 files changed, 111 insertions(+), 43 deletions(-) diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index 7262429..f308dd2 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,18 +1,19 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008 Alexander Barton <alex(a)barton.de> +# Copyright 2008,2009 Alexander Barton <alex(a)barton.de> # ### BEGIN INIT INFO -# Provides: ircd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $syslog +# Provides: ngircd ircd +# Required-Start: $network $local_fs +# Required-Stop: +# Should-Start: $syslog $named # Should-Stop: $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Next Generation IRC Server +# Description: IRC daemon written from scratch ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin @@ -20,14 +21,16 @@ DAEMON=/usr/sbin/ngircd NAME=ngIRCd DESC="IRC daemon" PARAMS="" +STARTTIME=1 +DIETIME=10 + +test -x $DAEMON || exit 5 test -h "$0" && me=`readlink $0` || me="$0" BASENAME=`basename $me` test -r /etc/default/$BASENAME && . /etc/default/$BASENAME -test -x $DAEMON || exit 0 - # LSB compatibility functions that become used if there is no local # include file available. log_daemon_msg() { @@ -39,69 +42,134 @@ log_end_msg() { log_failure_msg() { echo "$*" } +log_warning_msg() { + log_failure_msg "$*" +} # Include LSB functions, if available: test -r /lib/lsb/init-functions && . /lib/lsb/init-functions +PIDFILE=`$DAEMON $PARAMS -t | tr -d ' ' | grep "^PidFile=" | cut -d'=' -f2` +[ -n "$PIDFILE" ] || PIDFILE="/var/run/ircd/ngircd.pid" + +r=3 + Check_Config() { # Make sure that the configuration of ngIRCd is valid: - $DAEMON --configtest >/dev/null 2>&1 - if [ $? -ne 0 ]; then - log_failure_msg "Configuration of $NAME is not valid, won't (re)start!" - log_failure_msg "Run \"$DAEMON --configtest\" and fix it up ..." - exit 1 - fi + $DAEMON $PARAMS --configtest >/dev/null 2>&1 + [ $? -eq 0 ] && return 0 + log_end_msg 1 + log_failure_msg "Configuration of $NAME is not valid, won't (re)start!" + log_failure_msg "Run \"$DAEMON --configtest\" and fix it up ..." + exit 6 +} + +Prepare() { # Make sure the PID file directory exists and is writable: - if [ ! -d /var/run/ircd ]; then - mkdir -p /var/run/ircd + user=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerUID="|cut -d'=' -f2` + group=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerGID="|cut -d'=' -f2` + piddir=`dirname "$PIDFILE"` + [ -d "$piddir" ] || mkdir -p "$piddir" 2>/dev/null + chown "$user:$group" "$piddir" 2>/dev/null + [ $? -eq 0 ] && return 0 + log_end_msg 1 + log_failure_msg "Failed to prepare '$piddir' for user '$user'!" + exit 1 +} + +Do_Start() { + if Do_Status; then + log_end_msg 0 + log_warning_msg "$NAME seems to be already running, nothing to do." + exit 0 fi - chown irc:irc /var/run/ircd + start-stop-daemon --start \ + --quiet --exec $DAEMON -- $PARAMS + sleep $STARTTIME + Do_Status || return 7 + return 0 +} + +Do_Stop() { + if ! Do_Status; then + log_end_msg 0 + log_warning_msg "$NAME seems not to be running, nothing to do." + exit 0 + fi + Do_ForceStop + return $? +} + +Do_ForceStop() { + [ -e $PIDFILE ] \ + && pidfile="--pidfile $PIDFILE" \ + || pidfile="" + start-stop-daemon --stop \ + --quiet --oknodo --exec $DAEMON $pidfile + for i in `seq 1 $DIETIME`; do + Do_Status || return 0 + sleep 1 + done + return 1 +} + +Do_Reload() { + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON + return $? +} + +Do_Status() { + [ -e $PIDFILE ] \ + && pidfile="--pidfile $PIDFILE" \ + || pidfile="" + start-stop-daemon --stop \ + --quiet --signal 0 --exec $DAEMON $pidfile >/dev/null + return $? } case "$1" in start) - Check_Config log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start \ - --quiet --exec $DAEMON -- $PARAMS - log_end_msg $? + Check_Config + Prepare + Do_Start; r=$? + log_end_msg $r ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" - [ -r /var/run/ircd/ngircd.pid ] \ - && PIDFILE="--pidfile /var/run/ircd/ngircd.pid" \ - || PIDFILE="" - start-stop-daemon --stop \ - --quiet --oknodo --exec $DAEMON $PIDFILE - log_end_msg $? + Do_Stop; r=$? + log_end_msg $r ;; reload|force-reload) - Check_Config log_daemon_msg "Reloading $DESC" "$NAME" - start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON - log_end_msg $? + Check_Config + Do_Reload; r=$? + log_end_msg $r ;; restart) - Check_Config log_daemon_msg "Restarting $DESC" "$NAME" - [ -r /var/run/ircd/ngircd.pid ] \ - && PIDFILE="--pidfile /var/run/ircd/ngircd.pid" \ - || PIDFILE="" - start-stop-daemon --stop \ - --quiet --oknodo --exec $DAEMON $PIDFILE - sleep 1 - start-stop-daemon --start \ - --quiet --exec $DAEMON -- $PARAMS - log_end_msg $? + Check_Config + Prepare + Do_ForceStop + Do_Start; r=$? + log_end_msg $r + ;; + status) + log_daemon_msg "Checking for $DESC" "$NAME" + Do_Status; r=$? + log_end_msg $r + ;; + test) + Check_Config + echo "Configuration of $DAEMON seems to be ok."; r=0 ;; *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - exit 1 + N=/etc/init.d/$NAME; r=2 + echo "Usage: $N {start|stop|restart|reload|force-reload|status|test}" >&2 ;; esac -exit 0 +exit $r # -eof-

1 0

Alexander Barton : Merge branch 'master' of /srv/git/ngircd
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: master Commit: e30155b1ca9860cc436f3f6d3a247f1080a90e52 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e30155b1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 15:54:21 2009 +0200 Merge branch 'master' of /srv/git/ngircd ---

1 0

Alexander Barton : Updated Debian/Linux init script
by alex＠arthur.barton.de 29 Mär '09

29 Mär '09

Module: ngircd.git Branch: master Commit: b93a9c89674b9d6e578f231c309f25d09ca3f3af URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b93a9c89… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 29 15:43:24 2009 +0200 Updated Debian/Linux init script - PidFile, ServerUID and ServerGID are read from actual server configuration - Exit code and behaviour is more LSB compliant - New "status" and "test" sub-functions --- contrib/Debian/ngircd.init | 154 +++++++++++++++++++++++++++++++------------ 1 files changed, 111 insertions(+), 43 deletions(-) diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index 7262429..f308dd2 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,18 +1,19 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008 Alexander Barton <alex(a)barton.de> +# Copyright 2008,2009 Alexander Barton <alex(a)barton.de> # ### BEGIN INIT INFO -# Provides: ircd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $syslog +# Provides: ngircd ircd +# Required-Start: $network $local_fs +# Required-Stop: +# Should-Start: $syslog $named # Should-Stop: $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Next Generation IRC Server +# Description: IRC daemon written from scratch ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin @@ -20,14 +21,16 @@ DAEMON=/usr/sbin/ngircd NAME=ngIRCd DESC="IRC daemon" PARAMS="" +STARTTIME=1 +DIETIME=10 + +test -x $DAEMON || exit 5 test -h "$0" && me=`readlink $0` || me="$0" BASENAME=`basename $me` test -r /etc/default/$BASENAME && . /etc/default/$BASENAME -test -x $DAEMON || exit 0 - # LSB compatibility functions that become used if there is no local # include file available. log_daemon_msg() { @@ -39,69 +42,134 @@ log_end_msg() { log_failure_msg() { echo "$*" } +log_warning_msg() { + log_failure_msg "$*" +} # Include LSB functions, if available: test -r /lib/lsb/init-functions && . /lib/lsb/init-functions +PIDFILE=`$DAEMON $PARAMS -t | tr -d ' ' | grep "^PidFile=" | cut -d'=' -f2` +[ -n "$PIDFILE" ] || PIDFILE="/var/run/ircd/ngircd.pid" + +r=3 + Check_Config() { # Make sure that the configuration of ngIRCd is valid: - $DAEMON --configtest >/dev/null 2>&1 - if [ $? -ne 0 ]; then - log_failure_msg "Configuration of $NAME is not valid, won't (re)start!" - log_failure_msg "Run \"$DAEMON --configtest\" and fix it up ..." - exit 1 - fi + $DAEMON $PARAMS --configtest >/dev/null 2>&1 + [ $? -eq 0 ] && return 0 + log_end_msg 1 + log_failure_msg "Configuration of $NAME is not valid, won't (re)start!" + log_failure_msg "Run \"$DAEMON --configtest\" and fix it up ..." + exit 6 +} + +Prepare() { # Make sure the PID file directory exists and is writable: - if [ ! -d /var/run/ircd ]; then - mkdir -p /var/run/ircd + user=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerUID="|cut -d'=' -f2` + group=`$DAEMON $PARAMS -t|tr -d ' '|grep "^ServerGID="|cut -d'=' -f2` + piddir=`dirname "$PIDFILE"` + [ -d "$piddir" ] || mkdir -p "$piddir" 2>/dev/null + chown "$user:$group" "$piddir" 2>/dev/null + [ $? -eq 0 ] && return 0 + log_end_msg 1 + log_failure_msg "Failed to prepare '$piddir' for user '$user'!" + exit 1 +} + +Do_Start() { + if Do_Status; then + log_end_msg 0 + log_warning_msg "$NAME seems to be already running, nothing to do." + exit 0 fi - chown irc:irc /var/run/ircd + start-stop-daemon --start \ + --quiet --exec $DAEMON -- $PARAMS + sleep $STARTTIME + Do_Status || return 7 + return 0 +} + +Do_Stop() { + if ! Do_Status; then + log_end_msg 0 + log_warning_msg "$NAME seems not to be running, nothing to do." + exit 0 + fi + Do_ForceStop + return $? +} + +Do_ForceStop() { + [ -e $PIDFILE ] \ + && pidfile="--pidfile $PIDFILE" \ + || pidfile="" + start-stop-daemon --stop \ + --quiet --oknodo --exec $DAEMON $pidfile + for i in `seq 1 $DIETIME`; do + Do_Status || return 0 + sleep 1 + done + return 1 +} + +Do_Reload() { + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON + return $? +} + +Do_Status() { + [ -e $PIDFILE ] \ + && pidfile="--pidfile $PIDFILE" \ + || pidfile="" + start-stop-daemon --stop \ + --quiet --signal 0 --exec $DAEMON $pidfile >/dev/null + return $? } case "$1" in start) - Check_Config log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start \ - --quiet --exec $DAEMON -- $PARAMS - log_end_msg $? + Check_Config + Prepare + Do_Start; r=$? + log_end_msg $r ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" - [ -r /var/run/ircd/ngircd.pid ] \ - && PIDFILE="--pidfile /var/run/ircd/ngircd.pid" \ - || PIDFILE="" - start-stop-daemon --stop \ - --quiet --oknodo --exec $DAEMON $PIDFILE - log_end_msg $? + Do_Stop; r=$? + log_end_msg $r ;; reload|force-reload) - Check_Config log_daemon_msg "Reloading $DESC" "$NAME" - start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON - log_end_msg $? + Check_Config + Do_Reload; r=$? + log_end_msg $r ;; restart) - Check_Config log_daemon_msg "Restarting $DESC" "$NAME" - [ -r /var/run/ircd/ngircd.pid ] \ - && PIDFILE="--pidfile /var/run/ircd/ngircd.pid" \ - || PIDFILE="" - start-stop-daemon --stop \ - --quiet --oknodo --exec $DAEMON $PIDFILE - sleep 1 - start-stop-daemon --start \ - --quiet --exec $DAEMON -- $PARAMS - log_end_msg $? + Check_Config + Prepare + Do_ForceStop + Do_Start; r=$? + log_end_msg $r + ;; + status) + log_daemon_msg "Checking for $DESC" "$NAME" + Do_Status; r=$? + log_end_msg $r + ;; + test) + Check_Config + echo "Configuration of $DAEMON seems to be ok."; r=0 ;; *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - exit 1 + N=/etc/init.d/$NAME; r=2 + echo "Usage: $N {start|stop|restart|reload|force-reload|status|test}" >&2 ;; esac -exit 0 +exit $r # -eof-

1 0

Dana Dahlstrom : misspelling in ERR_NORECIPIENT reply
by fw＠arthur.barton.de 25 Mär '09

25 Mär '09

Module: ngircd.git Branch: master Commit: 3a7d59c1ac6bb9d3fae546fba9d041738bbe849e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a7d59c1… Author: Dana Dahlstrom <dana+ngIRCd(a)cs.ucsd.edu> Date: Wed Mar 25 20:44:40 2009 +0100 misspelling in ERR_NORECIPIENT reply --- src/ngircd/messages.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 209485a..9e15b81 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -94,7 +94,7 @@ #define ERR_TOOMANYCHANNELS_MSG "405 %s %s :You have joined too many channels" #define ERR_WASNOSUCHNICK_MSG "406 %s %s :There was no such nickname" #define ERR_NOORIGIN_MSG "409 %s :No origin specified" -#define ERR_NORECIPIENT_MSG "411 %s :No receipient given (%s)" +#define ERR_NORECIPIENT_MSG "411 %s :No recipient given (%s)" #define ERR_NOTEXTTOSEND_MSG "412 %s :No text to send" #define ERR_WILDTOPLEVEL "414 %s :Wildcard in toplevel domain" #define ERR_UNKNOWNCOMMAND_MSG "421 %s %s :Unknown command"

1 0

Alexander Barton : Add missing contributors to AUTHORS file
by alex＠arthur.barton.de 11 Mär '09

11 Mär '09

Module: ngircd.git Branch: master Commit: 51b88b12f390a98a79c8665d779e6484a1c7147a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51b88b12… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 11 11:51:59 2009 +0100 Add missing contributors to AUTHORS file --- AUTHORS | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index bb7035f..b9e3eea 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2007 Alexander Barton, + (c)2001-2009 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -25,6 +25,7 @@ Florian Westphal, <westphal(a)foo.fh-furtwangen.de> (fw) Contributors ~~~~~~~~~~~~ Ali Shemiran, <ashemira(a)ucsd.edu> +Ask Bjørn Hansen, <ask(a)develooper.com> Benjamin Pineau, <ben(a)zouh.org> Brandon Beresini, <beresini(a)google.com> Bryan Caldwell, <bcaldwel(a)ucsd.edu> @@ -32,6 +33,7 @@ Dana Dahlstrom, <dana+ngIRCd(a)cs.ucsd.edu> Eric Grunow, <egrunow(a)ucsd.edu> Goetz Hoffart, <goetz(a)hoffart.de> Ilja Osthoff, <i.osthoff(a)gmx.net> +Jari Aalto, <jari.aalto(a)cante.net> Rolf Eike Beer, <eike(a)sf-mail.de> Scott Perry, <scperry(a)ucsd.edu> Sean Reifschneider, <jafo-rpms(a)tummy.com>

1 0

Florian Westphal : allow creation of persistent modeless channels
by fw＠arthur.barton.de 07 Mär '09

07 Mär '09

Module: ngircd.git Branch: master Commit: 2d4361d088f75bdcbc0deced824e2b3aafbb8fa0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2d4361d0… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Mar 7 00:21:43 2009 +0100 allow creation of persistent modeless channels --- src/ngircd/conf.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4a8b628..71f5760 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -40,6 +40,7 @@ #include "ngircd.h" #include "conn.h" #include "client.h" +#include "channel.h" #include "defines.h" #include "log.h" #include "match.h" @@ -1169,10 +1170,11 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name) size_t size = sizeof(new_chan->name); char *dest = new_chan->name; - /* Channels names must begin with "&" or "#", if it is - * missing, add a '#'. This is only here for user convenience. - */ - if (*name && *name != '#' && *name != '&') { + if (!Channel_IsValidName(name)) { + /* + * maybe user forgot to add a '#'. + * This is only here for user convenience. + */ *dest = '#'; --size; ++dest;

1 0