Thread: [IRC-Dev CVS] SF.net SVN: irc-dev: [182] ircd/trunk
Brought to you by:
zolty
From: <zo...@us...> - 2008-06-12 12:38:27
|
Revision: 182 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=182&view=rev Author: zolty Date: 2008-06-12 05:38:26 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Regeneracion de autotools Modified Paths: -------------- ircd/trunk/Makefile.in ircd/trunk/aclocal.m4 ircd/trunk/config.h.in ircd/trunk/configure ircd/trunk/ircd/Makefile.in ircd/trunk/ircd/test/Makefile.in Modified: ircd/trunk/Makefile.in =================================================================== --- ircd/trunk/Makefile.in 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/Makefile.in 2008-06-12 12:38:26 UTC (rev 182) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -384,8 +384,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -410,8 +410,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -421,13 +421,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -501,6 +500,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -527,6 +530,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -682,18 +687,19 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-sysconfDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-man uninstall-man8 uninstall-sysconfDATA + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sysconfDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-man \ + uninstall-man8 uninstall-sysconfDATA # Make sure to filter out those CVS directories Modified: ircd/trunk/aclocal.m4 =================================================================== --- ircd/trunk/aclocal.m4 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/aclocal.m4 2008-06-12 12:38:26 UTC (rev 182) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,12 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -47,8 +50,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -320,7 +325,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -368,13 +373,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -479,16 +484,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -781,7 +787,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Modified: ircd/trunk/config.h.in =================================================================== --- ircd/trunk/config.h.in 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/config.h.in 2008-06-12 12:38:26 UTC (rev 182) @@ -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.16 2008-01-19 19:25:56 zolty Exp $ + * $Id: acconfig.h,v 1.4 2007-04-19 22:53:46 zolty Exp $ * */ #ifndef INCLUDED_config_h Modified: ircd/trunk/configure =================================================================== --- ircd/trunk/configure 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/configure 2008-06-12 12:38:26 UTC (rev 182) @@ -12041,21 +12041,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12092,7 +12093,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Modified: ircd/trunk/ircd/Makefile.in =================================================================== --- ircd/trunk/ircd/Makefile.in 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/ircd/Makefile.in 2008-06-12 12:38:26 UTC (rev 182) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,7 +176,7 @@ umkpasswd.$(OBJEXT) umkpasswd_OBJECTS = $(am_umkpasswd_OBJECTS) umkpasswd_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -679,8 +679,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -705,8 +705,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -716,13 +716,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique Modified: ircd/trunk/ircd/test/Makefile.in =================================================================== --- ircd/trunk/ircd/test/Makefile.in 2008-06-12 12:28:50 UTC (rev 181) +++ ircd/trunk/ircd/test/Makefile.in 2008-06-12 12:38:26 UTC (rev 182) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ ircd_string.$(OBJEXT) ircd_string_t_OBJECTS = $(am_ircd_string_t_OBJECTS) ircd_string_t_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -337,8 +337,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -350,8 +350,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -361,13 +361,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-06-16 21:01:30
|
Revision: 185 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=185&view=rev Author: zolty Date: 2008-06-16 14:01:26 -0700 (Mon, 16 Jun 2008) Log Message: ----------- Habilitamos tabla f, tabla o y tabla p de la DDB Modified Paths: -------------- ircd/trunk/include/ddb.h ircd/trunk/ircd/ddb.c Modified: ircd/trunk/include/ddb.h =================================================================== --- ircd/trunk/include/ddb.h 2008-06-16 20:53:45 UTC (rev 184) +++ ircd/trunk/include/ddb.h 2008-06-16 21:01:26 UTC (rev 185) @@ -51,10 +51,16 @@ #define DDB_CHANDB 'c' /** Channels table (nicks) of %DDB Distributed Databases. */ #define DDB_CHANDB2 'd' +/** Features table of %DDB Distributed Databases. */ +#define DDB_FEATUREDB 'f' /** Ilines table of %DDB Distributed Databases. */ #define DDB_ILINEDB 'i' /** Nicks table of %DDB Distributed Databases. */ #define DDB_NICKDB 'n' +/** Operators table of %DDB Distributed Databases. */ +#define DDB_OPERDB 'o' +/** Privileges table of %DDB Distributed Databases. */ +#define DDB_PRIVSDB 'p' /** Vhost table of %DDB Distributed Databases. */ #define DDB_VHOSTDB 'v' /** Config table of %DDB Distributed Databases. */ Modified: ircd/trunk/ircd/ddb.c =================================================================== --- ircd/trunk/ircd/ddb.c 2008-06-16 20:53:45 UTC (rev 184) +++ ircd/trunk/ircd/ddb.c 2008-06-16 21:01:26 UTC (rev 185) @@ -206,8 +206,11 @@ */ ddb_resident_table[DDB_CHANDB] = 4096; ddb_resident_table[DDB_CHANDB2] = 32768; + ddb_resident_table[DDB_FEATUREDB] = 256; ddb_resident_table[DDB_ILINEDB] = 256; ddb_resident_table[DDB_NICKDB] = 32768; + ddb_resident_table[DDB_OPERDB] = 256; + ddb_resident_table[DDB_PRIVSDB] = 256; ddb_resident_table[DDB_VHOSTDB] = 256; ddb_resident_table[DDB_CONFIGDB] = 256; @@ -378,14 +381,6 @@ strcpy(k, key); strcpy(c, content); -/* - while (c[i] != 0) - { - k[i] = ToLower(c[i]); - i++; - } -*/ - ddb_key(ddb) = k; ddb_content(ddb) = c; ddb_next(ddb) = NULL; @@ -625,19 +620,10 @@ } strcpy(k, key); -/* - while (k[i]) - { - k[i] = ToLower(k[i]); - i++; - } -*/ - hashi = ddb_hash_register(k, ddb_resident_table[table]); for (ddb = ddb_data_table[table][hashi]; ddb; ddb = ddb_next(ddb)) { -/* if (!strcmp(ddb_key(ddb), k)) */ if (!ircd_strcmp(ddb_key(ddb), k)) { assert(0 != ddb_content(ddb)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-07-08 20:39:59
|
Revision: 187 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=187&view=rev Author: zolty Date: 2008-07-08 13:40:01 -0700 (Tue, 08 Jul 2008) Log Message: ----------- Elimino el modo +T Modified Paths: -------------- ircd/trunk/include/channel.h ircd/trunk/ircd/channel.c ircd/trunk/ircd/ircd_relay.c ircd/trunk/ircd/m_clearmode.c Modified: ircd/trunk/include/channel.h =================================================================== --- ircd/trunk/include/channel.h 2008-07-08 20:25:08 UTC (rev 186) +++ ircd/trunk/include/channel.h 2008-07-08 20:40:01 UTC (rev 187) @@ -134,8 +134,7 @@ * pending */ #define MODE_NOQUITPARTS 0x800000 -#define MODE_NOMULTITARGET 0x1000000 /**< +T No multiple targets */ -#define MODE_MODERATENOREG 0x2000000 /**< +M Moderate unauthed users */ +#define MODE_MODERATENOREG 0x1000000 /**< +M Moderate unauthed users */ #if defined(UNDERNET) /** mode flags which take another parameter (With PARAmeterS) @@ -143,7 +142,7 @@ #define MODE_WPARAS (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT|MODE_APASS|MODE_UPASS) /** Available Channel modes */ -#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstUvrDcCNuMT" : "biklmnopstvrDcCNuMT" +#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstUvrDcCNuM" : "biklmnopstvrDcCNuM" /** Available Channel modes that take parameters */ #define infochanmodeswithparams feature_bool(FEAT_OPLEVELS) ? "AbkloUv" : "bklov" #elif defined(DDB) || defined(SERVICES) @@ -152,7 +151,7 @@ #define MODE_WPARAS (MODE_OWNER|MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT) /** Available Channel modes */ -#define infochanmodes "biklmnopstvrRDqcCNuMT" +#define infochanmodes "biklmnopstvrRDqcCNuM" /** Available Channel modes that take parameters */ #define infochanmodeswithparams "bklovq" #else @@ -161,7 +160,7 @@ #define MODE_WPARAS (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT) /** Available Channel modes */ -#define infochanmodes "biklmnopstvrDcCNuMT" +#define infochanmodes "biklmnopstvrDcCNuM" /** Available Channel modes that take parameters */ #define infochanmodeswithparams "bklov" #endif Modified: ircd/trunk/ircd/channel.c =================================================================== --- ircd/trunk/ircd/channel.c 2008-07-08 20:25:08 UTC (rev 186) +++ ircd/trunk/ircd/channel.c 2008-07-08 20:40:01 UTC (rev 187) @@ -883,8 +883,6 @@ *mbuf++ = 'u'; if (chptr->mode.mode & MODE_DELJOINS) *mbuf++ = 'D'; - if (chptr->mode.mode & MODE_NOMULTITARGET) - *mbuf++ = 'T'; if (chptr->mode.mode & MODE_MODERATENOREG) *mbuf++ = 'M'; else if (MyUser(cptr) && (chptr->mode.mode & MODE_WASDELJOINS)) @@ -1725,7 +1723,6 @@ MODE_NOCOLOUR, 'c', MODE_NOCTCP, 'C', MODE_NONOTICE, 'N', - MODE_NOMULTITARGET, 'T', MODE_MODERATENOREG, 'M', 0x0, 0x0 }; @@ -2228,7 +2225,7 @@ #if defined(DDB) || defined(SERVICES) MODE_REGCHAN | #endif - MODE_NOCTCP | MODE_NONOTICE | MODE_NOMULTITARGET | + MODE_NOCTCP | MODE_NONOTICE | MODE_NOQUITPARTS | MODE_NOCOLOUR | MODE_MODERATENOREG | MODE_DELJOINS | MODE_WASDELJOINS); @@ -2394,7 +2391,6 @@ MODE_NOCOLOUR, 'c', MODE_NOCTCP, 'C', MODE_NONOTICE, 'N', - MODE_NOMULTITARGET, 'T', MODE_MODERATENOREG, 'M', 0x0, 0x0 }; @@ -3559,7 +3555,6 @@ MODE_NOCOLOUR, 'c', MODE_NOCTCP, 'C', MODE_NONOTICE, 'N', - MODE_NOMULTITARGET, 'T', MODE_MODERATENOREG, 'M', MODE_ADD, '+', MODE_DEL, '-', Modified: ircd/trunk/ircd/ircd_relay.c =================================================================== --- ircd/trunk/ircd/ircd_relay.c 2008-07-08 20:25:08 UTC (rev 186) +++ ircd/trunk/ircd/ircd_relay.c 2008-07-08 20:40:01 UTC (rev 187) @@ -105,14 +105,6 @@ check_target_limit(sptr, chptr, chptr->chname, 0)) return; - /* +T check */ -#if 0 - if ((chptr->mode.mode & MODE_NOMULTITARGET) && (targetc > 1)) { - send_reply(sptr, ERR_CANNOTSENDTOCHAN, chptr->chname); - return; - } -#endif - /* +cC checks */ if (chptr->mode.mode & MODE_NOCOLOUR) for (ch=text;*ch;ch++) @@ -161,12 +153,6 @@ if ((chptr->mode.mode & MODE_NONOTICE)) return; -#if 0 - /* +T check */ - if ((chptr->mode.mode & MODE_NOMULTITARGET) && (targetc > 1)) - return; -#endif - /* +cC checks */ if (chptr->mode.mode & MODE_NOCOLOUR) for (ch=text;*ch;ch++) Modified: ircd/trunk/ircd/m_clearmode.c =================================================================== --- ircd/trunk/ircd/m_clearmode.c 2008-07-08 20:25:08 UTC (rev 186) +++ ircd/trunk/ircd/m_clearmode.c 2008-07-08 20:40:01 UTC (rev 187) @@ -76,7 +76,6 @@ MODE_NOCOLOUR, 'c', MODE_NOCTCP, 'C', MODE_NONOTICE, 'N', - MODE_NOMULTITARGET, 'T', MODE_MODERATENOREG, 'M', 0x0, 0x0 }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-07-12 16:48:42
|
Revision: 189 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=189&view=rev Author: zolty Date: 2008-07-12 09:48:42 -0700 (Sat, 12 Jul 2008) Log Message: ----------- Regeneracion Makefile Modified Paths: -------------- ircd/trunk/Makefile.in ircd/trunk/ircd/Makefile.in ircd/trunk/ircd/test/Makefile.in Modified: ircd/trunk/Makefile.in =================================================================== --- ircd/trunk/Makefile.in 2008-07-09 17:50:17 UTC (rev 188) +++ ircd/trunk/Makefile.in 2008-07-12 16:48:42 UTC (rev 189) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -384,8 +384,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -410,8 +410,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -421,12 +421,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -500,10 +501,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -530,8 +527,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -687,19 +682,18 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man8 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-sysconfDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-man \ - uninstall-man8 uninstall-sysconfDATA + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-sysconfDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-man uninstall-man8 uninstall-sysconfDATA # Make sure to filter out those CVS directories Modified: ircd/trunk/ircd/Makefile.in =================================================================== --- ircd/trunk/ircd/Makefile.in 2008-07-09 17:50:17 UTC (rev 188) +++ ircd/trunk/ircd/Makefile.in 2008-07-12 16:48:42 UTC (rev 189) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -176,7 +176,7 @@ umkpasswd.$(OBJEXT) umkpasswd_OBJECTS = $(am_umkpasswd_OBJECTS) umkpasswd_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -679,8 +679,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -705,8 +705,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -716,12 +716,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique Modified: ircd/trunk/ircd/test/Makefile.in =================================================================== --- ircd/trunk/ircd/test/Makefile.in 2008-07-09 17:50:17 UTC (rev 188) +++ ircd/trunk/ircd/test/Makefile.in 2008-07-12 16:48:42 UTC (rev 189) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ ircd_string.$(OBJEXT) ircd_string_t_OBJECTS = $(am_ircd_string_t_OBJECTS) ircd_string_t_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -337,8 +337,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -350,8 +350,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -361,12 +361,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-07-12 16:50:25
|
Revision: 190 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=190&view=rev Author: zolty Date: 2008-07-12 09:50:33 -0700 (Sat, 12 Jul 2008) Log Message: ----------- Regeneracion autoconf Modified Paths: -------------- ircd/trunk/aclocal.m4 ircd/trunk/configure ircd/trunk/configure.ac Modified: ircd/trunk/aclocal.m4 =================================================================== --- ircd/trunk/aclocal.m4 2008-07-12 16:48:42 UTC (rev 189) +++ ircd/trunk/aclocal.m4 2008-07-12 16:50:33 UTC (rev 190) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -325,7 +320,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -373,13 +368,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -484,17 +479,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -787,7 +781,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) Modified: ircd/trunk/configure =================================================================== --- ircd/trunk/configure 2008-07-12 16:48:42 UTC (rev 189) +++ ircd/trunk/configure 2008-07-12 16:50:33 UTC (rev 190) @@ -12041,22 +12041,21 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. -_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $ac_file | $ac_file:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12093,7 +12092,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Modified: ircd/trunk/configure.ac =================================================================== --- ircd/trunk/configure.ac 2008-07-12 16:48:42 UTC (rev 189) +++ ircd/trunk/configure.ac 2008-07-12 16:50:33 UTC (rev 190) @@ -121,11 +121,11 @@ curl_cv_socklen_t_equiv= for arg2 in "struct sockaddr" void ; do for t in int size_t unsigned long "unsigned long" ; do - AC_TRY_COMPILE([#include <sys/types.h> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <sys/socket.h> -int getpeername (int $arg2 *, $t *);],[$t len; - getpeername(0, 0, &len);], [curl_cv_socklen_t_equiv="$t" - break]) +int getpeername (int $arg2 *, $t *);]], [[$t len; + getpeername(0, 0, &len);]])],[curl_cv_socklen_t_equiv="$t" + break],[]) done done ]) @@ -423,7 +423,7 @@ [Maximum number of network connections]) dnl Report configuration -dnl AC_OUTPUT_COMMANDS([echo " +dnl AC_CONFIG_COMMANDS([default-1],[[echo " dnl ircu is now hopefully configured for your system. dnl Host system: $host_os @@ -438,7 +438,7 @@ dnl kqueue() engine: $unet_cv_enable_kqueue dnl /dev/poll engine: $unet_cv_enable_devpoll dnl epoll() engine: $unet_cv_enable_epoll -dnl "]) +dnl "]],[[]]) dnl Output everything... dnl AC_OUTPUT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-07-12 20:53:21
|
Revision: 191 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=191&view=rev Author: zolty Date: 2008-07-12 13:53:24 -0700 (Sat, 12 Jul 2008) Log Message: ----------- nuevos modos usuario +ahBX y unificacion status Modified Paths: -------------- ircd/trunk/include/client.h ircd/trunk/include/numeric.h ircd/trunk/ircd/ircd_relay.c ircd/trunk/ircd/listener.c ircd/trunk/ircd/m_info.c ircd/trunk/ircd/m_invite.c ircd/trunk/ircd/m_kick.c ircd/trunk/ircd/m_lusers.c ircd/trunk/ircd/m_mode.c ircd/trunk/ircd/m_notice.c ircd/trunk/ircd/m_privmsg.c ircd/trunk/ircd/m_server.c ircd/trunk/ircd/m_settime.c ircd/trunk/ircd/m_trace.c ircd/trunk/ircd/m_userhost.c ircd/trunk/ircd/m_userip.c ircd/trunk/ircd/m_watch.c ircd/trunk/ircd/m_who.c ircd/trunk/ircd/m_whois.c ircd/trunk/ircd/m_whowas.c ircd/trunk/ircd/s_err.c ircd/trunk/ircd/s_numeric.c ircd/trunk/ircd/s_user.c ircd/trunk/ircd/watch.c Modified: ircd/trunk/include/client.h =================================================================== --- ircd/trunk/include/client.h 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/include/client.h 2008-07-12 20:53:24 UTC (rev 191) @@ -111,6 +111,8 @@ PRIV_LIST_CHAN, /**< oper can list secret channels */ PRIV_FORCE_OPMODE, /**< can hack modes on quarantined channels */ PRIV_FORCE_LOCAL_OPMODE, /**< can hack modes on quarantined local channels */ + PRIV_UMODE_K, /**< oper can set umode +k (Channel Service) */ + PRIV_UMODE_X, /**< oper can set umode +X (can view hidden host) */ #if defined(DDB) PRIV_DBQ, /**< oper can use DBQ (DataBase Query) */ #endif @@ -157,9 +159,13 @@ #elif defined(DDB) || defined(SERVICES) FLAG_NICKREG, /**< nick registered */ FLAG_NICKSUSPEND, /**< nick suspended */ + FLAG_HELPOPER, /**< nick is Help Operator */ + FLAG_ADMIN, /**< nick is Services Admin */ + FLAG_BOT, /**< nick is Services Bot */ #endif FLAG_MSGONLYREG, /**< only privmsg/notices from +r */ FLAG_HIDDENHOST, /**< user's host is hidden */ + FLAG_VIEWHIDDENHOST, /**< can view hiddenhost */ FLAG_SSL, /**< is a user with secure connection */ FLAG_LAST_FLAG, /**< number of flags */ FLAG_LOCAL_UMODES = FLAG_LOCOP, /**< First local mode flag */ @@ -590,6 +596,8 @@ #endif /** Return non-zero if the client has set mode +x (hidden host). */ #define IsHiddenHost(x) HasFlag(x, FLAG_HIDDENHOST) +/** Return non-zero if the client has set mode +X (can view hidden host). */ +#define IsViewHiddenHost(x) HasFlag(x, FLAG_VIEWHIDDENHOST) /** Return non-zero if the client has an active PING request. */ #define IsPingSent(x) HasFlag(x, FLAG_PINGSENT) #ifdef USE_SSL @@ -601,6 +609,12 @@ #define IsNickRegistered(x) HasFlag(x, FLAG_NICKREG) /** Return non-zero if the client has set mode +S (nick suspended) */ #define IsNickSuspended(x) HasFlag(x, FLAG_NICKSUSPEND) +/** Return non-zero if the client has set mode +h (Help Operator) */ +#define IsHelpOper(x) HasFlag(x, FLAG_HELPOPER) +/** Return non-zero if the client has set mode +a (Services Admin) */ +#define IsAdmin(x) HasFlag(x, FLAG_ADMIN) +/** Return non-zero if the client has set mode +B (Services Bot) */ +#define IsBot(x) HasFlag(x, FLAG_BOT) #endif /** Return non-zero if the client has set mode +R. */ #define IsMsgOnlyReg(x) HasFlag(x, FLAG_MSGONLYREG) @@ -654,6 +668,8 @@ #endif /** Mark a client as having mode +x (hidden host). */ #define SetHiddenHost(x) SetFlag(x, FLAG_HIDDENHOST) +/** Mark a client as having mode +X (can view hidden host). */ +#define SetViewHiddenHost(x) SetFlag(x, FLAG_VIEWHIDDENHOST) /** Mark a client as having a pending PING. */ #define SetPingSent(x) SetFlag(x, FLAG_PINGSENT) #ifdef USE_SSL @@ -665,6 +681,12 @@ #define SetNickRegistered(x) SetFlag(x, FLAG_NICKREG) /** Mark a client as having mode +S (nick suspended) */ #define SetNickSuspended(x) SetFlag(x, FLAG_NICKSUSPEND) +/** Mark a client as having mode +h (Help Operator) */ +#define SetHelpOper(x) SetFlag(x, FLAG_HELPOPER) +/** Mark a client as having mode +a (Services Admin) */ +#define SetAdmin(x) SetFlag(x, FLAG_ADMIN) +/** Mark a client as having mode +B (Services Bot) */ +#define SetBot(x) SetFlag(x, FLAG_BOT) #endif /** Mark a client as having mode +R. */ #define SetMsgOnlyReg(x) SetFlag(x, FLAG_MSGONLYREG) @@ -699,6 +721,8 @@ #define ClearServNotice(x) ClrFlag(x, FLAG_SERVNOTICE) /** Remove mode +x (hidden host) from the client. */ #define ClearHiddenHost(x) ClrFlag(x, FLAG_HIDDENHOST) +/** Remove mode +X (can view hidden host) from the client. */ +#define ClearViewHiddenHost(x) ClrFlag(x, FLAG_VIEWHIDDENHOST) /** Clear the client's pending PING flag. */ #define ClearPingSent(x) ClrFlag(x, FLAG_PINGSENT) #ifdef USE_SSL @@ -710,6 +734,12 @@ #define ClearNickRegistered(x) ClrFlag(x, FLAG_NICKREG) /** Remode mode +S (nick suspended) from the client */ #define ClearNickSuspended(x) ClrFlag(x, FLAG_NICKSUSPEND) +/** Remode mode +h (Help Operator) from the client */ +#define ClearHelpOper(x) ClrFlag(x, FLAG_HELPOPER) +/** Remode mode +A (Services Admin) from the client */ +#define ClearAdmin(x) ClrFlag(x, FLAG_ADMIN) +/** Remode mode +B (Services Bot) from the client */ +#define ClearBot(x) ClrFlag(x, FLAG_BOT) #endif /** Remove mode +R from the client. */ #define ClearMsgOnlyReg(x) ClrFlag(x, FLAG_MSGONLYREG) Modified: ircd/trunk/include/numeric.h =================================================================== --- ircd/trunk/include/numeric.h 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/include/numeric.h 2008-07-12 20:53:24 UTC (rev 191) @@ -224,7 +224,7 @@ /* RPL_ENDOFRULES 309 unreal */ /* RPL_WHOISHELPER 309 austnet */ /* RPL_WHOISSVCMSG 310 Dalnet */ -/* RPL_WHOISHELPOP 310 unreal */ +#define RPL_WHOISHELPOP 310 /* IRC-Dev, Unreal extension */ /* RPL_WHOISSERVICE 310 austnet */ #define RPL_WHOISUSER 311 /* See also RPL_ENDOFWHOIS */ #define RPL_WHOISSERVER 312 @@ -256,6 +256,7 @@ #define RPL_LISTUSAGE 334 /* Undernet extension */ /* RPL_COMMANDSYNTAX 334 Dalnet */ /* RPL_LISTSYNTAX 334 unreal */ +#define RPL_WHOISBOT 335 /* IRC-Dev, Unreal extension */ #define RPL_WHOISSSL 337 /* SSL */ /* RPL_CHANPASSOK 338 IRCnet extension (?)*/ #define RPL_WHOISACTUALLY 338 /* Undernet extension, dalnet */ Modified: ircd/trunk/ircd/ircd_relay.c =================================================================== --- ircd/trunk/ircd/ircd_relay.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/ircd_relay.c 2008-07-12 20:53:24 UTC (rev 191) @@ -369,7 +369,7 @@ return; #if defined(DDB) || defined(SERVICES) - if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsOper(sptr)) { + if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsAnOper(sptr)) { send_reply(sptr, ERR_NONONREG, cli_name(acptr)); return; } @@ -412,7 +412,7 @@ return; #if defined(DDB) || defined(SERVICES) - if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsOper(sptr)) + if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsAnOper(sptr)) return; #endif Modified: ircd/trunk/ircd/listener.c =================================================================== --- ircd/trunk/ircd/listener.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/listener.c 2008-07-12 20:53:24 UTC (rev 191) @@ -136,8 +136,8 @@ { struct Listener *listener = 0; char flags[8]; - int show_hidden = IsOper(sptr); - int count = (IsOper(sptr) || MyUser(sptr)) ? 100 : 8; + int show_hidden = IsAnOper(sptr); + int count = (IsAnOper(sptr) || MyUser(sptr)) ? 100 : 8; int port = 0; int len; Modified: ircd/trunk/ircd/m_info.c =================================================================== --- ircd/trunk/ircd/m_info.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_info.c 2008-07-12 20:53:24 UTC (rev 191) @@ -97,11 +97,11 @@ return 0; while (text[212]) { - if (!IsOper(sptr)) + if (!IsAnOper(sptr)) send_reply(sptr, RPL_INFO, *text); text++; } - if (IsOper(sptr)) + if (IsAnOper(sptr)) { while (*text) send_reply(sptr, RPL_INFO, *text++); @@ -135,11 +135,11 @@ { while (text[212]) { - if (!IsOper(sptr)) + if (!IsAnOper(sptr)) send_reply(sptr, RPL_INFO, *text); text++; } - if (IsOper(sptr) && (NULL != parv[1])) + if (IsAnOper(sptr) && (NULL != parv[1])) { while (*text) send_reply(sptr, RPL_INFO, *text++); Modified: ircd/trunk/ircd/m_invite.c =================================================================== --- ircd/trunk/ircd/m_invite.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_invite.c 2008-07-12 20:53:24 UTC (rev 191) @@ -116,7 +116,7 @@ /* If we get here, it was a VALID and meaningful INVITE */ #if defined(DDB) || defined(SERVICES) - if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsOper(sptr)) { + if (IsMsgOnlyReg(acptr) && !IsNickRegistered(sptr) && !IsAnOper(sptr)) { send_reply(sptr, ERR_NONONREG, cli_name(acptr)); return; } Modified: ircd/trunk/ircd/m_kick.c =================================================================== --- ircd/trunk/ircd/m_kick.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_kick.c 2008-07-12 20:53:24 UTC (rev 191) @@ -106,7 +106,7 @@ OpLevel(member) == OpLevel(member2) ? "the same" : "a higher"); #elif defined(DDB) || defined(SERVICES) /* Don't allow to kick channel owner */ - if (IsChanOwner(member) && !IsOper(sptr)) + if (IsChanOwner(member) && !IsAnOper(sptr)) return send_reply(sptr, ERR_ISCHANSERVICE, cli_name(who), chptr->chname); #endif Modified: ircd/trunk/ircd/m_lusers.c =================================================================== --- ircd/trunk/ircd/m_lusers.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_lusers.c 2008-07-12 20:53:24 UTC (rev 191) @@ -57,7 +57,7 @@ */ int m_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) { - int longoutput = MyUser(sptr) || IsOper(sptr); + int longoutput = MyUser(sptr) || IsAnOper(sptr); if (parc > 2) if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, feature_int(FEAT_HIS_REMOTE), "%s :%C", 2, parc, parv) != HUNTED_ISME) @@ -104,7 +104,7 @@ */ int ms_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) { - int longoutput = MyUser(sptr) || IsOper(sptr); + int longoutput = MyUser(sptr) || IsAnOper(sptr); if (parc > 2) if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, 0, "%s :%C", 2, parc, parv) != HUNTED_ISME) Modified: ircd/trunk/ircd/m_mode.c =================================================================== --- ircd/trunk/ircd/m_mode.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_mode.c 2008-07-12 20:53:24 UTC (rev 191) @@ -117,7 +117,7 @@ return modebuf_flush(&mbuf); #if 1 /* TRANSICION IRC-HISPANO */ - } else if (feature_bool(FEAT_TRANSICION_HISPANO) && IsOper(sptr) && strchr(parv[2], 'x')) { + } else if (feature_bool(FEAT_TRANSICION_HISPANO) && IsAnOper(sptr) && strchr(parv[2], 'x')) { modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send MODE to channel */ MODEBUF_DEST_SERVER | /* And to server */ @@ -235,7 +235,7 @@ MODE_PARSE_FORCE), /* And force it to be accepted */ NULL); #if 1 /* TRANSICION IRC-HISPANO */ - } else if (IsOper(sptr) && strchr(parv[2], 'x')) { + } else if (IsAnOper(sptr) && strchr(parv[2], 'x')) { modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send MODE to channel */ MODEBUF_DEST_SERVER | /* And to server */ Modified: ircd/trunk/ircd/m_notice.c =================================================================== --- ircd/trunk/ircd/m_notice.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_notice.c 2008-07-12 20:53:24 UTC (rev 191) @@ -132,7 +132,7 @@ /* * coming from another server, we have to check this here */ - else if ('$' == *name && IsOper(sptr)) { + else if ('$' == *name && IsAnOper(sptr)) { server_relay_masked_notice(sptr, name, parv[parc - 1]); } else if ((server = strchr(name, '@'))) { Modified: ircd/trunk/ircd/m_privmsg.c =================================================================== --- ircd/trunk/ircd/m_privmsg.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_privmsg.c 2008-07-12 20:53:24 UTC (rev 191) @@ -129,7 +129,7 @@ /* * coming from another server, we have to check this here */ - else if ('$' == *name && IsOper(sptr)) { + else if ('$' == *name && IsAnOper(sptr)) { server_relay_masked_message(sptr, name, parv[parc - 1]); } else if ((server = strchr(name, '@'))) { Modified: ircd/trunk/ircd/m_server.c =================================================================== --- ircd/trunk/ircd/m_server.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_server.c 2008-07-12 20:53:24 UTC (rev 191) @@ -561,7 +561,12 @@ return exit_client_msg(cptr, sptr, &me, "Bogus protocol (%s)", parv[5]); else if (prot < atoi(MINOR_PROTOCOL)) #if 1 /* TRANSICION IRC-HISPANO */ - prot = atoi(MINOR_PROTOCOL); + { + prot = atoi(MINOR_PROTOCOL); + /* Los P09 siempre son Services y hub */ + SetService(cptr); + SetHub(cptr); + } #else return exit_new_server(cptr, sptr, host, timestamp, "Incompatible protocol: %s", parv[5]); Modified: ircd/trunk/ircd/m_settime.c =================================================================== --- ircd/trunk/ircd/m_settime.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_settime.c 2008-07-12 20:53:24 UTC (rev 191) @@ -161,7 +161,7 @@ static char tbuf[11]; /* Must be a global oper */ - if (!IsOper(sptr)) + if (!IsAnOper(sptr)) return send_reply(sptr, ERR_NOPRIVILEGES); if (parc < 2) /* verify argument count */ Modified: ircd/trunk/ircd/m_trace.c =================================================================== --- ircd/trunk/ircd/m_trace.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_trace.c 2008-07-12 20:53:24 UTC (rev 191) @@ -143,7 +143,7 @@ if (!(acptr = LocalClientArray[i])) /* Local Connection? */ continue; - if (IsInvisible(acptr) && dow && !(MyConnect(sptr) && IsOper(sptr)) && + if (IsInvisible(acptr) && dow && !(MyConnect(sptr) && IsAnOper(sptr)) && !IsAnOper(acptr) && (acptr != sptr)) continue; if (!doall && wilds && match(tname, cli_name(acptr))) Modified: ircd/trunk/ircd/m_userhost.c =================================================================== --- ircd/trunk/ircd/m_userhost.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_userhost.c 2008-07-12 20:53:24 UTC (rev 191) @@ -53,7 +53,7 @@ * of +x. If an oper wants the real host, he should go to * /whois to get it. */ - HasHiddenHost(cptr) && !IsAnOper(sptr) && (sptr != cptr) ? + HasHiddenHost(cptr) && !IsViewHiddenHost(sptr) && (sptr != cptr) ? cli_user(cptr)->host : cli_user(cptr)->realhost); } Modified: ircd/trunk/ircd/m_userip.c =================================================================== --- ircd/trunk/ircd/m_userip.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_userip.c 2008-07-12 20:53:24 UTC (rev 191) @@ -54,7 +54,7 @@ * of +x. If an oper wants the real IP, he should go to * /whois to get it. */ - HasHiddenHost(cptr) && !IsAnOper(sptr) && (sptr != cptr) ? + HasHiddenHost(cptr) && !IsViewHiddenHost(sptr) && (sptr != cptr) ? feature_str(FEAT_HIDDEN_IP) : ircd_ntoa(&cli_ip(cptr))); } Modified: ircd/trunk/ircd/m_watch.c =================================================================== --- ircd/trunk/ircd/m_watch.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_watch.c 2008-07-12 20:53:24 UTC (rev 191) @@ -192,7 +192,7 @@ { send_reply(sptr, RPL_NOWON, cli_name(acptr), cli_user(acptr)->username, - HasHiddenHost(acptr) && !IsAnOper(sptr) ? + HasHiddenHost(acptr) && !IsViewHiddenHost(sptr) ? cli_user(acptr)->host : cli_user(acptr)->realhost, cli_lastnick(acptr)); } Modified: ircd/trunk/ircd/m_who.c =================================================================== --- ircd/trunk/ircd/m_who.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_who.c 2008-07-12 20:53:24 UTC (rev 191) @@ -191,7 +191,7 @@ if (fields & WHO_FIELD_NIP) { - const char* p2 = HasHiddenHost(acptr) && !IsAnOper(sptr) ? + const char* p2 = HasHiddenHost(acptr) && !IsViewHiddenHost(sptr) ? feature_str(FEAT_HIDDEN_IP) : ircd_ntoa(&cli_ip(acptr)); *(p1++) = ' '; @@ -283,9 +283,17 @@ *(p1++) = 'r'; if (IsNickSuspended(acptr)) *(p1++) = 'S'; + if (IsAdmin(acptr)) + *(p1++) = 'a'; + if (IsHelpOper(acptr)) + *(p1++) = 'h'; + if (IsBot(acptr)) + *(p1++) = 'B'; #endif if (HasHiddenHost(acptr)) *(p1++) = 'x'; + if (IsViewHiddenHost(acptr)) + *(p1++) = 'X'; } if (!fields || (fields & WHO_FIELD_DIS)) @@ -658,12 +666,12 @@ || matchexec(cli_user(acptr)->host, mymask, minlen)) && ((!(matchsel & WHO_FIELD_HOS)) || !HasHiddenHost(acptr) - || !IsAnOper(sptr) + || !IsViewHiddenHost(sptr) || matchexec(cli_user(acptr)->realhost, mymask, minlen)) && ((!(matchsel & WHO_FIELD_REN)) || matchexec(cli_info(acptr), mymask, minlen)) && ((!(matchsel & WHO_FIELD_NIP)) - || (HasHiddenHost(acptr) && !IsAnOper(sptr)) + || (HasHiddenHost(acptr) && !IsViewHiddenHost(sptr)) || !ipmask_check(&cli_ip(acptr), &imask, ibits)) #if defined(UNDERNET) && ((!(matchsel & WHO_FIELD_ACC)) @@ -699,12 +707,12 @@ || matchexec(cli_user(acptr)->host, mymask, minlen)) && ((!(matchsel & WHO_FIELD_HOS)) || !HasHiddenHost(acptr) - || !IsAnOper(sptr) + || !IsViewHiddenHost(sptr) || matchexec(cli_user(acptr)->realhost, mymask, minlen)) && ((!(matchsel & WHO_FIELD_REN)) || matchexec(cli_info(acptr), mymask, minlen)) && ((!(matchsel & WHO_FIELD_NIP)) - || (HasHiddenHost(acptr) && !IsAnOper(sptr)) + || (HasHiddenHost(acptr) && !IsViewHiddenHost(sptr)) || !ipmask_check(&cli_ip(acptr), &imask, ibits)) #if defined(UNDERNET) && ((!(matchsel & WHO_FIELD_ACC)) Modified: ircd/trunk/ircd/m_whois.c =================================================================== --- ircd/trunk/ircd/m_whois.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_whois.c 2008-07-12 20:53:24 UTC (rev 191) @@ -103,7 +103,7 @@ chptr = chan->channel; if (!ShowChannel(sptr, chptr) - && !(IsOper(sptr) && IsLocalChannel(chptr->chname))) + && !(IsAnOper(sptr) && IsLocalChannel(chptr->chname))) continue; if (acptr != sptr && IsZombie(chan)) @@ -154,6 +154,8 @@ if (user) { + char *modes = umode_str(acptr); + if (user->away) send_reply(sptr, RPL_AWAY, name, user->away); @@ -162,25 +164,26 @@ send_reply(sptr, RPL_WHOISREGNICK, name); else if (IsNickSuspended(acptr)) send_reply(sptr, RPL_WHOISSUSPEND, name); -#endif /* defined(DDB) || defined(SERVICES) */ if (SeeOper(sptr,acptr)) + send_reply(sptr, RPL_WHOISOPERATOR, name); + + if (IsBot(acptr)) + send_reply(sptr, RPL_WHOISBOT, name, feature_str(FEAT_NETWORK)); + +#else /* UNDERNET */ + if (SeeOper(sptr,acptr)) send_reply(sptr, RPL_WHOISOPERATOR, name); -#if defined(UNDERNET) if (IsAccount(acptr)) send_reply(sptr, RPL_WHOISACCOUNT, name, user->account); #endif - if (IsAnOper(sptr) || (acptr == sptr)) - { - char *modes = umode_str(acptr); - - if (HasHiddenHost(acptr)) + if (HasHiddenHost(acptr) && (IsViewHiddenHost(sptr) || (acptr == sptr))) send_reply(sptr, RPL_WHOISACTUALLY, name, user->username, user->realhost, ircd_ntoa(&cli_ip(acptr))); - send_reply(sptr, RPL_WHOISMODES, name, *modes ? modes : ""); - } + + send_reply(sptr, RPL_WHOISMODES, name, *modes ? modes : ""); #ifdef USE_SSL if (MyConnect(acptr) && IsSSL(acptr) && ((parc >= 3) || Modified: ircd/trunk/ircd/m_whowas.c =================================================================== --- ircd/trunk/ircd/m_whowas.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/m_whowas.c 2008-07-12 20:53:24 UTC (rev 191) @@ -91,10 +91,10 @@ { send_reply(sptr, RPL_WHOWASUSER, temp->name, temp->username, temp->hostname, temp->realname); - if (IsAnOper(sptr) && temp->realhost) + if (IsViewHiddenHost(sptr) && temp->realhost) send_reply(sptr, RPL_WHOISACTUALLY, temp->name, temp->username, temp->realhost, "<untracked>"); send_reply(sptr, RPL_WHOISSERVER, temp->name, - (feature_bool(FEAT_HIS_WHOIS_SERVERNAME) && !IsOper(sptr)) ? + (feature_bool(FEAT_HIS_WHOIS_SERVERNAME) && !IsAnOper(sptr)) ? feature_str(FEAT_HIS_SERVERNAME) : temp->servername, myctime(temp->logoff)); Modified: ircd/trunk/ircd/s_err.c =================================================================== --- ircd/trunk/ircd/s_err.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/s_err.c 2008-07-12 20:53:24 UTC (rev 191) @@ -663,7 +663,7 @@ /* 309 */ { 0 }, /* 310 */ - { 0 }, + { RPL_WHOISHELPOP, "%s :is available for help", "310" }, /* 311 */ { RPL_WHOISUSER, "%s %s %s * :%s", "311" }, /* 312 */ @@ -717,7 +717,7 @@ /* 334 */ { RPL_LISTUSAGE, ":%s", "334" }, /* 335 */ - { 0 }, + { RPL_WHOISBOT, "%s :is a \2Bot\2 on %s", "335" }, /* 336 */ { 0 }, /* 337 */ Modified: ircd/trunk/ircd/s_numeric.c =================================================================== --- ircd/trunk/ircd/s_numeric.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/s_numeric.c 2008-07-12 20:53:24 UTC (rev 191) @@ -108,7 +108,7 @@ * come from the local server */ if (acptr) - sendcmdto_one((feature_bool(FEAT_HIS_REWRITE) && !IsOper(acptr)) ? + sendcmdto_one((feature_bool(FEAT_HIS_REWRITE) && !IsAnOper(acptr)) ? &me : sptr, num, num, acptr, "%C %s", acptr, parv[2]); else Modified: ircd/trunk/ircd/s_user.c =================================================================== --- ircd/trunk/ircd/s_user.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/s_user.c 2008-07-12 20:53:24 UTC (rev 191) @@ -529,9 +529,13 @@ #elif defined(DDB) || defined(SERVICES) { FLAG_NICKREG, 'r' }, { FLAG_NICKSUSPEND, 'S' }, - { FLAG_MSGONLYREG, 'R' }, + { FLAG_ADMIN, 'a' }, + { FLAG_HELPOPER, 'h' }, + { FLAG_BOT, 'B' }, + { FLAG_MSGONLYREG, 'R' }, #endif - { FLAG_HIDDENHOST, 'x' } + { FLAG_HIDDENHOST, 'x' }, + { FLAG_VIEWHIDDENHOST, 'X' } }; /** Length of #userModeList. */ @@ -1081,7 +1085,7 @@ return 0; #if defined(DDB) || defined(SERVICES) - if (IsMsgOnlyReg(dest) && !IsNickRegistered(source) && !IsOper(source)) { + if (IsMsgOnlyReg(dest) && !IsNickRegistered(source) && !IsAnOper(source)) { if(!is_notice) send_reply(source, ERR_NONONREG, cli_name(source)); return 0; @@ -1381,7 +1385,7 @@ send_reply(sptr, RPL_UMODEIS, buf); if (HasFlag(sptr, FLAG_SERVNOTICE) && MyConnect(sptr) && cli_snomask(sptr) != - (unsigned int)(IsOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT)) + (unsigned int)(IsAnOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT)) send_reply(sptr, RPL_SNOMASK, cli_snomask(sptr), cli_snomask(sptr)); return 0; } @@ -1482,6 +1486,12 @@ if (what == MODE_ADD) do_host_hiding = 1; break; + case 'X': + if (what == MODE_ADD) + SetViewHiddenHost(sptr); + else + ClearViewHiddenHost(sptr); + break; #if defined(UNDERNET) case 'r': if (what == MODE_ADD) { @@ -1512,6 +1522,24 @@ else ClearNickSuspended(sptr); break; + case 'a': + if (what == MODE_ADD) + SetAdmin(sptr); + else + ClearAdmin(sptr); + break; + case 'h': + if (what == MODE_ADD) + SetHelpOper(sptr); + else + ClearHelpOper(sptr); + break; + case 'B': + if (what == MODE_ADD) + SetBot(sptr); + else + ClearBot(sptr); + break; case 'R': if (what == MODE_ADD) SetMsgOnlyReg(sptr); @@ -1546,8 +1574,10 @@ * new umode; servers can set it, local users cannot; * prevents users from /kick'ing or /mode -o'ing */ - if (!FlagHas(&setflags, FLAG_CHSERV)) + if (!FlagHas(&setflags, FLAG_CHSERV) && !HasPriv(sptr, PRIV_UMODE_K)) ClearChannelService(sptr); + if (!FlagHas(&setflags, FLAG_VIEWHIDDENHOST) && HasPriv(sptr, PRIV_UMODE_X)) + ClearViewHiddenHost(sptr); /* * only send wallops to opers */ @@ -1572,6 +1602,12 @@ ClearNickRegistered(sptr); if (!FlagHas(&setflags, FLAG_NICKSUSPEND) && IsNickSuspended(sptr)) ClearNickSuspended(sptr); + if (!FlagHas(&setflags, FLAG_ADMIN)) + ClearAdmin(sptr); + if (!FlagHas(&setflags, FLAG_HELPOPER)) + ClearHelpOper(sptr); + if (!FlagHas(&setflags, FLAG_BOT)) + ClearBot(sptr); #endif /* defined(DDB) || defined(SERVICES) */ } if (MyConnect(sptr)) Modified: ircd/trunk/ircd/watch.c =================================================================== --- ircd/trunk/ircd/watch.c 2008-07-12 16:50:33 UTC (rev 190) +++ ircd/trunk/ircd/watch.c 2008-07-12 20:53:24 UTC (rev 191) @@ -146,7 +146,7 @@ send_reply(lp->value.cptr, raw, cli_name(cptr), IsUser(cptr) ? cli_user(cptr)->username : "<N/A>", IsUser(cptr) ? - (HasHiddenHost(cptr) && !IsAnOper(lp->value.cptr) ? + (HasHiddenHost(cptr) && !IsViewHiddenHost(lp->value.cptr) ? cli_user(cptr)->host : cli_user(cptr)->realhost) : "<N/A>", wt_lasttime(wptr)); @@ -166,7 +166,7 @@ if ((acptr = FindUser(nick))) { send_reply(cptr, raw1, cli_name(acptr), cli_user(acptr)->username, - HasHiddenHost(acptr) && !IsAnOper(cptr) ? + HasHiddenHost(acptr) && !IsViewHiddenHost(cptr) ? cli_user(acptr)->host : cli_user(acptr)->realhost, cli_lastnick(acptr)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zo...@us...> - 2008-07-13 00:23:43
|
Revision: 192 http://irc-dev.svn.sourceforge.net/irc-dev/?rev=192&view=rev Author: zolty Date: 2008-07-12 17:23:49 -0700 (Sat, 12 Jul 2008) Log Message: ----------- nuevo modo de usuario +c Modified Paths: -------------- ircd/trunk/include/client.h ircd/trunk/ircd/m_who.c ircd/trunk/ircd/m_whois.c ircd/trunk/ircd/s_user.c Modified: ircd/trunk/include/client.h =================================================================== --- ircd/trunk/include/client.h 2008-07-12 20:53:24 UTC (rev 191) +++ ircd/trunk/include/client.h 2008-07-13 00:23:49 UTC (rev 192) @@ -73,7 +73,7 @@ /** String containing valid user modes, in no particular order. */ #if defined(DDB) || defined(SERVICES) -#define infousermodes "dioswkgxrRSZ" +#define infousermodes "dioswkgxrRachBSZ" #else #define infousermodes "dioswkgxRZ" #endif @@ -159,8 +159,9 @@ #elif defined(DDB) || defined(SERVICES) FLAG_NICKREG, /**< nick registered */ FLAG_NICKSUSPEND, /**< nick suspended */ - FLAG_HELPOPER, /**< nick is Help Operator */ FLAG_ADMIN, /**< nick is Services Admin */ + FLAG_CODER, /**< nick is Services Coder */ + FLAG_HELPOPER, /**< nick is Services Operator */ FLAG_BOT, /**< nick is Services Bot */ #endif FLAG_MSGONLYREG, /**< only privmsg/notices from +r */ @@ -546,7 +547,12 @@ #define HasFlag(cli, flag) FlagHas(&cli_flags(cli), flag) /** Return non-zero if the client is an IRC operator (global or local). */ +#if defined(DDB) +#define IsAnOper(x) (HasFlag(x, FLAG_OPER) || HasFlag(x, FLAG_LOCOP) || HasFlag(x, FLAG_ADMIN) || \ + HasFlag(x, FLAG_CODER) || HasFlag(x, FLAG_HELPOPER) || HasFlag(x, FLAG_BOT)) +#else #define IsAnOper(x) (HasFlag(x, FLAG_OPER) || HasFlag(x, FLAG_LOCOP)) +#endif /** Return non-zero if the client's connection is blocked. */ #define IsBlocked(x) HasFlag(x, FLAG_BLOCKED) /** Return non-zero if the client's connection is still being burst. */ @@ -609,10 +615,12 @@ #define IsNickRegistered(x) HasFlag(x, FLAG_NICKREG) /** Return non-zero if the client has set mode +S (nick suspended) */ #define IsNickSuspended(x) HasFlag(x, FLAG_NICKSUSPEND) +/** Return non-zero if the client has set mode +a (Services Admin) */ +#define IsAdmin(x) HasFlag(x, FLAG_ADMIN) +/** Return non-zero if the client has set mode +c (Network Coder) */ +#define IsCoder(x) HasFlag(x, FLAG_CODER) /** Return non-zero if the client has set mode +h (Help Operator) */ #define IsHelpOper(x) HasFlag(x, FLAG_HELPOPER) -/** Return non-zero if the client has set mode +a (Services Admin) */ -#define IsAdmin(x) HasFlag(x, FLAG_ADMIN) /** Return non-zero if the client has set mode +B (Services Bot) */ #define IsBot(x) HasFlag(x, FLAG_BOT) #endif @@ -681,10 +689,12 @@ #define SetNickRegistered(x) SetFlag(x, FLAG_NICKREG) /** Mark a client as having mode +S (nick suspended) */ #define SetNickSuspended(x) SetFlag(x, FLAG_NICKSUSPEND) -/** Mark a client as having mode +h (Help Operator) */ -#define SetHelpOper(x) SetFlag(x, FLAG_HELPOPER) /** Mark a client as having mode +a (Services Admin) */ #define SetAdmin(x) SetFlag(x, FLAG_ADMIN) +/** Mark a client as having mode +c (Network Coder) */ +#define SetCoder(x) SetFlag(x, FLAG_CODER) +/** Mark a client as having mode +h (Services Operator) */ +#define SetHelpOper(x) SetFlag(x, FLAG_HELPOPER) /** Mark a client as having mode +B (Services Bot) */ #define SetBot(x) SetFlag(x, FLAG_BOT) #endif @@ -738,6 +748,10 @@ #define ClearHelpOper(x) ClrFlag(x, FLAG_HELPOPER) /** Remode mode +A (Services Admin) from the client */ #define ClearAdmin(x) ClrFlag(x, FLAG_ADMIN) +/** Remode mode +c (Network Coder) from the client */ +#define ClearCoder(x) ClrFlag(x, FLAG_CODER) +/** Remode mode +h (Help Operator) from the client */ +#define ClearHelpOper(x) ClrFlag(x, FLAG_HELPOPER) /** Remode mode +B (Services Bot) from the client */ #define ClearBot(x) ClrFlag(x, FLAG_BOT) #endif Modified: ircd/trunk/ircd/m_who.c =================================================================== --- ircd/trunk/ircd/m_who.c 2008-07-12 20:53:24 UTC (rev 191) +++ ircd/trunk/ircd/m_who.c 2008-07-13 00:23:49 UTC (rev 192) @@ -285,6 +285,8 @@ *(p1++) = 'S'; if (IsAdmin(acptr)) *(p1++) = 'a'; + if (IsCoder(acptr)) + *(p1++) = 'c'; if (IsHelpOper(acptr)) *(p1++) = 'h'; if (IsBot(acptr)) Modified: ircd/trunk/ircd/m_whois.c =================================================================== --- ircd/trunk/ircd/m_whois.c 2008-07-12 20:53:24 UTC (rev 191) +++ ircd/trunk/ircd/m_whois.c 2008-07-13 00:23:49 UTC (rev 192) @@ -166,7 +166,18 @@ send_reply(sptr, RPL_WHOISSUSPEND, name); if (SeeOper(sptr,acptr)) - send_reply(sptr, RPL_WHOISOPERATOR, name); + { + if (IsAdmin(acptr)) + send_reply(sptr, SND_EXPLICIT | RPL_WHOISOPERATOR, "%s :is a Services Administrator", name); + else if (IsCoder(acptr)) + send_reply(sptr, SND_EXPLICIT | RPL_WHOISOPERATOR, "%s :is a Network Coder", name); + else if (IsHelpOper(acptr)) + send_reply(sptr, SND_EXPLICIT | RPL_WHOISOPERATOR, "%s :is a Services Operator", name); + else if (IsOper(acptr)) + send_reply(sptr, RPL_WHOISOPERATOR, name); + else + send_reply(sptr, SND_EXPLICIT | RPL_WHOISOPERATOR, "%s :is a Local IRC Operator", name); + } if (IsBot(acptr)) send_reply(sptr, RPL_WHOISBOT, name, feature_str(FEAT_NETWORK)); Modified: ircd/trunk/ircd/s_user.c =================================================================== --- ircd/trunk/ircd/s_user.c 2008-07-12 20:53:24 UTC (rev 191) +++ ircd/trunk/ircd/s_user.c 2008-07-13 00:23:49 UTC (rev 192) @@ -530,6 +530,7 @@ { FLAG_NICKREG, 'r' }, { FLAG_NICKSUSPEND, 'S' }, { FLAG_ADMIN, 'a' }, + { FLAG_CODER, 'c' }, { FLAG_HELPOPER, 'h' }, { FLAG_BOT, 'B' }, { FLAG_MSGONLYREG, 'R' }, @@ -1528,6 +1529,12 @@ else ClearAdmin(sptr); break; + case 'c': + if (what == MODE_ADD) + SetCoder(sptr); + else + ClearCoder(sptr); + break; case 'h': if (what == MODE_ADD) SetHelpOper(sptr); @@ -1604,6 +1611,8 @@ ClearNickSuspended(sptr); if (!FlagHas(&setflags, FLAG_ADMIN)) ClearAdmin(sptr); + if (!FlagHas(&setflags, FLAG_CODER)) + ClearCoder(sptr); if (!FlagHas(&setflags, FLAG_HELPOPER)) ClearHelpOper(sptr); if (!FlagHas(&setflags, FLAG_BOT)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |