[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2005-04-11 08:45:37
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2005-04-11 08:45:11 UTC
Modified files:
ChangeLog ChangeLog.es acinclude.m4 aclocal.m4 config.h.in
configure configure.in doc/ircd.sample-en.conf
doc/ircd.sample-es.conf include/capab.h include/client.h
include/numeric.h include/s_conf.h ircd/Makefile.in
ircd/channel.c ircd/ircd.c ircd/ircd_parser.y ircd/ircd_string.c
ircd/m_burst.c ircd/m_cap.c ircd/m_whowas.c ircd/s_conf.c
ircd/s_err.c ircd/s_user.c tools/convert-conf.py
Log message:
Author: zoltan <zo...@ir...>
Log message:
2005-04-11 Toni García <zo...@ir...> 1.0.alpha25
* Comando CAPAB totalmente funcional
* Sincronización Undernet
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.26 ircd-ircdev/ChangeLog:1.27
--- ircd-ircdev/ChangeLog:1.26 Sat Apr 2 11:47:33 2005
+++ ircd-ircdev/ChangeLog Mon Apr 11 01:44:55 2005
@@ -1,10 +1,14 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.26 2005/04/02 19:47:33 zolty Exp $
+# $Id: ChangeLog,v 1.27 2005/04/11 08:44:55 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2005-04-11 Toni García <zo...@ir...> 1.0.alpha25
+ * CAPAB command
+ * Undernet synchronization
+
2005-04-02 Toni García <zo...@ir...> 1.0.alpha24
* STATS J for jupe nicks
* PRIVS remote
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.26 ircd-ircdev/ChangeLog.es:1.27
--- ircd-ircdev/ChangeLog.es:1.26 Sat Apr 2 11:47:33 2005
+++ ircd-ircdev/ChangeLog.es Mon Apr 11 01:44:55 2005
@@ -1,10 +1,14 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.26 2005/04/02 19:47:33 zolty Exp $
+# $Id: ChangeLog.es,v 1.27 2005/04/11 08:44:55 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2005-04-11 Toni García <zo...@ir...> 1.0.alpha25
+ * Comando CAPAB totalmente funcional
+ * Sincronización Undernet
+
2005-04-02 Toni García <zo...@ir...> 1.0.alpha24
* STATS J para jupe de nicks
* PRIVS remoto
Index: ircd-ircdev/acinclude.m4
diff -u ircd-ircdev/acinclude.m4:1.2 ircd-ircdev/acinclude.m4:1.3
--- ircd-ircdev/acinclude.m4:1.2 Wed Nov 24 08:11:30 2004
+++ ircd-ircdev/acinclude.m4 Mon Apr 11 01:44:56 2005
@@ -1,28 +1,4 @@
dnl
-dnl Macro: unet_PIPE_CFLAGS
-dnl
-dnl If the compiler understands -pipe, add it to CFLAGS if not already
-dnl there.
-dnl
-AC_DEFUN(unet_PIPE_CFLAGS,
-[AC_MSG_CHECKING([if the compiler understands -pipe])
-unet_cv_pipe_flags="$ac_cv_prog_gcc"
-if test "$ac_cv_prog_gcc" = no; then
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -pipe"
- AC_TRY_COMPILE(,,unet_cv_pipe_flags=yes,)
- CFLAGS="$OLDCFLAGS"
-fi
-AC_MSG_RESULT($unet_cv_pipe_flags)
-if test "$unet_cv_pipe_flags" = yes ; then
- x=`echo $CFLAGS | grep 'pipe' 2>/dev/null`
- if test "$x" = "" ; then
- CFLAGS="$CFLAGS -pipe"
- fi
-fi
-])
-
-dnl
dnl Macro: unet_NONBLOCKING
dnl
dnl Check whether we have posix, bsd or sysv non-blocking sockets and
Index: ircd-ircdev/aclocal.m4
diff -u ircd-ircdev/aclocal.m4:1.3 ircd-ircdev/aclocal.m4:1.4
--- ircd-ircdev/aclocal.m4:1.3 Wed Nov 24 08:11:30 2004
+++ ircd-ircdev/aclocal.m4 Mon Apr 11 01:44:56 2005
@@ -11,30 +11,6 @@
dnl PARTICULAR PURPOSE.
dnl
-dnl Macro: unet_PIPE_CFLAGS
-dnl
-dnl If the compiler understands -pipe, add it to CFLAGS if not already
-dnl there.
-dnl
-AC_DEFUN(unet_PIPE_CFLAGS,
-[AC_MSG_CHECKING([if the compiler understands -pipe])
-unet_cv_pipe_flags="$ac_cv_prog_gcc"
-if test "$ac_cv_prog_gcc" = no; then
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -pipe"
- AC_TRY_COMPILE(,,unet_cv_pipe_flags=yes,)
- CFLAGS="$OLDCFLAGS"
-fi
-AC_MSG_RESULT($unet_cv_pipe_flags)
-if test "$unet_cv_pipe_flags" = yes ; then
- x=`echo $CFLAGS | grep 'pipe' 2>/dev/null`
- if test "$x" = "" ; then
- CFLAGS="$CFLAGS -pipe"
- fi
-fi
-])
-
-dnl
dnl Macro: unet_NONBLOCKING
dnl
dnl Check whether we have posix, bsd or sysv non-blocking sockets and
Index: ircd-ircdev/config.h.in
diff -u ircd-ircdev/config.h.in:1.7 ircd-ircdev/config.h.in:1.8
--- ircd-ircdev/config.h.in:1.7 Wed Mar 23 10:34:16 2005
+++ ircd-ircdev/config.h.in Mon Apr 11 01:44:56 2005
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: config.h.in,v 1.7 2005/03/23 18:34:16 zolty Exp $
+ * $Id: config.h.in,v 1.8 2005/04/11 08:44:56 zolty Exp $
*
*/
#ifndef INCLUDED_config_h
@@ -169,6 +169,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#undef HAVE_SYS_RESOURCE_H
+
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
@@ -232,9 +235,6 @@
/* Define if you have POSIX signals. */
#undef POSIX_SIGNALS
-/* Services Environment (Ex-TerraIRCU) */
-#undef SERVICES
-
/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -268,9 +268,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* UnderNet Environment */
-#undef UNDERNET
-
/* Define to enable the /dev/poll engine */
#undef USE_DEVPOLL
Index: ircd-ircdev/configure
diff -u ircd-ircdev/configure:1.14 ircd-ircdev/configure:1.15
--- ircd-ircdev/configure:1.14 Wed Mar 23 10:34:18 2005
+++ ircd-ircdev/configure Mon Apr 11 01:44:56 2005
@@ -310,7 +310,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RMPROG SHPROG LEX LEXLIB LEX_OUTPUT_ROOT YACC ENGINE_C INSTALL_RULE SYMLINK IRCDMODE IRCDOWN IRCDGRP DPATH LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RMPROG SHPROG LEX LEXLIB LEX_OUTPUT_ROOT YACC ENGINE_C INSTALL_RULE SYMLINK IRCDMODE IRCDOWN IRCDGRP DPATH ENVIRONMENT LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -861,6 +861,8 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-optimization=-O2 Explicitly set the compiler optimization flags
+ (default: -O3)
--with-leak-detect Turn on the leak detector(requires patched boehm)
--without-ipv6 disable IPv6 support (default is autodetect)
--with-symlink=name Name to give the symlink; if name is "no," no
@@ -876,6 +878,9 @@
--with-cpath=file Set server configuration file
--with-lpath=file Set the debugging log file
--with-maxcon=maxcon Maximum number of connections server will accept
+ --with-ddb-environment Use the DDB Environment (Distributed DataBase)
+ --with-services-environment Use the Services Environment (Ex TerraIRCU)
+ --with-undernet-environment Use the Undernet Environment
Some influential environment variables:
CC C compiler command
@@ -2462,11 +2467,28 @@
*) CC="$CC $am_cv_prog_cc_stdc" ;;
esac
-if test x"$CFLAGS" != x; then
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-O2/-O3/'`
+
+# Check whether --with-optimization or --without-optimization was given.
+if test "${with_optimization+set}" = set; then
+ withval="$with_optimization"
+ unet_cv_optimization=$withval
+else
+ unet_cv_optimization='-O3'
+fi;
+echo "$as_me:$LINENO: checking optimization level" >&5
+echo $ECHO_N "checking optimization level... $ECHO_C" >&6
+if test "${unet_cv_optimization+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ unet_cv_optimization='-O3'
+fi
+echo "$as_me:$LINENO: result: $unet_cv_optimization" >&5
+echo "${ECHO_T}$unet_cv_optimization" >&6
+if test "x$unet_cv_optimization" = "xno" ; then
+ unet_cv_optimization=""
fi
if test x"$CFLAGS" != x; then
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-pipe//g'`
+ CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/$unet_cv_optimization/`
fi
if test x"$CFLAGS" != x; then
unet_old_cflags=$CFLAGS
@@ -3757,7 +3779,8 @@
-for ac_header in crypt.h poll.h inttypes.h stdint.h sys/devpoll.h sys/epoll.h sys/event.h sys/param.h sys/socket.h
+
+for ac_header in crypt.h poll.h inttypes.h stdint.h sys/devpoll.h sys/epoll.h sys/event.h sys/param.h sys/resource.h sys/socket.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -8864,7 +8887,6 @@
echo "$as_me: WARNING: $YACC may not work as yacc." >&2;}
fi
-
echo "$as_me:$LINENO: checking for posix non-blocking" >&5
echo $ECHO_N "checking for posix non-blocking... $ECHO_C" >&6
if test "${unet_cv_sys_nonblocking_posix+set}" = set; then
@@ -9153,67 +9175,6 @@
fi
fi
-echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5
-echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6
-unet_cv_pipe_flags="$ac_cv_c_compiler_gnu"
-if test "$ac_cv_c_compiler_gnu" = no; then
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -pipe"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- unet_cv_pipe_flags=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$OLDCFLAGS"
-fi
-echo "$as_me:$LINENO: result: $unet_cv_pipe_flags" >&5
-echo "${ECHO_T}$unet_cv_pipe_flags" >&6
-if test "$unet_cv_pipe_flags" = yes ; then
- x=`echo $CFLAGS | grep 'pipe' 2>/dev/null`
- if test "$x" = "" ; then
- CFLAGS="$CFLAGS -pipe"
- fi
-fi
-
-
echo "$as_me:$LINENO: checking for OS-dependent information" >&5
echo $ECHO_N "checking for OS-dependent information... $ECHO_C" >&6
case "$host" in
@@ -10195,15 +10156,85 @@
+ircdev_cv_environment_ddb=yes;
+
+echo "$as_me:$LINENO: checking whether to use DDB Environment (Distributed DataBase)" >&5
+echo $ECHO_N "checking whether to use DDB Environment (Distributed DataBase)... $ECHO_C" >&6
+
+# Check whether --with-ddb-environment or --without-ddb-environment was given.
+if test "${with_ddb_environment+set}" = set; then
+ withval="$with_ddb_environment"
+ ircdev_cv_environment_ddb=$with_ddb_environment
+else
+ if test "${ircdev_cv_environment_ddb+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ircdev_cv_environment_ddb=no
+fi
+
+fi;
+echo "$as_me:$LINENO: result: $ircdev_cv_environment_ddb" >&5
+echo "${ECHO_T}$ircdev_cv_environment_ddb" >&6
+
+echo "$as_me:$LINENO: checking whether to use Services Environment (Ex TerraIRCU)" >&5
+echo $ECHO_N "checking whether to use Services Environment (Ex TerraIRCU)... $ECHO_C" >&6
+
+# Check whether --with-services-environment or --without-services-environment was given.
+if test "${with_services_environment+set}" = set; then
+ withval="$with_services_environment"
+ ircdev_cv_environment_services=$with_services_environment
+else
+ if test "${ircdev_cv_environment_services+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ircdev_cv_environment_services=no
+fi
+
+fi;
+echo "$as_me:$LINENO: result: $ircdev_cv_environment_services" >&5
+echo "${ECHO_T}$ircdev_cv_environment_services" >&6
+echo "$as_me:$LINENO: checking whether to use Undernet Environment" >&5
+echo $ECHO_N "checking whether to use Undernet Environment... $ECHO_C" >&6
+# Check whether --with-undernet-environment or --without-undernet-environment was given.
+if test "${with_undernet_environment+set}" = set; then
+ withval="$with_undernet_environment"
+ ircdev_cv_environment_undernet=$with_undernet_environment
+else
+ if test "${ircdev_cv_environment_undernet+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ircdev_cv_environment_undernet=no
+fi
+fi;
+echo "$as_me:$LINENO: result: $ircdev_cv_environment_undernet" >&5
+echo "${ECHO_T}$ircdev_cv_environment_undernet" >&6
+if test x"$ircdev_cv_environment_ddb" != "xno" ; then
cat >>confdefs.h <<\_ACEOF
#define DDB
_ACEOF
+ ENVIRONMENT=DDB
+elif test x"$ircdev_cv_environment_services" != "xno" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SERVICES
+_ACEOF
+
+ ENVIRONMENT=SERVICES
+elif test x"$ircdev_cv_environment_undernet" != "xno" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define UNDERNET
+_ACEOF
+
+ ENVIRONMENT=UNDERNET
+fi
+
ac_config_files="$ac_config_files Makefile ircd/Makefile ircd/test/Makefile doc/Makefile"
@@ -10871,6 +10902,7 @@
s,@IRCDOWN@,$IRCDOWN,;t t
s,@IRCDGRP@,$IRCDGRP,;t t
s,@DPATH@,$DPATH,;t t
+s,@ENVIRONMENT@,$ENVIRONMENT,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@@ -11535,5 +11567,3 @@
fi
echo ""
echo "Type \"make\" to compile IRC-Dev IRCD"
-
-
Index: ircd-ircdev/configure.in
diff -u ircd-ircdev/configure.in:1.14 ircd-ircdev/configure.in:1.15
--- ircd-ircdev/configure.in:1.14 Wed Mar 23 10:34:23 2005
+++ ircd-ircdev/configure.in Mon Apr 11 01:44:57 2005
@@ -22,7 +22,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl
-dnl $Id: configure.in,v 1.14 2005/03/23 18:34:23 zolty Exp $
+dnl $Id: configure.in,v 1.15 2005/04/11 08:44:57 zolty Exp $
dnl
dnl Make sure we are in the correct directory (someone could have run
@@ -46,7 +46,7 @@
dnl Define the input and output configuration header file.
AC_CONFIG_HEADER([config.h])
-dnl Demand at least version 2.50 of autoconf
+dnl Demand at least version 2.59 of autoconf (for AS_HELP_STRING)
AC_PREREQ(2.59)
dnl Find out what type of system we are
@@ -57,13 +57,17 @@
dnl ANSIfy the C compiler whenever possible.
AM_PROG_CC_STDC
-dnl Use -O3 instead of -O2.
-if test x"$CFLAGS" != x; then
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-O2/-O3/'`
+dnl Allow specification of optimization level.
+AC_ARG_WITH([optimization],
+ AS_HELP_STRING([--with-optimization=[-O2]], [Explicitly set the compiler optimization flags (default: -O3)]),
+ [unet_cv_optimization=$withval],
+ [unet_cv_optimization='-O3'])
+AC_CACHE_CHECK([optimization level], [unet_cv_optimization], [unet_cv_optimization='-O3'])
+if test "x$unet_cv_optimization" = "xno" ; then
+ unet_cv_optimization=""
fi
-dnl Remove -pipe during configure
if test x"$CFLAGS" != x; then
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-pipe//g'`
+ CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/$unet_cv_optimization/`
fi
dnl Notice the -g flag and deal accordingly
if test x"$CFLAGS" != x; then
@@ -113,7 +117,7 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(crypt.h poll.h inttypes.h stdint.h sys/devpoll.h sys/epoll.h sys/event.h sys/param.h sys/socket.h)
+AC_CHECK_HEADERS(crypt.h poll.h inttypes.h stdint.h sys/devpoll.h sys/epoll.h sys/event.h sys/param.h sys/resource.h sys/socket.h)
dnl Checks for typedefs, structures, and compiler characteristics
dnl AC_C_CONST
@@ -177,13 +181,9 @@
AC_MSG_WARN([$YACC may not work as yacc.])
fi
-
unet_NONBLOCKING
unet_SIGNALS
-dnl Add -pipe when possible
-unet_PIPE_CFLAGS
-
dnl Check OS for os_dep files.
AC_MSG_CHECKING(for OS-dependent information)
case "$host" in
@@ -760,43 +760,46 @@
dnl IRC Network environment
dnl Default DDB
-dnl ircdev_cv_environment_ddb=yes;
+ircdev_cv_environment_ddb=yes;
dnl --with-ddb-environment allows us to use DDB Environment
-dnl AC_MSG_CHECKING([whether to use DDB Environment (Distributed DataBase)])
-dnl AC_ARG_WITH([ddb-environment],
-dnl [ --with-ddb-environment Use the DDB Environment (Distributed DataBase)],
-dnl [ircdev_cv_environment_ddb=$with_ddb_environment],
-dnl [AC_CACHE_VAL(ircdev_cv_environment_ddb,
-dnl [ircdev_cv_environment_ddb=no])])
-dnl AC_MSG_RESULT([$ircdev_cv_environment_ddb])
+AC_MSG_CHECKING([whether to use DDB Environment (Distributed DataBase)])
+AC_ARG_WITH([ddb-environment],
+[ --with-ddb-environment Use the DDB Environment (Distributed DataBase)],
+[ircdev_cv_environment_ddb=$with_ddb_environment],
+[AC_CACHE_VAL(ircdev_cv_environment_ddb,
+[ircdev_cv_environment_ddb=no])])
+AC_MSG_RESULT([$ircdev_cv_environment_ddb])
-dnl LO COMENTO PORQUE NO EXISTE AUN!
dnl --with-services-environment allows us to use Services Environment
-dnl AC_MSG_CHECKING([whether to use Services Environment (Ex TerraIRCU)])
-dnl AC_ARG_WITH([services-environment],
-dnl [ --with-services-environment Use the Services Environment (Ex TerraIRCU)],
-dnl [ircdev_cv_environment_services=$with_services_environment],
-dnl [AC_CACHE_VAL(ircdev_cv_environment_services,
-dnl [ircdev_cv_environment_services=no])])
-dnl AC_MSG_RESULT([$ircdev_cv_environment_services])
+AC_MSG_CHECKING([whether to use Services Environment (Ex TerraIRCU)])
+AC_ARG_WITH([services-environment],
+[ --with-services-environment Use the Services Environment (Ex TerraIRCU)],
+[ircdev_cv_environment_services=$with_services_environment],
+[AC_CACHE_VAL(ircdev_cv_environment_services,
+[ircdev_cv_environment_services=no])])
+AC_MSG_RESULT([$ircdev_cv_environment_services])
dnl --with-undernet-environment allows us to use Undernet Environment
-dnl AC_MSG_CHECKING([whether to use Undernet Environment])
-dnl AC_ARG_WITH([undernet-environment],
-dnl [ --with-undernet-environment Use the Undernet Environment],
-dnl [ircdev_cv_environment_undernet=$with_undernet_environment],
-dnl [AC_CACHE_VAL(ircdev_cv_environment_undernet,
-dnl [ircdev_cv_environment_undernet=no])])
-dnl AC_MSG_RESULT([$ircdev_cv_environment_undernet])
+AC_MSG_CHECKING([whether to use Undernet Environment])
+AC_ARG_WITH([undernet-environment],
+[ --with-undernet-environment Use the Undernet Environment],
+[ircdev_cv_environment_undernet=$with_undernet_environment],
+[AC_CACHE_VAL(ircdev_cv_environment_undernet,
+[ircdev_cv_environment_undernet=no])])
+AC_MSG_RESULT([$ircdev_cv_environment_undernet])
-dnl if test x"$ircdev_cv_environment_ddb" != "xno" ; then
+if test x"$ircdev_cv_environment_ddb" != "xno" ; then
AC_DEFINE([DDB], , [DDB Environment (Distributed DataBase)])
-dnl else if x"$ircdev_cv_environment_services" != "xno" ; then
-dnl AC_DEFINE([SERVICES], , [Services Environment (Ex-TerraIRCU)])
-dnl else if if x"$ircdev_cv_environment_undernet" != "xno" ; then
-dnl AC_DEFINE([UNDERNET], , [UnderNet Environment])
-dnl fi
+ ENVIRONMENT=DDB
+elif test x"$ircdev_cv_environment_services" != "xno" ; then
+ AC_DEFINE([SERVICES], , [Services Environment (Ex-TerraIRCU)])
+ ENVIRONMENT=SERVICES
+elif test x"$ircdev_cv_environment_undernet" != "xno" ; then
+ AC_DEFINE([UNDERNET], , [UnderNet Environment])
+ ENVIRONMENT=UNDERNET
+fi
+AC_SUBST(ENVIRONMENT)
dnl Finally really generate all output files:
AC_CONFIG_FILES([Makefile ircd/Makefile ircd/test/Makefile doc/Makefile])
@@ -855,5 +858,3 @@
fi
echo ""
echo "Type \"make\" to compile IRC-Dev IRCD"
-
-
Index: ircd-ircdev/doc/ircd.sample-en.conf
diff -u ircd-ircdev/doc/ircd.sample-en.conf:1.16 ircd-ircdev/doc/ircd.sample-en.conf:1.17
--- ircd-ircdev/doc/ircd.sample-en.conf:1.16 Sat Apr 2 11:47:33 2005
+++ ircd-ircdev/doc/ircd.sample-en.conf Mon Apr 11 01:44:58 2005
@@ -428,11 +428,13 @@
# It is possible to Jupe nicks.
Jupe {
- nick = "EuWorld,E,StatServ,NoteServ";
- nick = "UWorld2,ChanSvr,ChanSaver,ChanServ";
- nick = "Uworld,NickSvr,NickSaver,NickServ";
- nick = "LPT1,X,login,LPT2,W,Undernet,COM1,V,protocol,COM2";
- nick = "U,pass,COM3,Y,AUX,COM4,Z,newpass";
+ nick = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,{,|,},~,-,_,`";
+ nick = "EuWorld,UWorld,UWorld2";
+ nick = "login,undernet,protocol,pass,newpass,org";
+ nick = "StatServ,NoteServ";
+ nick = "ChanSvr,ChanSaver,ChanServ";
+ nick = "NickSvr,NickSaver,NickServ";
+ nick = "LPT1,LPT2,COM1,COM2,COM3,COM4,AUX";
};
# [Kill]
Index: ircd-ircdev/doc/ircd.sample-es.conf
diff -u ircd-ircdev/doc/ircd.sample-es.conf:1.12 ircd-ircdev/doc/ircd.sample-es.conf:1.13
--- ircd-ircdev/doc/ircd.sample-es.conf:1.12 Sat Apr 2 11:47:33 2005
+++ ircd-ircdev/doc/ircd.sample-es.conf Mon Apr 11 01:44:58 2005
@@ -447,11 +447,13 @@
# Esto es posible para prohibir (Jupe) nicks.
Jupe {
- nick = "EuWorld,E,StatServ,NoteServ";
- nick = "UWorld2,ChanSvr,ChanSaver,ChanServ";
- nick = "Uworld,NickSvr,NickSaver,NickServ";
- nick = "LPT1,X,login,LPT2,W,Undernet,COM1,V,protocol,COM2";
- nick = "U,pass,COM3,Y,AUX,COM4,Z,newpass";
+ nick = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,{,|,},~,-,_,`";
+ nick = "EuWorld,UWorld,UWorld2";
+ nick = "login,undernet,protocol,pass,newpass,org";
+ nick = "StatServ,NoteServ";
+ nick = "ChanSvr,ChanSaver,ChanServ";
+ nick = "NickSvr,NickSaver,NickServ";
+ nick = "LPT1,LPT2,COM1,COM2,COM3,COM4,AUX";
};
# [Kill]
Index: ircd-ircdev/include/capab.h
diff -u ircd-ircdev/include/capab.h:1.2 ircd-ircdev/include/capab.h:1.3
--- ircd-ircdev/include/capab.h:1.2 Mon Jan 10 04:21:59 2005
+++ ircd-ircdev/include/capab.h Mon Apr 11 01:44:59 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Interface and public definitions for capabilities extension
- * @version $Id: capab.h,v 1.2 2005/01/10 12:21:59 zolty Exp $
+ * @version $Id: capab.h,v 1.3 2005/04/11 08:44:59 zolty Exp $
*/
#ifndef INCLUDED_capab_h
#define INCLUDED_capab_h
@@ -33,615 +33,14 @@
#define CAPFL_HIDDEN 0x0001 /**< Do not advertize this capability */
#define CAPFL_PROHIBIT 0x0002 /**< Client may not set this capability */
#define CAPFL_PROTO 0x0004 /**< Cap must be acknowledged by client */
+#define CAPFL_STICKY 0x0008 /**< Cap may not be cleared once set */
+
/* XXX You can safely ignore all of these; they're only for testing purposes,
* XXX and don't result in any behavioral change.
*/
-#define CAPLIST \
- _CAP(USERPFX, 0, "undernet.org/userpfx"), \
- _CAP(FOO, CAPFL_HIDDEN, "x-foo"), \
- _CAP(BAR, CAPFL_PROHIBIT, "x-bar"), \
- _CAP(BINK, CAPFL_PROTO, "x-bink"), \
- _CAP(CAP000, 0, "x-cap000"), \
- _CAP(CAP001, 0, "x-cap001"), \
- _CAP(CAP002, 0, "x-cap002"), \
- _CAP(CAP003, 0, "x-cap003"), \
- _CAP(CAP004, 0, "x-cap004"), \
- _CAP(CAP005, 0, "x-cap005"), \
- _CAP(CAP006, 0, "x-cap006"), \
- _CAP(CAP007, 0, "x-cap007"), \
- _CAP(CAP008, 0, "x-cap008"), \
- _CAP(CAP009, 0, "x-cap009"), \
- _CAP(CAP010, 0, "x-cap010"), \
- _CAP(CAP011, 0, "x-cap011"), \
- _CAP(CAP012, 0, "x-cap012"), \
- _CAP(CAP013, 0, "x-cap013"), \
- _CAP(CAP014, 0, "x-cap014"), \
- _CAP(CAP015, 0, "x-cap015"), \
- _CAP(CAP016, 0, "x-cap016"), \
- _CAP(CAP017, 0, "x-cap017"), \
- _CAP(CAP018, 0, "x-cap018"), \
- _CAP(CAP019, 0, "x-cap019"), \
- _CAP(CAP020, 0, "x-cap020"), \
- _CAP(CAP021, 0, "x-cap021"), \
- _CAP(CAP022, 0, "x-cap022"), \
- _CAP(CAP023, 0, "x-cap023"), \
- _CAP(CAP024, 0, "x-cap024"), \
- _CAP(CAP025, 0, "x-cap025"), \
- _CAP(CAP026, 0, "x-cap026"), \
- _CAP(CAP027, 0, "x-cap027"), \
- _CAP(CAP028, 0, "x-cap028"), \
- _CAP(CAP029, 0, "x-cap029"), \
- _CAP(CAP030, 0, "x-cap030"), \
- _CAP(CAP031, 0, "x-cap031"), \
- _CAP(CAP032, 0, "x-cap032"), \
- _CAP(CAP033, 0, "x-cap033"), \
- _CAP(CAP034, 0, "x-cap034"), \
- _CAP(CAP035, 0, "x-cap035"), \
- _CAP(CAP036, 0, "x-cap036"), \
- _CAP(CAP037, 0, "x-cap037"), \
- _CAP(CAP038, 0, "x-cap038"), \
- _CAP(CAP039, 0, "x-cap039"), \
- _CAP(CAP040, 0, "x-cap040"), \
- _CAP(CAP041, 0, "x-cap041"), \
- _CAP(CAP042, 0, "x-cap042"), \
- _CAP(CAP043, 0, "x-cap043"), \
- _CAP(CAP044, 0, "x-cap044"), \
- _CAP(CAP045, 0, "x-cap045"), \
- _CAP(CAP046, 0, "x-cap046"), \
- _CAP(CAP047, 0, "x-cap047"), \
- _CAP(CAP048, 0, "x-cap048"), \
- _CAP(CAP049, 0, "x-cap049"), \
- _CAP(CAP050, 0, "x-cap050"), \
- _CAP(CAP051, 0, "x-cap051"), \
- _CAP(CAP052, 0, "x-cap052"), \
- _CAP(CAP053, 0, "x-cap053"), \
- _CAP(CAP054, 0, "x-cap054"), \
- _CAP(CAP055, 0, "x-cap055"), \
- _CAP(CAP056, 0, "x-cap056"), \
- _CAP(CAP057, 0, "x-cap057"), \
- _CAP(CAP058, 0, "x-cap058"), \
- _CAP(CAP059, 0, "x-cap059"), \
- _CAP(CAP060, 0, "x-cap060"), \
- _CAP(CAP061, 0, "x-cap061"), \
- _CAP(CAP062, 0, "x-cap062"), \
- _CAP(CAP063, 0, "x-cap063"), \
- _CAP(CAP064, 0, "x-cap064"), \
- _CAP(CAP065, 0, "x-cap065"), \
- _CAP(CAP066, 0, "x-cap066"), \
- _CAP(CAP067, 0, "x-cap067"), \
- _CAP(CAP068, 0, "x-cap068"), \
- _CAP(CAP069, 0, "x-cap069"), \
- _CAP(CAP070, 0, "x-cap070"), \
- _CAP(CAP071, 0, "x-cap071"), \
- _CAP(CAP072, 0, "x-cap072"), \
- _CAP(CAP073, 0, "x-cap073"), \
- _CAP(CAP074, 0, "x-cap074"), \
- _CAP(CAP075, 0, "x-cap075"), \
- _CAP(CAP076, 0, "x-cap076"), \
- _CAP(CAP077, 0, "x-cap077"), \
- _CAP(CAP078, 0, "x-cap078"), \
- _CAP(CAP079, 0, "x-cap079"), \
- _CAP(CAP080, 0, "x-cap080"), \
- _CAP(CAP081, 0, "x-cap081"), \
- _CAP(CAP082, 0, "x-cap082"), \
- _CAP(CAP083, 0, "x-cap083"), \
- _CAP(CAP084, 0, "x-cap084"), \
- _CAP(CAP085, 0, "x-cap085"), \
- _CAP(CAP086, 0, "x-cap086"), \
- _CAP(CAP087, 0, "x-cap087"), \
- _CAP(CAP088, 0, "x-cap088"), \
- _CAP(CAP089, 0, "x-cap089"), \
- _CAP(CAP090, 0, "x-cap090"), \
- _CAP(CAP091, 0, "x-cap091"), \
- _CAP(CAP092, 0, "x-cap092"), \
- _CAP(CAP093, 0, "x-cap093"), \
- _CAP(CAP094, 0, "x-cap094"), \
- _CAP(CAP095, 0, "x-cap095"), \
- _CAP(CAP096, 0, "x-cap096"), \
- _CAP(CAP097, 0, "x-cap097"), \
- _CAP(CAP098, 0, "x-cap098"), \
- _CAP(CAP099, 0, "x-cap099"), \
- _CAP(CAP100, 0, "x-cap100"), \
- _CAP(CAP101, 0, "x-cap101"), \
- _CAP(CAP102, 0, "x-cap102"), \
- _CAP(CAP103, 0, "x-cap103"), \
- _CAP(CAP104, 0, "x-cap104"), \
- _CAP(CAP105, 0, "x-cap105"), \
- _CAP(CAP106, 0, "x-cap106"), \
- _CAP(CAP107, 0, "x-cap107"), \
- _CAP(CAP108, 0, "x-cap108"), \
- _CAP(CAP109, 0, "x-cap109"), \
- _CAP(CAP110, 0, "x-cap110"), \
- _CAP(CAP111, 0, "x-cap111"), \
- _CAP(CAP112, 0, "x-cap112"), \
- _CAP(CAP113, 0, "x-cap113"), \
- _CAP(CAP114, 0, "x-cap114"), \
- _CAP(CAP115, 0, "x-cap115"), \
- _CAP(CAP116, 0, "x-cap116"), \
- _CAP(CAP117, 0, "x-cap117"), \
- _CAP(CAP118, 0, "x-cap118"), \
- _CAP(CAP119, 0, "x-cap119"), \
- _CAP(CAP120, 0, "x-cap120"), \
- _CAP(CAP121, 0, "x-cap121"), \
- _CAP(CAP122, 0, "x-cap122"), \
- _CAP(CAP123, 0, "x-cap123"), \
- _CAP(CAP124, 0, "x-cap124"), \
- _CAP(CAP125, 0, "x-cap125"), \
- _CAP(CAP126, 0, "x-cap126"), \
- _CAP(CAP127, 0, "x-cap127"), \
- _CAP(CAP128, 0, "x-cap128"), \
- _CAP(CAP129, 0, "x-cap129"), \
- _CAP(CAP130, 0, "x-cap130"), \
- _CAP(CAP131, 0, "x-cap131"), \
- _CAP(CAP132, 0, "x-cap132"), \
- _CAP(CAP133, 0, "x-cap133"), \
- _CAP(CAP134, 0, "x-cap134"), \
- _CAP(CAP135, 0, "x-cap135"), \
- _CAP(CAP136, 0, "x-cap136"), \
- _CAP(CAP137, 0, "x-cap137"), \
- _CAP(CAP138, 0, "x-cap138"), \
- _CAP(CAP139, 0, "x-cap139"), \
- _CAP(CAP140, 0, "x-cap140"), \
- _CAP(CAP141, 0, "x-cap141"), \
- _CAP(CAP142, 0, "x-cap142"), \
- _CAP(CAP143, 0, "x-cap143"), \
- _CAP(CAP144, 0, "x-cap144"), \
- _CAP(CAP145, 0, "x-cap145"), \
- _CAP(CAP146, 0, "x-cap146"), \
- _CAP(CAP147, 0, "x-cap147"), \
- _CAP(CAP148, 0, "x-cap148"), \
- _CAP(CAP149, 0, "x-cap149"), \
- _CAP(CAP150, 0, "x-cap150"), \
- _CAP(CAP151, 0, "x-cap151"), \
- _CAP(CAP152, 0, "x-cap152"), \
- _CAP(CAP153, 0, "x-cap153"), \
- _CAP(CAP154, 0, "x-cap154"), \
- _CAP(CAP155, 0, "x-cap155"), \
- _CAP(CAP156, 0, "x-cap156"), \
- _CAP(CAP157, 0, "x-cap157"), \
- _CAP(CAP158, 0, "x-cap158"), \
- _CAP(CAP159, 0, "x-cap159"), \
- _CAP(CAP160, 0, "x-cap160"), \
- _CAP(CAP161, 0, "x-cap161"), \
- _CAP(CAP162, 0, "x-cap162"), \
- _CAP(CAP163, 0, "x-cap163"), \
- _CAP(CAP164, 0, "x-cap164"), \
- _CAP(CAP165, 0, "x-cap165"), \
- _CAP(CAP166, 0, "x-cap166"), \
- _CAP(CAP167, 0, "x-cap167"), \
- _CAP(CAP168, 0, "x-cap168"), \
- _CAP(CAP169, 0, "x-cap169"), \
- _CAP(CAP170, 0, "x-cap170"), \
- _CAP(CAP171, 0, "x-cap171"), \
- _CAP(CAP172, 0, "x-cap172"), \
- _CAP(CAP173, 0, "x-cap173"), \
- _CAP(CAP174, 0, "x-cap174"), \
- _CAP(CAP175, 0, "x-cap175"), \
- _CAP(CAP176, 0, "x-cap176"), \
- _CAP(CAP177, 0, "x-cap177"), \
- _CAP(CAP178, 0, "x-cap178"), \
- _CAP(CAP179, 0, "x-cap179"), \
- _CAP(CAP180, 0, "x-cap180"), \
- _CAP(CAP181, 0, "x-cap181"), \
- _CAP(CAP182, 0, "x-cap182"), \
- _CAP(CAP183, 0, "x-cap183"), \
- _CAP(CAP184, 0, "x-cap184"), \
- _CAP(CAP185, 0, "x-cap185"), \
- _CAP(CAP186, 0, "x-cap186"), \
- _CAP(CAP187, 0, "x-cap187"), \
- _CAP(CAP188, 0, "x-cap188"), \
- _CAP(CAP189, 0, "x-cap189"), \
- _CAP(CAP190, 0, "x-cap190"), \
- _CAP(CAP191, 0, "x-cap191"), \
- _CAP(CAP192, 0, "x-cap192"), \
- _CAP(CAP193, 0, "x-cap193"), \
- _CAP(CAP194, 0, "x-cap194"), \
- _CAP(CAP195, 0, "x-cap195"), \
- _CAP(CAP196, 0, "x-cap196"), \
- _CAP(CAP197, 0, "x-cap197"), \
- _CAP(CAP198, 0, "x-cap198"), \
- _CAP(CAP199, 0, "x-cap199"), \
- _CAP(CAP200, 0, "x-cap200"), \
- _CAP(CAP201, 0, "x-cap201"), \
- _CAP(CAP202, 0, "x-cap202"), \
- _CAP(CAP203, 0, "x-cap203"), \
- _CAP(CAP204, 0, "x-cap204"), \
- _CAP(CAP205, 0, "x-cap205"), \
- _CAP(CAP206, 0, "x-cap206"), \
- _CAP(CAP207, 0, "x-cap207"), \
- _CAP(CAP208, 0, "x-cap208"), \
- _CAP(CAP209, 0, "x-cap209"), \
- _CAP(CAP210, 0, "x-cap210"), \
- _CAP(CAP211, 0, "x-cap211"), \
- _CAP(CAP212, 0, "x-cap212"), \
- _CAP(CAP213, 0, "x-cap213"), \
- _CAP(CAP214, 0, "x-cap214"), \
- _CAP(CAP215, 0, "x-cap215"), \
- _CAP(CAP216, 0, "x-cap216"), \
- _CAP(CAP217, 0, "x-cap217"), \
- _CAP(CAP218, 0, "x-cap218"), \
- _CAP(CAP219, 0, "x-cap219"), \
- _CAP(CAP220, 0, "x-cap220"), \
- _CAP(CAP221, 0, "x-cap221"), \
- _CAP(CAP222, 0, "x-cap222"), \
- _CAP(CAP223, 0, "x-cap223"), \
- _CAP(CAP224, 0, "x-cap224"), \
- _CAP(CAP225, 0, "x-cap225"), \
- _CAP(CAP226, 0, "x-cap226"), \
- _CAP(CAP227, 0, "x-cap227"), \
- _CAP(CAP228, 0, "x-cap228"), \
- _CAP(CAP229, 0, "x-cap229"), \
- _CAP(CAP230, 0, "x-cap230"), \
- _CAP(CAP231, 0, "x-cap231"), \
- _CAP(CAP232, 0, "x-cap232"), \
- _CAP(CAP233, 0, "x-cap233"), \
- _CAP(CAP234, 0, "x-cap234"), \
- _CAP(CAP235, 0, "x-cap235"), \
- _CAP(CAP236, 0, "x-cap236"), \
- _CAP(CAP237, 0, "x-cap237"), \
- _CAP(CAP238, 0, "x-cap238"), \
- _CAP(CAP239, 0, "x-cap239"), \
- _CAP(CAP240, 0, "x-cap240"), \
- _CAP(CAP241, 0, "x-cap241"), \
- _CAP(CAP242, 0, "x-cap242"), \
- _CAP(CAP243, 0, "x-cap243"), \
- _CAP(CAP244, 0, "x-cap244"), \
- _CAP(CAP245, 0, "x-cap245"), \
- _CAP(CAP246, 0, "x-cap246"), \
- _CAP(CAP247, 0, "x-cap247"), \
- _CAP(CAP248, 0, "x-cap248"), \
- _CAP(CAP249, 0, "x-cap249"), \
- _CAP(CAP250, 0, "x-cap250"), \
- _CAP(CAP251, 0, "x-cap251"), \
- _CAP(CAP252, 0, "x-cap252"), \
- _CAP(CAP253, 0, "x-cap253"), \
- _CAP(CAP254, 0, "x-cap254"), \
- _CAP(CAP255, 0, "x-cap255"), \
- _CAP(CAP256, 0, "x-cap256"), \
- _CAP(CAP257, 0, "x-cap257"), \
- _CAP(CAP258, 0, "x-cap258"), \
- _CAP(CAP259, 0, "x-cap259"), \
- _CAP(CAP260, 0, "x-cap260"), \
- _CAP(CAP261, 0, "x-cap261"), \
- _CAP(CAP262, 0, "x-cap262"), \
- _CAP(CAP263, 0, "x-cap263"), \
- _CAP(CAP264, 0, "x-cap264"), \
- _CAP(CAP265, 0, "x-cap265"), \
- _CAP(CAP266, 0, "x-cap266"), \
- _CAP(CAP267, 0, "x-cap267"), \
- _CAP(CAP268, 0, "x-cap268"), \
- _CAP(CAP269, 0, "x-cap269"), \
- _CAP(CAP270, 0, "x-cap270"), \
- _CAP(CAP271, 0, "x-cap271"), \
- _CAP(CAP272, 0, "x-cap272"), \
- _CAP(CAP273, 0, "x-cap273"), \
- _CAP(CAP274, 0, "x-cap274"), \
- _CAP(CAP275, 0, "x-cap275"), \
- _CAP(CAP276, 0, "x-cap276"), \
- _CAP(CAP277, 0, "x-cap277"), \
- _CAP(CAP278, 0, "x-cap278"), \
- _CAP(CAP279, 0, "x-cap279"), \
- _CAP(CAP280, 0, "x-cap280"), \
- _CAP(CAP281, 0, "x-cap281"), \
- _CAP(CAP282, 0, "x-cap282"), \
- _CAP(CAP283, 0, "x-cap283"), \
- _CAP(CAP284, 0, "x-cap284"), \
- _CAP(CAP285, 0, "x-cap285"), \
- _CAP(CAP286, 0, "x-cap286"), \
- _CAP(CAP287, 0, "x-cap287"), \
- _CAP(CAP288, 0, "x-cap288"), \
- _CAP(CAP289, 0, "x-cap289"), \
- _CAP(CAP290, 0, "x-cap290"), \
- _CAP(CAP291, 0, "x-cap291"), \
- _CAP(CAP292, 0, "x-cap292"), \
- _CAP(CAP293, 0, "x-cap293"), \
- _CAP(CAP294, 0, "x-cap294"), \
- _CAP(CAP295, 0, "x-cap295"), \
- _CAP(CAP296, 0, "x-cap296"), \
- _CAP(CAP297, 0, "x-cap297"), \
- _CAP(CAP298, 0, "x-cap298"), \
- _CAP(CAP299, 0, "x-cap299"), \
- _CAP(CAP300, 0, "x-cap300"), \
- _CAP(CAP301, 0, "x-cap301"), \
- _CAP(CAP302, 0, "x-cap302"), \
- _CAP(CAP303, 0, "x-cap303"), \
- _CAP(CAP304, 0, "x-cap304"), \
- _CAP(CAP305, 0, "x-cap305"), \
- _CAP(CAP306, 0, "x-cap306"), \
- _CAP(CAP307, 0, "x-cap307"), \
- _CAP(CAP308, 0, "x-cap308"), \
- _CAP(CAP309, 0, "x-cap309"), \
- _CAP(CAP310, 0, "x-cap310"), \
- _CAP(CAP311, 0, "x-cap311"), \
- _CAP(CAP312, 0, "x-cap312"), \
- _CAP(CAP313, 0, "x-cap313"), \
- _CAP(CAP314, 0, "x-cap314"), \
- _CAP(CAP315, 0, "x-cap315"), \
- _CAP(CAP316, 0, "x-cap316"), \
- _CAP(CAP317, 0, "x-cap317"), \
- _CAP(CAP318, 0, "x-cap318"), \
- _CAP(CAP319, 0, "x-cap319"), \
- _CAP(CAP320, 0, "x-cap320"), \
- _CAP(CAP321, 0, "x-cap321"), \
- _CAP(CAP322, 0, "x-cap322"), \
- _CAP(CAP323, 0, "x-cap323"), \
- _CAP(CAP324, 0, "x-cap324"), \
- _CAP(CAP325, 0, "x-cap325"), \
- _CAP(CAP326, 0, "x-cap326"), \
- _CAP(CAP327, 0, "x-cap327"), \
- _CAP(CAP328, 0, "x-cap328"), \
- _CAP(CAP329, 0, "x-cap329"), \
- _CAP(CAP330, 0, "x-cap330"), \
- _CAP(CAP331, 0, "x-cap331"), \
- _CAP(CAP332, 0, "x-cap332"), \
- _CAP(CAP333, 0, "x-cap333"), \
- _CAP(CAP334, 0, "x-cap334"), \
- _CAP(CAP335, 0, "x-cap335"), \
- _CAP(CAP336, 0, "x-cap336"), \
- _CAP(CAP337, 0, "x-cap337"), \
- _CAP(CAP338, 0, "x-cap338"), \
- _CAP(CAP339, 0, "x-cap339"), \
- _CAP(CAP340, 0, "x-cap340"), \
- _CAP(CAP341, 0, "x-cap341"), \
- _CAP(CAP342, 0, "x-cap342"), \
- _CAP(CAP343, 0, "x-cap343"), \
- _CAP(CAP344, 0, "x-cap344"), \
- _CAP(CAP345, 0, "x-cap345"), \
- _CAP(CAP346, 0, "x-cap346"), \
- _CAP(CAP347, 0, "x-cap347"), \
- _CAP(CAP348, 0, "x-cap348"), \
- _CAP(CAP349, 0, "x-cap349"), \
- _CAP(CAP350, 0, "x-cap350"), \
- _CAP(CAP351, 0, "x-cap351"), \
- _CAP(CAP352, 0, "x-cap352"), \
- _CAP(CAP353, 0, "x-cap353"), \
- _CAP(CAP354, 0, "x-cap354"), \
- _CAP(CAP355, 0, "x-cap355"), \
- _CAP(CAP356, 0, "x-cap356"), \
- _CAP(CAP357, 0, "x-cap357"), \
- _CAP(CAP358, 0, "x-cap358"), \
- _CAP(CAP359, 0, "x-cap359"), \
- _CAP(CAP360, 0, "x-cap360"), \
- _CAP(CAP361, 0, "x-cap361"), \
- _CAP(CAP362, 0, "x-cap362"), \
- _CAP(CAP363, 0, "x-cap363"), \
- _CAP(CAP364, 0, "x-cap364"), \
- _CAP(CAP365, 0, "x-cap365"), \
- _CAP(CAP366, 0, "x-cap366"), \
- _CAP(CAP367, 0, "x-cap367"), \
- _CAP(CAP368, 0, "x-cap368"), \
- _CAP(CAP369, 0, "x-cap369"), \
- _CAP(CAP370, 0, "x-cap370"), \
- _CAP(CAP371, 0, "x-cap371"), \
- _CAP(CAP372, 0, "x-cap372"), \
- _CAP(CAP373, 0, "x-cap373"), \
- _CAP(CAP374, 0, "x-cap374"), \
- _CAP(CAP375, 0, "x-cap375"), \
- _CAP(CAP376, 0, "x-cap376"), \
- _CAP(CAP377, 0, "x-cap377"), \
- _CAP(CAP378, 0, "x-cap378"), \
- _CAP(CAP379, 0, "x-cap379"), \
- _CAP(CAP380, 0, "x-cap380"), \
- _CAP(CAP381, 0, "x-cap381"), \
- _CAP(CAP382, 0, "x-cap382"), \
- _CAP(CAP383, 0, "x-cap383"), \
- _CAP(CAP384, 0, "x-cap384"), \
- _CAP(CAP385, 0, "x-cap385"), \
- _CAP(CAP386, 0, "x-cap386"), \
- _CAP(CAP387, 0, "x-cap387"), \
- _CAP(CAP388, 0, "x-cap388"), \
- _CAP(CAP389, 0, "x-cap389"), \
- _CAP(CAP390, 0, "x-cap390"), \
- _CAP(CAP391, 0, "x-cap391"), \
- _CAP(CAP392, 0, "x-cap392"), \
- _CAP(CAP393, 0, "x-cap393"), \
- _CAP(CAP394, 0, "x-cap394"), \
- _CAP(CAP395, 0, "x-cap395"), \
- _CAP(CAP396, 0, "x-cap396"), \
- _CAP(CAP397, 0, "x-cap397"), \
- _CAP(CAP398, 0, "x-cap398"), \
- _CAP(CAP399, 0, "x-cap399"), \
- _CAP(CAP400, 0, "x-cap400"), \
- _CAP(CAP401, 0, "x-cap401"), \
- _CAP(CAP402, 0, "x-cap402"), \
- _CAP(CAP403, 0, "x-cap403"), \
- _CAP(CAP404, 0, "x-cap404"), \
- _CAP(CAP405, 0, "x-cap405"), \
- _CAP(CAP406, 0, "x-cap406"), \
- _CAP(CAP407, 0, "x-cap407"), \
- _CAP(CAP408, 0, "x-cap408"), \
- _CAP(CAP409, 0, "x-cap409"), \
- _CAP(CAP410, 0, "x-cap410"), \
- _CAP(CAP411, 0, "x-cap411"), \
- _CAP(CAP412, 0, "x-cap412"), \
- _CAP(CAP413, 0, "x-cap413"), \
- _CAP(CAP414, 0, "x-cap414"), \
- _CAP(CAP415, 0, "x-cap415"), \
- _CAP(CAP416, 0, "x-cap416"), \
- _CAP(CAP417, 0, "x-cap417"), \
- _CAP(CAP418, 0, "x-cap418"), \
- _CAP(CAP419, 0, "x-cap419"), \
- _CAP(CAP420, 0, "x-cap420"), \
- _CAP(CAP421, 0, "x-cap421"), \
- _CAP(CAP422, 0, "x-cap422"), \
- _CAP(CAP423, 0, "x-cap423"), \
- _CAP(CAP424, 0, "x-cap424"), \
- _CAP(CAP425, 0, "x-cap425"), \
- _CAP(CAP426, 0, "x-cap426"), \
- _CAP(CAP427, 0, "x-cap427"), \
- _CAP(CAP428, 0, "x-cap428"), \
- _CAP(CAP429, 0, "x-cap429"), \
- _CAP(CAP430, 0, "x-cap430"), \
- _CAP(CAP431, 0, "x-cap431"), \
- _CAP(CAP432, 0, "x-cap432"), \
- _CAP(CAP433, 0, "x-cap433"), \
- _CAP(CAP434, 0, "x-cap434"), \
- _CAP(CAP435, 0, "x-cap435"), \
- _CAP(CAP436, 0, "x-cap436"), \
- _CAP(CAP437, 0, "x-cap437"), \
- _CAP(CAP438, 0, "x-cap438"), \
- _CAP(CAP439, 0, "x-cap439"), \
- _CAP(CAP440, 0, "x-cap440"), \
- _CAP(CAP441, 0, "x-cap441"), \
- _CAP(CAP442, 0, "x-cap442"), \
- _CAP(CAP443, 0, "x-cap443"), \
- _CAP(CAP444, 0, "x-cap444"), \
- _CAP(CAP445, 0, "x-cap445"), \
- _CAP(CAP446, 0, "x-cap446"), \
- _CAP(CAP447, 0, "x-cap447"), \
- _CAP(CAP448, 0, "x-cap448"), \
- _CAP(CAP449, 0, "x-cap449"), \
- _CAP(CAP450, 0, "x-cap450"), \
- _CAP(CAP451, 0, "x-cap451"), \
- _CAP(CAP452, 0, "x-cap452"), \
- _CAP(CAP453, 0, "x-cap453"), \
- _CAP(CAP454, 0, "x-cap454"), \
- _CAP(CAP455, 0, "x-cap455"), \
- _CAP(CAP456, 0, "x-cap456"), \
- _CAP(CAP457, 0, "x-cap457"), \
- _CAP(CAP458, 0, "x-cap458"), \
- _CAP(CAP459, 0, "x-cap459"), \
- _CAP(CAP460, 0, "x-cap460"), \
- _CAP(CAP461, 0, "x-cap461"), \
- _CAP(CAP462, 0, "x-cap462"), \
- _CAP(CAP463, 0, "x-cap463"), \
- _CAP(CAP464, 0, "x-cap464"), \
- _CAP(CAP465, 0, "x-cap465"), \
- _CAP(CAP466, 0, "x-cap466"), \
- _CAP(CAP467, 0, "x-cap467"), \
- _CAP(CAP468, 0, "x-cap468"), \
- _CAP(CAP469, 0, "x-cap469"), \
- _CAP(CAP470, 0, "x-cap470"), \
- _CAP(CAP471, 0, "x-cap471"), \
- _CAP(CAP472, 0, "x-cap472"), \
- _CAP(CAP473, 0, "x-cap473"), \
- _CAP(CAP474, 0, "x-cap474"), \
- _CAP(CAP475, 0, "x-cap475"), \
- _CAP(CAP476, 0, "x-cap476"), \
- _CAP(CAP477, 0, "x-cap477"), \
- _CAP(CAP478, 0, "x-cap478"), \
- _CAP(CAP479, 0, "x-cap479"), \
- _CAP(CAP480, 0, "x-cap480"), \
- _CAP(CAP481, 0, "x-cap481"), \
- _CAP(CAP482, 0, "x-cap482"), \
- _CAP(CAP483, 0, "x-cap483"), \
- _CAP(CAP484, 0, "x-cap484"), \
- _CAP(CAP485, 0, "x-cap485"), \
- _CAP(CAP486, 0, "x-cap486"), \
- _CAP(CAP487, 0, "x-cap487"), \
- _CAP(CAP488, 0, "x-cap488"), \
- _CAP(CAP489, 0, "x-cap489"), \
- _CAP(CAP490, 0, "x-cap490"), \
- _CAP(CAP491, 0, "x-cap491"), \
- _CAP(CAP492, 0, "x-cap492"), \
- _CAP(CAP493, 0, "x-cap493"), \
- _CAP(CAP494, 0, "x-cap494"), \
- _CAP(CAP495, 0, "x-cap495"), \
- _CAP(CAP496, 0, "x-cap496"), \
- _CAP(CAP497, 0, "x-cap497"), \
- _CAP(CAP498, 0, "x-cap498"), \
- _CAP(CAP499, 0, "x-cap499"), \
- _CAP(CAP500, 0, "x-cap500"), \
- _CAP(CAP501, 0, "x-cap501"), \
- _CAP(CAP502, 0, "x-cap502"), \
- _CAP(CAP503, 0, "x-cap503"), \
- _CAP(CAP504, 0, "x-cap504"), \
- _CAP(CAP505, 0, "x-cap505"), \
- _CAP(CAP506, 0, "x-cap506"), \
- _CAP(CAP507, 0, "x-cap507"), \
- _CAP(CAP508, 0, "x-cap508"), \
- _CAP(CAP509, 0, "x-cap509"), \
- _CAP(CAP510, 0, "x-cap510"), \
- _CAP(CAP511, 0, "x-cap511"), \
- _CAP(CAP512, 0, "x-cap512"), \
- _CAP(CAP513, 0, "x-cap513"), \
- _CAP(CAP514, 0, "x-cap514"), \
- _CAP(CAP515, 0, "x-cap515"), \
- _CAP(CAP516, 0, "x-cap516"), \
- _CAP(CAP517, 0, "x-cap517"), \
- _CAP(CAP518, 0, "x-cap518"), \
- _CAP(CAP519, 0, "x-cap519"), \
- _CAP(CAP520, 0, "x-cap520"), \
- _CAP(CAP521, 0, "x-cap521"), \
- _CAP(CAP522, 0, "x-cap522"), \
- _CAP(CAP523, 0, "x-cap523"), \
- _CAP(CAP524, 0, "x-cap524"), \
- _CAP(CAP525, 0, "x-cap525"), \
- _CAP(CAP526, 0, "x-cap526"), \
- _CAP(CAP527, 0, "x-cap527"), \
- _CAP(CAP528, 0, "x-cap528"), \
- _CAP(CAP529, 0, "x-cap529"), \
- _CAP(CAP530, 0, "x-cap530"), \
- _CAP(CAP531, 0, "x-cap531"), \
- _CAP(CAP532, 0, "x-cap532"), \
- _CAP(CAP533, 0, "x-cap533"), \
- _CAP(CAP534, 0, "x-cap534"), \
- _CAP(CAP535, 0, "x-cap535"), \
- _CAP(CAP536, 0, "x-cap536"), \
- _CAP(CAP537, 0, "x-cap537"), \
- _CAP(CAP538, 0, "x-cap538"), \
- _CAP(CAP539, 0, "x-cap539"), \
- _CAP(CAP540, 0, "x-cap540"), \
- _CAP(CAP541, 0, "x-cap541"), \
- _CAP(CAP542, 0, "x-cap542"), \
- _CAP(CAP543, 0, "x-cap543"), \
- _CAP(CAP544, 0, "x-cap544"), \
- _CAP(CAP545, 0, "x-cap545"), \
- _CAP(CAP546, 0, "x-cap546"), \
- _CAP(CAP547, 0, "x-cap547"), \
- _CAP(CAP548, 0, "x-cap548"), \
- _CAP(CAP549, 0, "x-cap549"), \
- _CAP(CAP550, 0, "x-cap550"), \
- _CAP(CAP551, 0, "x-cap551"), \
- _CAP(CAP552, 0, "x-cap552"), \
- _CAP(CAP553, 0, "x-cap553"), \
- _CAP(CAP554, 0, "x-cap554"), \
- _CAP(CAP555, 0, "x-cap555"), \
- _CAP(CAP556, 0, "x-cap556"), \
- _CAP(CAP557, 0, "x-cap557"), \
- _CAP(CAP558, 0, "x-cap558"), \
- _CAP(CAP559, 0, "x-cap559"), \
- _CAP(CAP560, 0, "x-cap560"), \
- _CAP(CAP561, 0, "x-cap561"), \
- _CAP(CAP562, 0, "x-cap562"), \
- _CAP(CAP563, 0, "x-cap563"), \
- _CAP(CAP564, 0, "x-cap564"), \
- _CAP(CAP565, 0, "x-cap565"), \
- _CAP(CAP566, 0, "x-cap566"), \
- _CAP(CAP567, 0, "x-cap567"), \
- _CAP(CAP568, 0, "x-cap568"), \
- _CAP(CAP569, 0, "x-cap569"), \
- _CAP(CAP570, 0, "x-cap570"), \
- _CAP(CAP571, 0, "x-cap571"), \
- _CAP(CAP572, 0, "x-cap572"), \
- _CAP(CAP573, 0, "x-cap573"), \
- _CAP(CAP574, 0, "x-cap574"), \
- _CAP(CAP575, 0, "x-cap575"), \
- _CAP(CAP576, 0, "x-cap576"), \
- _CAP(CAP577, 0, "x-cap577"), \
- _CAP(CAP578, 0, "x-cap578"), \
- _CAP(CAP579, 0, "x-cap579"), \
- _CAP(CAP580, 0, "x-cap580"), \
- _CAP(CAP581, 0, "x-cap581"), \
- _CAP(CAP582, 0, "x-cap582"), \
- _CAP(CAP583, 0, "x-cap583"), \
- _CAP(CAP584, 0, "x-cap584"), \
- _CAP(CAP585, 0, "x-cap585"), \
- _CAP(CAP586, 0, "x-cap586"), \
- _CAP(CAP587, 0, "x-cap587"), \
- _CAP(CAP588, 0, "x-cap588"), \
- _CAP(CAP589, 0, "x-cap589"), \
- _CAP(CAP590, 0, "x-cap590"), \
- _CAP(CAP591, 0, "x-cap591"), \
- _CAP(CAP592, 0, "x-cap592"), \
- _CAP(CAP593, 0, "x-cap593"), \
- _CAP(CAP594, 0, "x-cap594"), \
- _CAP(CAP595, 0, "x-cap595"), \
- _CAP(CAP596, 0, "x-cap596"), \
- _CAP(CAP597, 0, "x-cap597"), \
- _CAP(CAP598, 0, "x-cap598"), \
- _CAP(CAP599, 0, "x-cap599")
+#define CAPLIST \
+ _CAP(USERPFX, 0, "undernet.org/userpfx")
/** Client capabilities */
enum Capab {
Index: ircd-ircdev/include/client.h
diff -u ircd-ircdev/include/client.h:1.14 ircd-ircdev/include/client.h:1.15
--- ircd-ircdev/include/client.h:1.14 Sat Apr 2 11:47:34 2005
+++ ircd-ircdev/include/client.h Mon Apr 11 01:44:59 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Structures and functions for handling local clients.
- * @version $Id: client.h,v 1.14 2005/04/02 19:47:34 zolty Exp $
+ * @version $Id: client.h,v 1.15 2005/04/11 08:44:59 zolty Exp $
*/
#ifndef INCLUDED_client_h
#define INCLUDED_client_h
@@ -248,8 +248,8 @@
struct Timer con_proc; /**< process latent messages from
client */
struct Privs con_privs; /**< Oper privileges */
- struct CapSet con_capab; /**< Client capabilities */
- struct CapSet con_active; /**< Active client capabilities */
+ struct CapSet con_capab; /**< Client capabilities (from us) */
+ struct CapSet con_active; /**< Active capabilities (to us) */
struct AuthRequest* con_auth; /**< auth request for client */
struct IAuthRequest* con_iauth; /**< iauth request for client */
};
Index: ircd-ircdev/include/numeric.h
diff -u ircd-ircdev/include/numeric.h:1.11 ircd-ircdev/include/numeric.h:1.12
--- ircd-ircdev/include/numeric.h:1.11 Sat Apr 2 11:47:34 2005
+++ ircd-ircdev/include/numeric.h Mon Apr 11 01:44:59 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Declarations of numeric replies and supporting functions.
- * @version $Id: numeric.h,v 1.11 2005/04/02 19:47:34 zolty Exp $
+ * @version $Id: numeric.h,v 1.12 2005/04/11 08:44:59 zolty Exp $
*/
#ifndef INCLUDED_numeric_h
#define INCLUDED_numeric_h
@@ -66,9 +66,9 @@
#define RPL_MAP 15 /* Undernet extension */
#define RPL_MAPMORE 16 /* Undernet extension */
#define RPL_MAPEND 17 /* Undernet extension */
-#if defined(UNDERNET)
-#define RPL_APASSWARN 30 /* Undernet extension */
-#endif
+#define RPL_APASSWARN_SET 30 /* Undernet extension */
+#define RPL_APASSWARN_SECRET 31 /* Undernet extension */
+#define RPL_APASSWARN_CLEAR 32 /* Undernet extension */
/* RPL_YOURID 42 IRCnet extension */
/* RPL_ATTEMPTINGJUNC 50 aircd extension */
/* RPL_ATTEMPTINGREROUTE 51 aircd extension */
@@ -462,13 +462,13 @@
ERR_WHOLIMEXCEED 523 dalnet */
#define ERR_QUARANTINED 524 /* Undernet extension -Vampire */
-#if defined(UNDERNET)
#define ERR_NOTLOWEROPLEVEL 550 /* Undernet extension */
#define ERR_NOTMANAGER 551 /* Undernet extension */
#define ERR_CHANSECURED 552 /* Undernet extension */
#define ERR_UPASSSET 553 /* Undernet extension */
#define ERR_UPASSNOTSET 554 /* Undernet extension */
-#endif
+#define ERR_NOMANAGER_LONG 555 /* Undernet extension */
+#define ERR_NOMANAGER_SHORT 556 /* Undernet extension */
#define RPL_LOGON 600 /* Dalnet extension */
#define RPL_LOGOFF 601 /* Dalnet extension */
Index: ircd-ircdev/include/s_conf.h
diff -u ircd-ircdev/include/s_conf.h:1.9 ircd-ircdev/include/s_conf.h:1.10
--- ircd-ircdev/include/s_conf.h:1.9 Sat Apr 2 11:47:34 2005
+++ ircd-ircdev/include/s_conf.h Mon Apr 11 01:44:59 2005
@@ -21,7 +21,7 @@
*/
/** @file s_conf.h
* @brief ircd configuration file API.
- * @version $Id: s_conf.h,v 1.9 2005/04/02 19:47:34 zolty Exp $
+ * @version $Id: s_conf.h,v 1.10 2005/04/11 08:44:59 zolty Exp $
*/
#ifndef INCLUDED_s_conf_h
#define INCLUDED_s_conf_h
@@ -205,6 +205,7 @@
extern const char *find_quarantine(const char* chname);
extern void lookup_confhost(struct ConfItem *aconf);
extern void conf_parse_userhost(struct ConfItem *aconf, char *host);
+extern struct ConfItem *conf_debug_iline(const char *client);
extern void yyerror(const char *msg);
Index: ircd-ircdev/ircd/Makefile.in
diff -u ircd-ircdev/ircd/Makefile.in:1.21 ircd-ircdev/ircd/Makefile.in:1.22
--- ircd-ircdev/ircd/Makefile.in:1.21 Thu Mar 31 04:58:03 2005
+++ ircd-ircdev/ircd/Makefile.in Mon Apr 11 01:44:59 2005
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA
-# $Id: Makefile.in,v 1.21 2005/03/31 12:58:03 zolty Exp $
+# $Id: Makefile.in,v 1.22 2005/04/11 08:44:59 zolty Exp $
#### Start of system configuration section. ####
@@ -45,6 +45,7 @@
LEX = @LEX@
YACC = @YACC@
ENGINE_C = @ENGINE_C@
+ENVIRONMENT = @ENVIRONMENT@
@SET_MAKE@
BINDIR = @bindir@
@@ -234,6 +235,18 @@
whowas.c \
y.tab.c
+
+#@if [ENVIRONMENT = "DDB"]; then \
+# SRC = ${IRCD_SRC} ${DDB_SRC} ${ENGINE_C} ${CRYPTO_SRC} \
+#else \
+# if [ENVIRONMENT = "SERVICES"]; then \
+# SRC = ${IRCD_SRC} ${SERVICES_SRC} ${ENGINE_C} ${CRYPTO_SRC} \
+# else \
+# if [ENVIRONMENT = "UNDERNET"]; then \
+# SRC = ${IRCD_SRC} ${UNDERNET_SRC} ${ENGINE_C} ${CRYPTO_SRC} \
+# fi \
+# fi \
+#fi
#TODO Arreglar esto
#Para undernet
#SRC = ${IRCD_SRC} ${UNDERNET_SRC} ${ENGINE_C} ${CRYPTO_SRC}
Index: ircd-ircdev/ircd/channel.c
diff -u ircd-ircdev/ircd/channel.c:1.16 ircd-ircdev/ircd/channel.c:1.17
--- ircd-ircdev/ircd/channel.c:1.16 Sat Apr 2 11:47:34 2005
+++ ircd-ircdev/ircd/channel.c Mon Apr 11 01:45:00 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.16 2005/04/02 19:47:34 zolty Exp $
+ * @version $Id: channel.c,v 1.17 2005/04/11 08:45:00 zolty Exp $
*/
#include "config.h"
@@ -2579,7 +2579,7 @@
if (state->flags & MODE_PARSE_FORCE && MyUser(state->sptr)
&& !HasPriv(state->sptr, PRIV_APASS_OPMODE)) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, " <AdminPass>.");
+ state->chptr->chname);
return;
}
@@ -2587,16 +2587,15 @@
if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, "<AdminPass>.");
+ state->chptr->chname);
+ } else if (TStime() - state->chptr->creationtime >= 171000) {
+ send_reply(state->sptr, ERR_NOMANAGER_LONG, state->chptr->chname);
} else {
- send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Re-create the channel. The channel must be *empty* for",
- TStime() - state->chptr->creationtime >= 171000 ? "48 contiguous hours" : "a minute or two",
- "before it can be recreated.");
+ send_reply(state->sptr, ERR_NOMANAGER_SHORT, state->chptr->chname);
}
return;
}
-
+
if (state->done & DONE_UPASS) /* allow upass to be set only once */
return;
state->done |= DONE_UPASS;
@@ -2619,7 +2618,7 @@
if (!state->mbuf)
return;
- if (!(state->flags & MODE_PARSE_FORCE))
+ if (!(state->flags & MODE_PARSE_FORCE)) {
/* can't add the upass while apass is not set */
if (state->dir == MODE_ADD && !*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_UPASSNOTSET, state->chptr->chname, state->chptr->chname);
@@ -2632,6 +2631,7 @@
send_reply(state->sptr, ERR_KEYSET, state->chptr->chname);
return;
}
+ }
if (!(state->flags & MODE_PARSE_WIPEOUT) && state->dir == MODE_ADD &&
!ircd_strcmp(state->chptr->mode.upass, t_str))
@@ -2687,7 +2687,7 @@
if (state->flags & MODE_PARSE_FORCE && MyUser(state->sptr)
&& !HasPriv(state->sptr, PRIV_APASS_OPMODE)) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, " <AdminPass>.");
+ state->chptr->chname);
return;
}
@@ -2701,15 +2701,15 @@
if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Use /JOIN", state->chptr->chname, "<AdminPass>.");
+ state->chptr->chname);
+ } else if (TStime() - state->chptr->creationtime >= 171000) {
+ send_reply(state->sptr, ERR_NOMANAGER_LONG, state->chptr->chname);
} else {
- send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
- "Re-create the channel. The channel must be *empty* for",
- "at least a whole minute", "before it can be recreated.");
+ send_reply(state->sptr, ERR_NOMANAGER_SHORT, state->chptr->chname);
}
return;
}
-
+
if (state->done & DONE_APASS) /* allow apass to be set only once */
return;
state->done |= DONE_APASS;
@@ -2764,25 +2764,14 @@
/* Make it VERY clear to the user that this is a one-time password */
ircd_strncpy(state->chptr->mode.apass, t_str, PASSLEN);
if (MyUser(state->sptr)) {
- send_reply(state->sptr, RPL_APASSWARN,
- "Channel Admin password (+A) set to '", state->chptr->mode.apass, "'. ",
- "Are you SURE you want to use this as Admin password? ",
- "You will NOT be able to change this password anymore once the channel is more than 48 hours old!");
- send_reply(state->sptr, RPL_APASSWARN,
- "Use \"/MODE ", state->chptr->chname, " -A ", state->chptr->mode.apass,
- "\" to remove the password and then immediately set a new one. "
- "IMPORTANT: YOU CANNOT RECOVER THIS PASSWORD, EVER; "
- "WRITE THE PASSWORD DOWN (don't store this rescue password on disk)! "
- "Now set the channel user password (+U).");
+ send_reply(state->sptr, RPL_APASSWARN_SET, state->chptr->mode.apass);
+ send_reply(state->sptr, RPL_APASSWARN_SECRET, state->chptr->chname,
+ state->chptr->mode.apass);
}
} else { /* remove the old apass */
*state->chptr->mode.apass = '\0';
if (MyUser(state->sptr))
- send_reply(state->sptr, RPL_APASSWARN,
- "WARNING: You removed the channel Admin password MODE (+A). ",
- "If you would disconnect or leave the channel without setting a new password then you will ",
- "not be able to set it again and lose ownership of this channel! ",
- "SET A NEW PASSWORD NOW!", "");
+ send_reply(state->sptr, RPL_APASSWARN_CLEAR);
}
}
}
Index: ircd-ircdev/ircd/ircd.c
diff -u ircd-ircdev/ircd/ircd.c:1.14 ircd-ircdev/ircd/ircd.c:1.15
--- ircd-ircdev/ircd/ircd.c:1.14 Wed Mar 23 10:34:47 2005
+++ ircd-ircdev/ircd/ircd.c Mon Apr 11 01:45:00 2005
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.14 2005/03/23 18:34:47 zolty Exp $
+ * @version $Id: ircd.c,v 1.15 2005/04/11 08:45:00 zolty Exp $
*/
#include "config.h"
@@ -72,6 +72,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -111,6 +114,7 @@
int debuglevel = -1; /**< Server debug level */
char *debugmode = ""; /**< Server debug level */
static ...
[truncated message content] |
