Thread: [X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
Menu
▾
▴
x2serv-cvs
|
From: Alex S. <ru...@us...> - 2005-03-11 23:09:41
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-11 23:09:33 UTC
Modified files:
AUTHORS Makefile.in autogen.sh configure configure.in
rx/Makefile.in src/Makefile.in src/config.h.in
Log message:
Author:
Log message:
Added some additional srvx->x3 fixes. make install is fixed.
---------------------- diff included ----------------------
Index: x3/AUTHORS
diff -u x3/AUTHORS:1.2 x3/AUTHORS:1.3
--- x3/AUTHORS:1.2 Sun Mar 6 19:51:23 2005
+++ x3/AUTHORS Fri Mar 11 15:09:21 2005
@@ -11,7 +11,8 @@
feature requests, criticism or praise are welcome. We love feedback.
- srvx Development Team
+ X3 is based on the work of
+ the srvx Development Team
Project Admin:
Entrope <en...@us...>
@@ -33,3 +34,4 @@
You can find the team on irc.gamesurge.net, in #srvx. Bug reports,
feature requests, criticism or praise are welcome. We love feedback.
+Note: Please do not bother the srvx team with questions about X3.
Index: x3/Makefile.in
diff -u x3/Makefile.in:1.2 x3/Makefile.in:1.3
--- x3/Makefile.in:1.2 Sun Oct 24 11:19:00 2004
+++ x3/Makefile.in Fri Mar 11 15:09:21 2005
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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.
@@ -10,97 +12,199 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
-SHELL = @SHELL@
-
+@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing mkinstalldirs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MODULE_OBJS = @MODULE_OBJS@
MY_SUBDIRS = @MY_SUBDIRS@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
RX_INCLUDES = @RX_INCLUDES@
RX_LIBS = @RX_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
VERSION = @VERSION@
-
-EXTRA_DIST = FAQ srvx.conf.example sockcheck.conf.example
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+EXTRA_DIST = FAQ x3.conf.example sockcheck.conf.example
SUBDIRS = @MY_SUBDIRS@
DIST_SUBDIRS = src rx
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
-configure.in install-sh ltmain.sh missing mkinstalldirs
-
+all: all-recursive
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
- cd $(srcdir) && $(ACLOCAL)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
-config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -108,13 +212,14 @@
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -126,7 +231,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -134,13 +239,24 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" = "." && dot_seen=yes; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
done; \
- test "$$dot_seen" = "no" && rev=". $$rev"; \
+ rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -150,199 +266,331 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 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; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
+tags: TAGS
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ 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; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+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; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
distdir: $(DISTFILES)
- -rm -rf $(distdir)
+ $(am__remove_distdir)
mkdir $(distdir)
- -chmod 777 $(distdir)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
- for subdir in $(DIST_SUBDIRS); do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
|| exit 1; \
fi; \
done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
check-am: all-am
check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am: install-exec-local
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
install-exec: install-exec-recursive
-
-install-data-am:
install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-tags mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic mostlyclean-am
-clean-am: clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
-clean: clean-recursive
+dvi: dvi-recursive
-distclean-am: distclean-tags distclean-generic clean-am
+dvi-am:
-distclean: distclean-recursive
- -rm -f config.status
+html: html-recursive
-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-exec-local
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -f config.status
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-local install-exec-am install-exec install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+ps-am:
-all: srvx
+uninstall-am: uninstall-info-am
-srvx: src/srvx
- cp ./src/srvx $(srcdir)/src/*.help .
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-recursive ctags \
+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+ dist-tarZ dist-zip distcheck distclean distclean-generic \
+ distclean-recursive distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-exec-local install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am
+
+
+all: x3
+
+x3: src/x3
+ cp ./src/x3 $(srcdir)/src/*.help .
install-exec-local:
$(INSTALL) -d -m 755 $(prefix)
- $(INSTALL) -m 744 ./src/srvx $(prefix)
+ $(INSTALL) -m 744 ./src/x3 $(prefix)
$(INSTALL) -m 644 $(srcdir)/src/*.help $(prefix)
- $(INSTALL) -m 600 $(srcdir)/srvx.conf.example $(prefix)
+ $(INSTALL) -m 600 $(srcdir)/x3.conf.example $(prefix)
$(INSTALL) -m 644 $(srcdir)/sockcheck.conf.example $(prefix)
@echo
- @echo srvx-$(VERSION) has been installed to $(prefix)
- @echo Remember to edit srvx.conf.example and sockcheck.conf.example
- @echo And of course, ./srvx --help before starting.
+ @echo X3-$(VERSION) has been installed to $(prefix)
+ @echo Remember to edit x3.conf.example and sockcheck.conf.example
+ @echo And of course, ./x3 --help before starting.
@echo
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: x3/autogen.sh
diff -u x3/autogen.sh:1.2 x3/autogen.sh:1.3
--- x3/autogen.sh:1.2 Sun Jan 30 17:41:28 2005
+++ x3/autogen.sh Fri Mar 11 15:09:21 2005
@@ -1,6 +1,6 @@
#! /bin/sh
-~/compiled/bin/aclocal
-~/compiled/bin/autoheader -Wall
-~/compiled/bin/automake -a --gnu Makefile rx/Makefile src/Makefile
-~/compiled/bin/autoconf -Wall
+aclocal
+autoheader -Wall
+automake -a --gnu Makefile rx/Makefile src/Makefile
+autoconf -Wall
Index: x3/configure
diff -u x3/configure:1.5 x3/configure:1.6
--- x3/configure:1.5 Sun Mar 6 19:51:23 2005
+++ x3/configure Fri Mar 11 15:09:21 2005
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in,v 1.5 2005/02/21 13:54:37 sirvulcan Exp .
+# From configure.in Id: configure.in,v 1.6 2005/03/07 03:51:23 sirvulcan Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for X3 1.4.
#
@@ -868,7 +868,7 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-malloc=type Enables use of a special malloc library; one of:
- system (the default), boehm-gc, dmalloc, mpatrol, srvx, slab
+ system (the default), boehm-gc, dmalloc, mpatrol, x3, slab
--with-protocol=name Choose IRC dialect to support; one of:
p10 (the default), bahamut
--without-getopt Disables building of the GNU getopt library
@@ -974,7 +974,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -2512,8 +2512,7 @@
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'
+ { 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=$?
@@ -2571,8 +2570,7 @@
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'
+ { 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=$?
@@ -2688,8 +2686,7 @@
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'
+ { 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=$?
@@ -2743,8 +2740,7 @@
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'
+ { 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=$?
@@ -2789,8 +2785,7 @@
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'
+ { 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=$?
@@ -2834,8 +2829,7 @@
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'
+ { 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=$?
@@ -3023,8 +3017,7 @@
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'
+ { 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=$?
@@ -3128,8 +3121,7 @@
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'
+ { 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=$?
@@ -3189,8 +3181,7 @@
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'
+ { 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=$?
@@ -3639,8 +3630,7 @@
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'
+ { 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=$?
@@ -3698,8 +3688,7 @@
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'
+ { 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=$?
@@ -3815,8 +3804,7 @@
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'
+ { 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=$?
@@ -3870,8 +3858,7 @@
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'
+ { 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=$?
@@ -3916,8 +3903,7 @@
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'
+ { 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=$?
@@ -3961,8 +3947,7 @@
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'
+ { 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=$?
@@ -4679,8 +4664,7 @@
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'
+ { 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=$?
@@ -4753,8 +4737,7 @@
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'
+ { 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=$?
@@ -4821,8 +4804,7 @@
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'
+ { 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=$?
@@ -4890,8 +4872,7 @@
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'
+ { 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=$?
@@ -5057,8 +5038,7 @@
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'
+ { 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=$?
@@ -5120,8 +5100,7 @@
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'
+ { 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=$?
@@ -5191,8 +5170,7 @@
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'
+ { 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=$?
@@ -5278,8 +5256,7 @@
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'
+ { 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=$?
@@ -5427,8 +5404,7 @@
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'
+ { 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=$?
@@ -5472,8 +5448,7 @@
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'
+ { 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=$?
@@ -5576,8 +5551,7 @@
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'
+ { 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=$?
@@ -5679,8 +5653,7 @@
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'
+ { 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=$?
@@ -5802,8 +5775,7 @@
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'
+ { 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=$?
@@ -5910,8 +5882,7 @@
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'
+ { 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=$?
@@ -5979,8 +5950,7 @@
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'
+ { 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=$?
@@ -6061,8 +6031,7 @@
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'
+ { 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=$?
@@ -6203,8 +6172,7 @@
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'
+ { 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=$?
@@ -6342,8 +6310,7 @@
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'
+ { 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=$?
@@ -6527,8 +6494,7 @@
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'
+ { 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=$?
@@ -6766,8 +6732,7 @@
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'
+ { 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=$?
@@ -6825,8 +6790,7 @@
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'
+ { 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=$?
@@ -6863,8 +6827,7 @@
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'
+ { 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=$?
@@ -6931,8 +6894,7 @@
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'
+ { 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=$?
@@ -6994,8 +6956,7 @@
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'
+ { 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=$?
@@ -7085,8 +7046,7 @@
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'
+ { 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=$?
@@ -7244,8 +7204,7 @@
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'
+ { 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=$?
@@ -7325,8 +7284,7 @@
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'
+ { 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=$?
@@ -7484,8 +7442,7 @@
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'
+ { 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=$?
@@ -7558,8 +7515,7 @@
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'
+ { 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=$?
@@ -7639,8 +7595,7 @@
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'
+ { 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=$?
@@ -7798,8 +7753,7 @@
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'
+ { 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=$?
@@ -7876,8 +7830,7 @@
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'
+ { 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=$?
@@ -7920,15 +7873,15 @@
#define WITH_MALLOC_BOEHM_GC 1
_ACEOF
-elif test "x$withval" = "xsrvx" ; then
- echo "$as_me:$LINENO: result: srvx" >&5
-echo "${ECHO_T}srvx" >&6
+elif test "x$withval" = "xx3" ; then
+ echo "$as_me:$LINENO: result: x3" >&5
+echo "${ECHO_T}x3" >&6
cat >>confdefs.h <<\_ACEOF
-#define WITH_MALLOC_SRVX 1
+#define WITH_MALLOC_X3 1
_ACEOF
- MODULE_OBJS="$MODULE_OBJS alloc-srvx.\$(OBJEXT)"
+ MODULE_OBJS="$MODULE_OBJS alloc-x3.\$(OBJEXT)"
elif test "x$withval" = "xslab" ; then
echo "$as_me:$LINENO: result: slab" >&5
echo "${ECHO_T}slab" >&6
@@ -8981,11 +8934,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -9024,6 +8972,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Index: x3/configure.in
diff -u x3/configure.in:1.6 x3/configure.in:1.7
--- x3/configure.in:1.6 Sun Mar 6 19:51:23 2005
+++ x3/configure.in Fri Mar 11 15:09:22 2005
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to create a configure script.
dnl General initialization.
-AC_REVISION([$Id: configure.in,v 1.6 2005/03/07 03:51:23 sirvulcan Exp $])
+AC_REVISION([$Id: configure.in,v 1.7 2005/03/11 23:09:22 rubin Exp $])
AC_PREREQ(2.57)
AC_INIT(X3, 1.4, x2s...@li...)
CODENAME=X3
@@ -153,7 +153,7 @@
AC_MSG_CHECKING(which malloc to use)
AC_ARG_WITH(malloc,
[ --with-malloc=type Enables use of a special malloc library; one of:
- system (the default), boehm-gc, dmalloc, mpatrol, srvx, slab],
+ system (the default), boehm-gc, dmalloc, mpatrol, x3, slab],
[],
[withval="system"])
if test "x$withval" = "xsystem" ; then
@@ -177,10 +177,10 @@
AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([libdl library is missing. boehm-gc build will fail.]))
AC_CHECK_LIB(gc, GC_gcollect, , AC_MSG_ERROR([Boehm GC library is missing. boehm-gc build will fail.]))
AC_DEFINE(WITH_MALLOC_BOEHM_GC, 1, [Define if using the Boehm GC to garbage collect and check memory leaks])
-elif test "x$withval" = "xsrvx" ; then
- AC_MSG_RESULT(srvx)
- AC_DEFINE(WITH_MALLOC_SRVX, 1, [Define if using the srvx internal debug allocator])
- MODULE_OBJS="$MODULE_OBJS alloc-srvx.\$(OBJEXT)"
+elif test "x$withval" = "xx3" ; then
+ AC_MSG_RESULT(x3)
+ AC_DEFINE(WITH_MALLOC_X3, 1, [Define if using the x3 internal debug allocator])
+ MODULE_OBJS="$MODULE_OBJS alloc-x3.\$(OBJEXT)"
elif test "x$withval" = "xslab" ; then
AC_MSG_RESULT(slab)
AC_DEFINE(WITH_MALLOC_SLAB, 1, [Define if using the slab internal debug allocator])
Index: x3/rx/Makefile.in
diff -u x3/rx/Makefile.in:1.1 x3/rx/Makefile.in:1.2
--- x3/rx/Makefile.in:1.1 Thu Mar 3 08:21:35 2005
+++ x3/rx/Makefile.in Fri Mar 11 15:09:22 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
Index: x3/src/Makefile.in
diff -u x3/src/Makefile.in:1.1 x3/src/Makefile.in:1.2
--- x3/src/Makefile.in:1.1 Thu Mar 3 08:21:36 2005
+++ x3/src/Makefile.in Fri Mar 11 15:09:23 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -15,7 +15,7 @@
@SET_MAKE@
-SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(srvx_SOURCES) $(EXTRA_srvx_SOURCES)
+SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) $(EXTRA_x3_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -40,7 +40,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-noinst_PROGRAMS = srvx$(EXEEXT)
+noinst_PROGRAMS = x3$(EXEEXT)
EXTRA_PROGRAMS = checkdb$(EXEEXT) globtest$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -62,7 +62,7 @@
globtest.$(OBJEXT) tools.$(OBJEXT)
globtest_OBJECTS = $(am_globtest_OBJECTS)
globtest_LDADD = $(LDADD)
-am_srvx_OBJECTS = chanserv.$(OBJEXT) compat.$(OBJEXT) conf.$(OBJEXT) \
+am_x3_OBJECTS = chanserv.$(OBJEXT) compat.$(OBJEXT) conf.$(OBJEXT) \
dict-splay.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
gline.$(OBJEXT) global.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
helpfile.$(OBJEXT) ioset.$(OBJEXT) log.$(OBJEXT) \
@@ -70,7 +70,7 @@
modules.$(OBJEXT) nickserv.$(OBJEXT) opserv.$(OBJEXT) \
policer.$(OBJEXT) recdb.$(OBJEXT) saxdb.$(OBJEXT) \
sendmail.$(OBJEXT) timeq.$(OBJEXT) tools.$(OBJEXT)
-srvx_OBJECTS = $(am_srvx_OBJECTS)
+x3_OBJECTS = $(am_x3_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -78,10 +78,10 @@
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(srvx_SOURCES) \
- $(EXTRA_srvx_SOURCES)
-DIST_SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(srvx_SOURCES) \
- $(EXTRA_srvx_SOURCES)
+SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \
+ $(EXTRA_x3_SOURCES)
+DIST_SOURCES = $(checkdb_SOURCES) $(globtest_SOURCES) $(x3_SOURCES) \
+ $(EXTRA_x3_SOURCES)
DATA = $(noinst_DATA)
ETAGS = etags
CTAGS = ctags
@@ -183,10 +183,10 @@
AM_CPPFLAGS = @RX_INCLUDES@
noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
EXTRA_DIST = $(noinst_DATA)
-EXTRA_srvx_SOURCES = proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
-srvx_LDADD = @MODULE_OBJS@
-srvx_DEPENDENCIES = @MODULE_OBJS@
-srvx_SOURCES = \
+EXTRA_x3_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+x3_LDADD = @MODULE_OBJS@
+x3_DEPENDENCIES = @MODULE_OBJS@
+x3_SOURCES = \
chanserv.c chanserv.h \
compat.c compat.h \
conf.c conf.h \
@@ -277,9 +277,9 @@
globtest$(EXEEXT): $(globtest_OBJECTS) $(globtest_DEPENDENCIES)
@rm -f globtest$(EXEEXT)
$(LINK) $(globtest_LDFLAGS) $(globtest_OBJECTS) $(globtest_LDADD) $(LIBS)
-srvx$(EXEEXT): $(srvx_OBJECTS) $(srvx_DEPENDENCIES)
- @rm -f srvx$(EXEEXT)
- $(LINK) $(srvx_LDFLAGS) $(srvx_OBJECTS) $(srvx_LDADD) $(LIBS)
+x3$(EXEEXT): $(x3_OBJECTS) $(x3_DEPENDENCIES)
+ @rm -f x3$(EXEEXT)
+ $(LINK) $(x3_LDFLAGS) $(x3_OBJECTS) $(x3_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -287,6 +287,8 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-slab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-srvx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chanserv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkdb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@
Index: x3/src/config.h.in
diff -u x3/src/config.h.in:1.1 x3/src/config.h.in:1.2
--- x3/src/config.h.in:1.1 Sun Oct 17 13:33:54 2004
+++ x3/src/config.h.in Fri Mar 11 15:09:23 2005
@@ -275,9 +275,15 @@
/* Define if using the mpatrol malloc debugging package */
#undef WITH_MALLOC_MPATROL
+/* Define if using the slab internal debug allocator */
+#undef WITH_MALLOC_SLAB
+
/* Define if using the system's malloc */
#undef WITH_MALLOC_SYSTEM
+/* Define if using the x3 internal debug allocator */
+#undef WITH_MALLOC_X3
+
/* Define if using the Bahamut dialect of IRC */
#undef WITH_PROTOCOL_BAHAMUT
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-12 20:13:52
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-12 20:13:25 UTC
Modified files:
src/Makefile.am src/Makefile.in src/alloc-slab.c src/chanserv.c
src/chanserv.h src/common.h src/conf.c src/conf.h
src/dict-splay.c src/dict.h src/gline.c src/gline.h src/global.c
src/global.h src/hash.c src/hash.h src/heap.c src/heap.h
src/helpfile.c src/helpfile.h src/ioset.c src/ioset.h src/log.c
src/log.h src/main.c src/mod-helpserv.c src/mod-memoserv.c
src/mod-snoop.c src/mod-sockcheck.c src/modcmd.c src/modcmd.h
src/modules.c src/modules.h src/nickserv.c src/nickserv.h
src/opserv.c src/opserv.h src/policer.c src/policer.h
src/proto-common.c src/proto-p10.c src/proto.h src/recdb.c
src/recdb.h src/saxdb.c src/saxdb.h src/sendmail.c src/sendmail.h
src/timeq.c src/timeq.h src/tools.c
Added files:
src/alloc-x3.c
Removed files:
src/alloc-srvx.c
Log message:
more srvx->x3 fixes. cvs update -dP to catch renamed files.
---------------------- diff included ----------------------
Index: x3/src/Makefile.am
diff -u x3/src/Makefile.am:1.6 x3/src/Makefile.am:1.7
--- x3/src/Makefile.am:1.6 Sun Mar 6 19:51:24 2005
+++ x3/src/Makefile.am Sat Mar 12 12:13:13 2005
@@ -6,7 +6,7 @@
noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
EXTRA_DIST = $(noinst_DATA)
-EXTRA_x3_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+EXTRA_x3_SOURCES = alloc-slab.c alloc-x3.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
x3_LDADD = @MODULE_OBJS@
x3_DEPENDENCIES = @MODULE_OBJS@
x3_SOURCES = \
Index: x3/src/Makefile.in
diff -u x3/src/Makefile.in:1.2 x3/src/Makefile.in:1.3
--- x3/src/Makefile.in:1.2 Fri Mar 11 15:09:23 2005
+++ x3/src/Makefile.in Sat Mar 12 12:13:13 2005
@@ -183,7 +183,7 @@
AM_CPPFLAGS = @RX_INCLUDES@
noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
EXTRA_DIST = $(noinst_DATA)
-EXTRA_x3_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+EXTRA_x3_SOURCES = alloc-slab.c alloc-x3.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
x3_LDADD = @MODULE_OBJS@
x3_DEPENDENCIES = @MODULE_OBJS@
x3_SOURCES = \
@@ -288,7 +288,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-slab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-srvx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc-x3.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chanserv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkdb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@
Index: x3/src/alloc-slab.c
diff -u x3/src/alloc-slab.c:1.1 x3/src/alloc-slab.c:1.2
--- x3/src/alloc-slab.c:1.1 Mon Feb 21 05:54:54 2005
+++ x3/src/alloc-slab.c Sat Mar 12 12:13:13 2005
@@ -1,7 +1,7 @@
/* alloc-slab.c - Slab debugging allocator
* Copyright 2005 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/alloc-srvx.c
diff -u x3/src/alloc-srvx.c:1.2 x3/src/alloc-srvx.c:removed
--- x3/src/alloc-srvx.c:1.2 Mon Feb 21 05:54:54 2005
+++ x3/src/alloc-srvx.c Sat Mar 12 12:13:25 2005
@@ -1,153 +0,0 @@
-/* alloc-srvx.c - Debug allocation wrapper
- * Copyright 2005 srvx Development Team
- *
- * This file is part of srvx.
- *
- * srvx is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include "common.h"
-#include "log.h"
-
-#undef malloc
-#undef free
-/* cookies for anybody who recognizes these bytes without help :) */
-#define ALLOC_MAGIC 0x1acf
-#define FREE_MAGIC 0xfc1d
-const char redzone[] = { '\x03', '\x47', '\x76', '\xc7' };
-
-struct alloc_header {
- unsigned int file_id : 8;
- unsigned int size : 24;
- unsigned int line : 16;
- unsigned int magic : 16;
-};
-
-static char file_id_map[256][32];
-static unsigned int file_ids_used;
-unsigned long alloc_count, alloc_size;
-
-static int
-file_id_cmp(const void *a_, const void *b_)
-{
- return strcmp(a_, b_);
-}
-
-static unsigned int
-get_file_id(const char *fname)
-{
- void *entry;
-
- entry = bsearch(fname, file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp);
- if (entry)
- return ((char*)entry - file_id_map[0]) / sizeof(file_id_map[0]);
- strcpy(file_id_map[file_ids_used++], fname);
- qsort(file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp);
- return file_ids_used - 1;
-}
-
-void *
-srvx_malloc(const char *file, unsigned int line, size_t size)
-{
- struct alloc_header *block;
- block = malloc(sizeof(*block) + size);
- block = malloc(sizeof(*block) + size + sizeof(redzone));
- assert(block != NULL);
- if (block->magic == ALLOC_MAGIC && block->file_id < file_ids_used) {
- /* Only report the error, due to possible false positives. */
- log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%u; allocated by %u:%u/%u).",
- block, file, line, size, block->file_id, block->line, block->size);
- }
- memset(block, 0, sizeof(*block) + size);
- memcpy((char*)(block + 1) + size, redzone, sizeof(redzone));
- block->file_id = get_file_id(file);
- block->line = line;
- block->size = size;
- block->magic = ALLOC_MAGIC;
- alloc_count++;
- alloc_size += size;
- return block + 1;
-}
-
-void *
-srvx_realloc(const char *file, unsigned int line, void *ptr, size_t size)
- struct alloc_header *block = NULL, *newblock;
- struct alloc_header *block, *newblock;
- }
- if (!ptr)
- return srvx_malloc(file, line, size);
-
- verify(ptr);
- block = (struct alloc_header *)ptr - 1;
-
- if (block->size >= size)
- return block + 1;
- newblock = malloc(sizeof(*newblock) + size);
- newblock = malloc(sizeof(*newblock) + size + sizeof(redzone));
- memset(newblock, 0, sizeof(*newblock) + size + sizeof(redzone));
- memset(newblock, 0, sizeof(*newblock));
- memcpy(newblock + 1, block + 1, block->size);
- memset((char*)(newblock + 1) + block->size, 0, size - block->size);
- memcpy((char*)(newblock + 1) + size, redzone, sizeof(redzone));
- newblock->file_id = get_file_id(file);
- newblock->line = line;
- newblock->size = size;
- newblock->magic = ALLOC_MAGIC;
- alloc_count++;
- alloc_size += size;
- srvx_free(block);
- srvx_free(file, line, block + 1);
-
- return newblock + 1;
-}
-
-char *
-srvx_strdup(const char *file, unsigned int line, const char *src)
-{
- char *target;
- size_t len;
-
- len = strlen(src) + 1;
- target = srvx_malloc(file, line, len);
- memcpy(target, src, len);
- return target;
-}
-
-srvx_free(const char *file, unsigned int line, void *ptr)
-srvx_free(UNUSED_ARG(const char *file), UNUSED_ARG(unsigned int line), void *ptr)
-{
- struct alloc_header *block;
- size_t size;
-
- if (!ptr)
- return;
- verify(ptr);
- assert(block->magic == ALLOC_MAGIC);
- memset(block, 0, size);
- size = block->size;
- memset(block + 1, 0xde, size);
- block->magic = FREE_MAGIC;
- free(block);
- alloc_size -= size - sizeof(*block);
- (void)file; (void)line;
-}
-
-void
-verify(const void *ptr)
-{
- const struct alloc_header *header;
- if (!ptr)
- return;
- header = (const struct alloc_header*)ptr - 1;
- assert(header->magic == ALLOC_MAGIC);
- assert(!memcmp((char*)(header + 1) + header->size, redzone, sizeof(redzone)));
-}
-
Index: x3/src/alloc-x3.c
diff -u /dev/null x3/src/alloc-x3.c:1.1
--- /dev/null Sat Mar 12 12:13:25 2005
+++ x3/src/alloc-x3.c Sat Mar 12 12:13:14 2005
@@ -0,0 +1,153 @@
+/* alloc-x3.c - Debug allocation wrapper
+ * Copyright 2005 srvx Development Team
+ *
+ * This file is part of x3.
+ *
+ * srvx is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include "common.h"
+#include "log.h"
+
+#undef malloc
+#undef free
+/* cookies for anybody who recognizes these bytes without help :) */
+#define ALLOC_MAGIC 0x1acf
+#define FREE_MAGIC 0xfc1d
+const char redzone[] = { '\x03', '\x47', '\x76', '\xc7' };
+
+struct alloc_header {
+ unsigned int file_id : 8;
+ unsigned int size : 24;
+ unsigned int line : 16;
+ unsigned int magic : 16;
+};
+
+static char file_id_map[256][32];
+static unsigned int file_ids_used;
+unsigned long alloc_count, alloc_size;
+
+static int
+file_id_cmp(const void *a_, const void *b_)
+{
+ return strcmp(a_, b_);
+}
+
+static unsigned int
+get_file_id(const char *fname)
+{
+ void *entry;
+
+ entry = bsearch(fname, file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp);
+ if (entry)
+ return ((char*)entry - file_id_map[0]) / sizeof(file_id_map[0]);
+ strcpy(file_id_map[file_ids_used++], fname);
+ qsort(file_id_map, file_ids_used, sizeof(file_id_map[0]), file_id_cmp);
+ return file_ids_used - 1;
+}
+
+void *
+x3_malloc(const char *file, unsigned int line, size_t size)
+{
+ struct alloc_header *block;
+ block = malloc(sizeof(*block) + size);
+ block = malloc(sizeof(*block) + size + sizeof(redzone));
+ assert(block != NULL);
+ if (block->magic == ALLOC_MAGIC && block->file_id < file_ids_used) {
+ /* Only report the error, due to possible false positives. */
+ log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%u; allocated by %u:%u/%u).",
+ block, file, line, size, block->file_id, block->line, block->size);
+ }
+ memset(block, 0, sizeof(*block) + size);
+ memcpy((char*)(block + 1) + size, redzone, sizeof(redzone));
+ block->file_id = get_file_id(file);
+ block->line = line;
+ block->size = size;
+ block->magic = ALLOC_MAGIC;
+ alloc_count++;
+ alloc_size += size;
+ return block + 1;
+}
+
+void *
+x3_realloc(const char *file, unsigned int line, void *ptr, size_t size)
+ struct alloc_header *block = NULL, *newblock;
+ struct alloc_header *block, *newblock;
+ }
+ if (!ptr)
+ return x3_malloc(file, line, size);
+
+ verify(ptr);
+ block = (struct alloc_header *)ptr - 1;
+
+ if (block->size >= size)
+ return block + 1;
+ newblock = malloc(sizeof(*newblock) + size);
+ newblock = malloc(sizeof(*newblock) + size + sizeof(redzone));
+ memset(newblock, 0, sizeof(*newblock) + size + sizeof(redzone));
+ memset(newblock, 0, sizeof(*newblock));
+ memcpy(newblock + 1, block + 1, block->size);
+ memset((char*)(newblock + 1) + block->size, 0, size - block->size);
+ memcpy((char*)(newblock + 1) + size, redzone, sizeof(redzone));
+ newblock->file_id = get_file_id(file);
+ newblock->line = line;
+ newblock->size = size;
+ newblock->magic = ALLOC_MAGIC;
+ alloc_count++;
+ alloc_size += size;
+ x3_free(block);
+ x3_free(file, line, block + 1);
+
+ return newblock + 1;
+}
+
+char *
+x3_strdup(const char *file, unsigned int line, const char *src)
+{
+ char *target;
+ size_t len;
+
+ len = strlen(src) + 1;
+ target = x3_malloc(file, line, len);
+ memcpy(target, src, len);
+ return target;
+}
+
+x3_free(const char *file, unsigned int line, void *ptr)
+x3_free(UNUSED_ARG(const char *file), UNUSED_ARG(unsigned int line), void *ptr)
+{
+ struct alloc_header *block;
+ size_t size;
+
+ if (!ptr)
+ return;
+ verify(ptr);
+ assert(block->magic == ALLOC_MAGIC);
+ memset(block, 0, size);
+ size = block->size;
+ memset(block + 1, 0xde, size);
+ block->magic = FREE_MAGIC;
+ free(block);
+ alloc_size -= size - sizeof(*block);
+ (void)file; (void)line;
+}
+
+void
+verify(const void *ptr)
+{
+ const struct alloc_header *header;
+ if (!ptr)
+ return;
+ header = (const struct alloc_header*)ptr - 1;
+ assert(header->magic == ALLOC_MAGIC);
+ assert(!memcmp((char*)(header + 1) + header->size, redzone, sizeof(redzone)));
+}
+
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.14 x3/src/chanserv.c:1.15
--- x3/src/chanserv.c:1.14 Mon Feb 21 05:54:54 2005
+++ x3/src/chanserv.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* chanserv.c - Channel service bot
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/chanserv.h
diff -u x3/src/chanserv.h:1.6 x3/src/chanserv.h:1.7
--- x3/src/chanserv.h:1.6 Mon Feb 21 05:54:54 2005
+++ x3/src/chanserv.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* chanserv.h - Channel service bot
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/common.h
diff -u x3/src/common.h:1.5 x3/src/common.h:1.6
--- x3/src/common.h:1.5 Mon Feb 21 05:54:54 2005
+++ x3/src/common.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* common.h - Common functions/includes
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/conf.c
diff -u x3/src/conf.c:1.1.1.1 x3/src/conf.c:1.2
--- x3/src/conf.c:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/conf.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* conf.c - Config file reader
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/conf.h
diff -u x3/src/conf.h:1.1.1.1 x3/src/conf.h:1.2
--- x3/src/conf.h:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/conf.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* conf.h - Config file reader
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/dict-splay.c
diff -u x3/src/dict-splay.c:1.3 x3/src/dict-splay.c:1.4
--- x3/src/dict-splay.c:1.3 Sun Jan 30 17:41:29 2005
+++ x3/src/dict-splay.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* dict-splay.c - Abstract dictionary type
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/dict.h
diff -u x3/src/dict.h:1.1.1.1 x3/src/dict.h:1.2
--- x3/src/dict.h:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/dict.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* dict.h - Abstract dictionary type
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/gline.c
diff -u x3/src/gline.c:1.1.1.1 x3/src/gline.c:1.2
--- x3/src/gline.c:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/gline.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* gline.c - Gline database
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/gline.h
diff -u x3/src/gline.h:1.1.1.1 x3/src/gline.h:1.2
--- x3/src/gline.h:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/gline.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* gline.h - Gline database
* Copyright 2001-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/global.c
diff -u x3/src/global.c:1.2 x3/src/global.c:1.3
--- x3/src/global.c:1.2 Tue Aug 24 17:32:01 2004
+++ x3/src/global.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* global.c - Global notice service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/global.h
diff -u x3/src/global.h:1.1.1.1 x3/src/global.h:1.2
--- x3/src/global.h:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/global.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* global.h - Global notice service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/hash.c
diff -u x3/src/hash.c:1.7 x3/src/hash.c:1.8
--- x3/src/hash.c:1.7 Mon Feb 21 05:54:54 2005
+++ x3/src/hash.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* hash.c - IRC network state database
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/hash.h
diff -u x3/src/hash.h:1.7 x3/src/hash.h:1.8
--- x3/src/hash.h:1.7 Sun Oct 24 11:18:10 2004
+++ x3/src/hash.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* hash.h - IRC network state database
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/heap.c
diff -u x3/src/heap.c:1.1.1.1 x3/src/heap.c:1.2
--- x3/src/heap.c:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/heap.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* heap.c - Abstract heap type
* Copyright 2000-2002 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/heap.h
diff -u x3/src/heap.h:1.1.1.1 x3/src/heap.h:1.2
--- x3/src/heap.h:1.1.1.1 Thu Jun 3 10:13:59 2004
+++ x3/src/heap.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* heap.h - Abstract heap type
* Copyright 2000-2001 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.2 x3/src/helpfile.c:1.3
--- x3/src/helpfile.c:1.2 Tue Aug 24 17:32:02 2004
+++ x3/src/helpfile.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* helpfile.c - Help file loading and display
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/helpfile.h
diff -u x3/src/helpfile.h:1.2 x3/src/helpfile.h:1.3
--- x3/src/helpfile.h:1.2 Tue Aug 24 17:32:02 2004
+++ x3/src/helpfile.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* helpfile.h - Help file loading and display
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/ioset.c
diff -u x3/src/ioset.c:1.1.1.1 x3/src/ioset.c:1.2
--- x3/src/ioset.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/ioset.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* ioset.h - srvx event loop
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/ioset.h
diff -u x3/src/ioset.h:1.1.1.1 x3/src/ioset.h:1.2
--- x3/src/ioset.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/ioset.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* ioset.h - srvx event loop
* Copyright 2002-2003 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/log.c
diff -u x3/src/log.c:1.4 x3/src/log.c:1.5
--- x3/src/log.c:1.4 Mon Feb 21 05:54:54 2005
+++ x3/src/log.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* log.c - Diagnostic and error logging
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/log.h
diff -u x3/src/log.h:1.2 x3/src/log.h:1.3
--- x3/src/log.h:1.2 Wed Dec 8 12:28:54 2004
+++ x3/src/log.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* log.h - Diagnostic and error logging
* Copyright 2000-2003 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/main.c
diff -u x3/src/main.c:1.3 x3/src/main.c:1.4
--- x3/src/main.c:1.3 Sun Mar 6 19:51:24 2005
+++ x3/src/main.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* main.c - srvx
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/mod-helpserv.c
diff -u x3/src/mod-helpserv.c:1.5 x3/src/mod-helpserv.c:1.6
--- x3/src/mod-helpserv.c:1.5 Sun Mar 6 19:51:24 2005
+++ x3/src/mod-helpserv.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* mod-helpserv.c - Support Helper assistant service
* Copyright 2002-2003 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/mod-memoserv.c
diff -u x3/src/mod-memoserv.c:1.1.1.1 x3/src/mod-memoserv.c:1.2
--- x3/src/mod-memoserv.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/mod-memoserv.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* mod-memoserv.c - MemoServ module for srvx
* Copyright 2003-2004 Martijn Smit and srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/mod-snoop.c
diff -u x3/src/mod-snoop.c:1.4 x3/src/mod-snoop.c:1.5
--- x3/src/mod-snoop.c:1.4 Sun Oct 24 11:19:00 2004
+++ x3/src/mod-snoop.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* mod-snoop.c - User surveillance module (per pomac's spec)
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/mod-sockcheck.c
diff -u x3/src/mod-sockcheck.c:1.2 x3/src/mod-sockcheck.c:1.3
--- x3/src/mod-sockcheck.c:1.2 Sun Jan 30 17:41:29 2005
+++ x3/src/mod-sockcheck.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* mod-sockcheck.c - insecure proxy checking
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/modcmd.c
diff -u x3/src/modcmd.c:1.9 x3/src/modcmd.c:1.10
--- x3/src/modcmd.c:1.9 Sun Mar 6 19:51:24 2005
+++ x3/src/modcmd.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* modcmd.c - Generalized module command support
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/modcmd.h
diff -u x3/src/modcmd.h:1.1.1.1 x3/src/modcmd.h:1.2
--- x3/src/modcmd.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/modcmd.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* modcmd.h - Generalized module command support
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/modules.c
diff -u x3/src/modules.c:1.1.1.1 x3/src/modules.c:1.2
--- x3/src/modules.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/modules.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* modules.c - Compiled-in module support
* Copyright 2002-2003 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/modules.h
diff -u x3/src/modules.h:1.1.1.1 x3/src/modules.h:1.2
--- x3/src/modules.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/modules.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* modules.h - Compiled-in module support
* Copyright 2002 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.17 x3/src/nickserv.c:1.18
--- x3/src/nickserv.c:1.17 Sun Mar 6 20:12:33 2005
+++ x3/src/nickserv.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* nickserv.c - Nick/authentication service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/nickserv.h
diff -u x3/src/nickserv.h:1.4 x3/src/nickserv.h:1.5
--- x3/src/nickserv.h:1.4 Sun Oct 24 11:18:10 2004
+++ x3/src/nickserv.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* nickserv.h - Nick/authentiction service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.10 x3/src/opserv.c:1.11
--- x3/src/opserv.c:1.10 Mon Feb 21 05:54:54 2005
+++ x3/src/opserv.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* opserv.c - IRC Operator assistance service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/opserv.h
diff -u x3/src/opserv.h:1.1.1.1 x3/src/opserv.h:1.2
--- x3/src/opserv.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/opserv.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* opserv.h - IRC Operator assistant service
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/policer.c
diff -u x3/src/policer.c:1.1.1.1 x3/src/policer.c:1.2
--- x3/src/policer.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/policer.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* policer.c - Leaky bucket
* Copyright 2000-2002 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/policer.h
diff -u x3/src/policer.h:1.1.1.1 x3/src/policer.h:1.2
--- x3/src/policer.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/policer.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* policer.h - Leaky bucket
* Copyright 2000-2001 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/proto-common.c
diff -u x3/src/proto-common.c:1.8 x3/src/proto-common.c:1.9
--- x3/src/proto-common.c:1.8 Sun Mar 6 19:51:24 2005
+++ x3/src/proto-common.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* proto-common.c - common IRC protocol parsing/sending support
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/proto-p10.c
diff -u x3/src/proto-p10.c:1.11 x3/src/proto-p10.c:1.12
--- x3/src/proto-p10.c:1.11 Mon Feb 21 05:54:54 2005
+++ x3/src/proto-p10.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* proto-p10.c - IRC protocol output
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/proto.h
diff -u x3/src/proto.h:1.3 x3/src/proto.h:1.4
--- x3/src/proto.h:1.3 Sun Oct 24 11:18:10 2004
+++ x3/src/proto.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* proto.h - IRC protocol output
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/recdb.c
diff -u x3/src/recdb.c:1.1.1.1 x3/src/recdb.c:1.2
--- x3/src/recdb.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/recdb.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* recdb.c - recursive/record database implementation
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/recdb.h
diff -u x3/src/recdb.h:1.1.1.1 x3/src/recdb.h:1.2
--- x3/src/recdb.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/recdb.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* recdb.h - recursive/record database implementation
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/saxdb.c
diff -u x3/src/saxdb.c:1.1.1.1 x3/src/saxdb.c:1.2
--- x3/src/saxdb.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/saxdb.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* saxdb.c - srvx database manager
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/saxdb.h
diff -u x3/src/saxdb.h:1.1.1.1 x3/src/saxdb.h:1.2
--- x3/src/saxdb.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/saxdb.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* saxdb.h - srvx database manager
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/sendmail.c
diff -u x3/src/sendmail.c:1.1.1.1 x3/src/sendmail.c:1.2
--- x3/src/sendmail.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/sendmail.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* sendmail.c - mail sending utilities
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/sendmail.h
diff -u x3/src/sendmail.h:1.1.1.1 x3/src/sendmail.h:1.2
--- x3/src/sendmail.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/sendmail.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* sendmail.h - mail sending utilities
* Copyright 2002 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/timeq.c
diff -u x3/src/timeq.c:1.1.1.1 x3/src/timeq.c:1.2
--- x3/src/timeq.c:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/timeq.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* timeq.c - time-based event queue
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/timeq.h
diff -u x3/src/timeq.h:1.1.1.1 x3/src/timeq.h:1.2
--- x3/src/timeq.h:1.1.1.1 Thu Jun 3 10:14:00 2004
+++ x3/src/timeq.h Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* timeq.h - time-based event queue
* Copyright 2000-2002 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Index: x3/src/tools.c
diff -u x3/src/tools.c:1.9 x3/src/tools.c:1.10
--- x3/src/tools.c:1.9 Sun Jan 30 18:11:36 2005
+++ x3/src/tools.c Sat Mar 12 12:13:14 2005
@@ -1,7 +1,7 @@
/* tools.c - miscellaneous utility functions
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-12 20:16:35
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-12 20:16:27 UTC
Modified files:
ChangeLog.X3
Log message:
updading changelog.
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.2 x3/ChangeLog.X3:1.3
--- x3/ChangeLog.X3:1.2 Sun Mar 6 20:12:32 2005
+++ x3/ChangeLog.X3 Sat Mar 12 12:16:17 2005
@@ -1,6 +1,11 @@
/***********************************************************************
X3 ChangeLog
+2005-03-07 Alex Schumann <ru...@af...>
+
+ * src/*, src/Makefile*, Makefile.in: changed srvx to x3 in a
+ bunch more places.
+
2005-03-07 Neil Spierling <sir...@gm...>
* nickserv.help: Added odelcookie section.
@@ -14,5 +19,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.2 $"
+#define CVS_VERSION "$Revision: 1.3 $"
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-12 20:19:34
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-12 20:19:13 UTC
Modified files:
ChangeLog.X3
Log message:
changelog /* was causing a warning, changed to /all
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.3 x3/ChangeLog.X3:1.4
--- x3/ChangeLog.X3:1.3 Sat Mar 12 12:16:17 2005
+++ x3/ChangeLog.X3 Sat Mar 12 12:19:03 2005
@@ -3,7 +3,7 @@
2005-03-07 Alex Schumann <ru...@af...>
- * src/*, src/Makefile*, Makefile.in: changed srvx to x3 in a
+ * src/all, src/Makefile*, Makefile.in: changed srvx to x3 in a
bunch more places.
2005-03-07 Neil Spierling <sir...@gm...>
@@ -19,5 +19,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.3 $"
+#define CVS_VERSION "$Revision: 1.4 $"
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-12 21:11:07
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-12 21:10:58 UTC
Modified files:
ChangeLog.X3 src/nickserv.c
Log message:
fixed registration process (uncommitted code from afternets x3 applied)
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.4 x3/ChangeLog.X3:1.5
--- x3/ChangeLog.X3:1.4 Sat Mar 12 12:19:03 2005
+++ x3/ChangeLog.X3 Sat Mar 12 13:10:47 2005
@@ -3,6 +3,10 @@
2005-03-07 Alex Schumann <ru...@af...>
+ * src/nickserv.c: Applied patch to bring up to date with
+ local uncommitted changes on afternets srvx2 tree. improved
+ cookie gen code and removed /play from cookie messages.
+
* src/all, src/Makefile*, Makefile.in: changed srvx to x3 in a
bunch more places.
@@ -19,5 +23,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.4 $"
+#define CVS_VERSION "$Revision: 1.5 $"
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.18 x3/src/nickserv.c:1.19
--- x3/src/nickserv.c:1.18 Sat Mar 12 12:13:14 2005
+++ x3/src/nickserv.c Sat Mar 12 13:10:47 2005
@@ -309,7 +309,7 @@
"This email has been sent to verify that this email address belongs to the person who tried to register an account on %1$s. Your cookie is:\n"
"%2$s\n"
"To verify your email address and complete the account registration, visit the following URL:\n"
- "http://www.afternet.org/play/index.php?option=com_registration&task=activate&username=%5$s&cookie=%2$s\n"
+ "http://www.afternet.org/index.php?option=com_registration&task=activate&username=%5$s&cookie=%2$s\n"
"\n"
"If you did NOT request this account, you do not need to do anything.\n"
"Please contact the %1$s staff if you have questions, and be sure to check our website." },
@@ -323,7 +323,7 @@
{ "NSEMAIL_PASSWORD_CHANGE_BODY_WEB",
"This email has been sent to verify that you wish to change the password on your account %5$s. Your cookie is %2$s.\n"
"To complete the password change, click the following URL:\n"
- "http://www.afternet.org/play/index.php?option=com_registration&task=passcookie&username=%5$s&cookie=%2$s\n"
+ "http://www.afternet.org/index.php?option=com_registration&task=passcookie&username=%5$s&cookie=%2$s\n"
"If you did NOT request your password to be changed, you do not need to do anything.\n"
"Please contact the %1$s staff if you have questions." },
{ "NSEMAIL_EMAIL_CHANGE_SUBJECT", "Email address change verification for %s" },
@@ -1036,6 +1036,27 @@
timeq_add(cookie->expires, nickserv_free_cookie, cookie);
}
+/* Contributed by the great sneep of afternet ;) */
+/* Since this gets used in a URL, we want to avoid stuff that confuses
+ * email clients such as ] and ?. a-z, 0-9 only.
+ */
+void genpass(char *str, int len)
+{
+ int i = 0;
+ char c = 0;
+
+ for(i = 0; i < len; i++)
+ {
+ do
+ {
+ c = (char)((float)rand() / (float)RAND_MAX * (float)256);
+ } while(!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')));
+ str[i] = c;
+ }
+ str[i] = '\0';
+ return;
+}
+
static void
nickserv_make_cookie(struct userNode *user, struct handle_info *hi, enum cookie_type type, const char *cookie_data, int weblink)
{
@@ -1053,9 +1074,14 @@
cookie->hi = hi;
cookie->type = type;
cookie->data = cookie_data ? strdup(cookie_data) : NULL;
+
cookie->expires = now + nickserv_conf.cookie_timeout;
- inttobase64(cookie->cookie, rand(), 5);
- inttobase64(cookie->cookie+5, rand(), 5);
+ /* Adding dedicated password gen function for more control -Rubin */
+ genpass(cookie->cookie, 10);
+ /*
+ *inttobase64(cookie->cookie, rand(), 5);
+ *inttobase64(cookie->cookie+5, rand(), 5);
+ */
netname = nickserv_conf.network_name;
subject[0] = 0;
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-13 02:51:47
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-13 02:51:21 UTC
Modified files:
ChangeLog.X3 src/opserv.c src/proto-common.c
Log message:
another srvx->x3 update, fixed changelog
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.5 x3/ChangeLog.X3:1.6
--- x3/ChangeLog.X3:1.5 Sat Mar 12 13:10:47 2005
+++ x3/ChangeLog.X3 Sat Mar 12 18:51:11 2005
@@ -1,7 +1,9 @@
/***********************************************************************
X3 ChangeLog
-2005-03-07 Alex Schumann <ru...@af...>
+2005-03-12 Alex Schumann <ru...@af...>
+
+ * opserv.c: fixed SRVX defines to X3
* src/nickserv.c: Applied patch to bring up to date with
local uncommitted changes on afternets srvx2 tree. improved
@@ -23,5 +25,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.5 $"
+#define CVS_VERSION "$Revision: 1.6 $"
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.11 x3/src/opserv.c:1.12
--- x3/src/opserv.c:1.11 Sat Mar 12 12:13:14 2005
+++ x3/src/opserv.c Sat Mar 12 18:51:11 2005
@@ -1705,7 +1705,7 @@
return 1;
}
-#if defined(WITH_MALLOC_SRVX)
+#if defined(WITH_MALLOC_X3)
static MODCMD_FUNC(cmd_stats_memory) {
extern unsigned long alloc_count, alloc_size;
send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
@@ -4278,7 +4278,7 @@
opserv_define_func("STATS UPLINK", cmd_stats_uplink, 0, 0, 0);
opserv_define_func("STATS UPTIME", cmd_stats_uptime, 0, 0, 0);
opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0);
-#if defined(WITH_MALLOC_SRVX) || defined(WITH_MALLOC_SLAB)
+#if defined(WITH_MALLOC_X3) || defined(WITH_MALLOC_SLAB)
opserv_define_func("STATS MEMORY", cmd_stats_memory, 0, 0, 0);
#endif
opserv_define_func("TRACE", cmd_trace, 100, 0, 3);
Index: x3/src/proto-common.c
diff -u x3/src/proto-common.c:1.9 x3/src/proto-common.c:1.10
--- x3/src/proto-common.c:1.9 Sat Mar 12 12:13:14 2005
+++ x3/src/proto-common.c Sat Mar 12 18:51:11 2005
@@ -737,7 +737,7 @@
mask = ~0 << masklen;
masked_ip = ntohl(user->ip.s_addr) & mask;
hostname = alloca(32);
- if (options & GENMASK_SRVXMASK) {
+ if (options & GENMASK_X3MASK) {
sprintf(hostname, "%d.%d.%d.%d/%d", (masked_ip>>24)&0xFF, (masked_ip>>16)&0xFF, (masked_ip>>8)&0xFF, masked_ip&0xFF, masklen);
} else {
int ofs = 0;
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-13 03:07:51
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-13 03:07:41 UTC
Modified files:
ChangeLog.X3 src/common.h src/proto.h
Log message:
this never ends...
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.6 x3/ChangeLog.X3:1.7
--- x3/ChangeLog.X3:1.6 Sat Mar 12 18:51:11 2005
+++ x3/ChangeLog.X3 Sat Mar 12 19:07:28 2005
@@ -3,6 +3,8 @@
2005-03-12 Alex Schumann <ru...@af...>
+ * src/common.h, src/opserv.h: more SRVX->X3 fixes
+
* opserv.c: fixed SRVX defines to X3
* src/nickserv.c: Applied patch to bring up to date with
@@ -25,5 +27,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.6 $"
+#define CVS_VERSION "$Revision: 1.7 $"
Index: x3/src/common.h
diff -u x3/src/common.h:1.6 x3/src/common.h:1.7
--- x3/src/common.h:1.6 Sat Mar 12 12:13:14 2005
+++ x3/src/common.h Sat Mar 12 19:07:30 2005
@@ -83,21 +83,21 @@
# define free(p) GC_FREE(p)
# undef HAVE_STRDUP
# undef strdup
-#elif defined(WITH_MALLOC_SRVX)
+#elif defined(WITH_MALLOC_X3)
# undef malloc
-# define malloc(n) srvx_malloc(__FILE__, __LINE__, (n))
+# define malloc(n) x3_malloc(__FILE__, __LINE__, (n))
# undef calloc
-# define calloc(m,n) srvx_malloc(__FILE__, __LINE__, (m)*(n))
+# define calloc(m,n) x3_malloc(__FILE__, __LINE__, (m)*(n))
# undef realloc
-# define realloc(p,n) srvx_realloc(__FILE__, __LINE__, (p), (n))
+# define realloc(p,n) x3_realloc(__FILE__, __LINE__, (p), (n))
# undef free
-# define free(p) srvx_free(__FILE__, __LINE__, (p))
+# define free(p) x3_free(__FILE__, __LINE__, (p))
# undef strdup
-# define strdup(s) srvx_strdup(__FILE__, __LINE__, (s))
-extern void *srvx_malloc(const char *, unsigned int, size_t);
-extern void *srvx_realloc(const char *, unsigned int, void *, size_t);
-extern char *srvx_strdup(const char *, unsigned int, const char *);
-extern void srvx_free(const char *, unsigned int, void *);
+# define strdup(s) x3_strdup(__FILE__, __LINE__, (s))
+extern void *x3_malloc(const char *, unsigned int, size_t);
+extern void *x3_realloc(const char *, unsigned int, void *, size_t);
+extern char *x3_strdup(const char *, unsigned int, const char *);
+extern void x3_free(const char *, unsigned int, void *);
# if !defined(NDEBUG)
extern void verify(const void *ptr);
# define verify(x) verify(x)
Index: x3/src/proto.h
diff -u x3/src/proto.h:1.4 x3/src/proto.h:1.5
--- x3/src/proto.h:1.4 Sat Mar 12 12:13:14 2005
+++ x3/src/proto.h Sat Mar 12 19:07:31 2005
@@ -23,7 +23,7 @@
/* Warning for those looking at how this code does multi-protocol
* support: It's an awful, nasty hack job. It is intended for short
- * term use, not long term, since we are already developing srvx2,
+ * term use, not long term, since we are already developing x3,
* which has much nicer interfaces that hide most of the ugly
* differences between protocol dialects. */
@@ -234,7 +234,7 @@
#define GENMASK_USENICK 2
#define GENMASK_OMITNICK 4 /* Hurray for Kevin! */
#define GENMASK_BYIP 8
-#define GENMASK_SRVXMASK 16
+#define GENMASK_X3MASK 16
#define GENMASK_NO_HIDING 128
char *generate_hostmask(struct userNode *user, int options);
----------------------- End of diff -----------------------
|
|
From: Reed L. <r3...@us...> - 2005-03-15 23:31:21
|
Committer : Reed Loden <r3...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-15 23:31:12 UTC
Modified files:
ChangeLog src/nickserv.help src/opserv.c
Log message:
Synchronization with srvx--devo--1.3--patch-19. Fixes raw/dump bug (it was stripping colons).
---------------------- diff included ----------------------
Index: x3/ChangeLog
diff -u x3/ChangeLog:1.6 x3/ChangeLog:1.7
--- x3/ChangeLog:1.6 Mon Feb 21 05:54:37 2005
+++ x3/ChangeLog Tue Mar 15 15:31:00 2005
@@ -2,6 +2,24 @@
# arch-tag: aut...@sr...--2005-srvx/srvx--devo--1.3
#
+2005-03-15 23:12:58 GMT Michael Poole <md...@tr...> patch-19
+
+ Summary:
+ Clarify NickServ REGISTER help messages; fix ?raw and ?dump errors.
+ Revision:
+ srvx--devo--1.3--patch-19
+
+ src/nickserv.help (REGISTER): Rephrase the message about using the
+ same password to hopefully make it clearer.
+
+ src/opserv.c (cmd_dump, cmd_raw): Use local buffers to hold the
+ original message, so that parse_line() will not unsplit the line into
+ the "original" buffer and strip out the sentinel :.
+
+ modified files:
+ ChangeLog src/nickserv.help src/opserv.c
+
+
2005-02-17 21:42:43 GMT Michael Poole <md...@tr...> patch-18
Summary:
Index: x3/src/nickserv.help
diff -u x3/src/nickserv.help:1.6 x3/src/nickserv.help:1.7
--- x3/src/nickserv.help:1.6 Sun Mar 6 20:12:33 2005
+++ x3/src/nickserv.help Tue Mar 15 15:31:01 2005
@@ -413,19 +413,19 @@
"REGISTER" {
"0: /services/nickserv/email_required" (
"/msg $N@$s REGISTER <account> <password> <email>",
- "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.",
+ "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.",
"An email will be sent to the email address you give containing a cookie that will let you activate your account. Once you have that cookie, you must use the $bcookie$b command to be able to use your account.",
"$uSee Also:$u auth, unregister"
);
"1: /services/nickserv/email_enabled" (
"/msg $N@$s REGISTER <account> <password> [email]",
- "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.",
+ "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.",
"If you specify an email address, an email will be sent to it containing a cookie that will let you activate your account. Once you have that cookie, you must use the $bcookie$b command to be able to use your account.",
"$uSee Also:$u auth, unregister"
);
"2: !/services/nickserv/email_enabled" (
"/msg $N@$s REGISTER <account> <password>",
- "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.",
+ "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.",
"$uSee Also:$u auth, unregister"
);
};
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.12 x3/src/opserv.c:1.13
--- x3/src/opserv.c:1.12 Sat Mar 12 18:51:11 2005
+++ x3/src/opserv.c Tue Mar 15 15:31:01 2005
@@ -1729,9 +1729,9 @@
static MODCMD_FUNC(cmd_dump)
{
- char linedup[MAXLEN], *original;
+ char linedup[MAXLEN], original[MAXLEN];
- original = unsplit_string(argv+1, argc-1, NULL);
+ unsplit_string(argv+1, argc-1, original);
safestrncpy(linedup, original, sizeof(linedup));
/* assume it's only valid IRC if we can parse it */
if (parse_line(linedup, 1)) {
@@ -1744,9 +1744,9 @@
static MODCMD_FUNC(cmd_raw)
{
- char linedup[MAXLEN], *original;
+ char linedup[MAXLEN], original[MAXLEN];
- original = unsplit_string(argv+1, argc-1, NULL);
+ unsplit_string(argv+1, argc-1, original);
safestrncpy(linedup, original, sizeof(linedup));
/* Try to parse the line before sending it; if it's too wrong,
* maybe it will core us instead of our uplink. */
----------------------- End of diff -----------------------
|
|
From: Reed L. <r3...@us...> - 2005-03-15 23:33:11
|
Committer : Reed Loden <r3...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-15 23:32:51 UTC
Modified files:
ChangeLog.X3
Log message:
Oops, I forgot the ChangeLog.X3 file.
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.7 x3/ChangeLog.X3:1.8
--- x3/ChangeLog.X3:1.7 Sat Mar 12 19:07:28 2005
+++ x3/ChangeLog.X3 Tue Mar 15 15:32:40 2005
@@ -1,7 +1,11 @@
/***********************************************************************
X3 ChangeLog
-2005-03-12 Alex Schumann <ru...@af...>
+2005-03-15 Reed Loden <re...@re...>
+
+ * Synchronization with srvx--devo--1.3--patch-19.
+
+2005-03-12 Alex Schumann <ru...@af...>
* src/common.h, src/opserv.h: more SRVX->X3 fixes
@@ -27,5 +31,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.7 $"
+#define CVS_VERSION "$Revision: 1.8 $"
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-16 05:17:20
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-16 05:17:03 UTC
Modified files:
src/chanserv.c src/helpfile.c src/helpfile.h src/main.c
src/modcmd.c src/modcmd.h
Log message:
better error messages when insuficient params
---------------------- diff included ----------------------
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.15 x3/src/chanserv.c:1.16
--- x3/src/chanserv.c:1.15 Sat Mar 12 12:13:14 2005
+++ x3/src/chanserv.c Tue Mar 15 21:16:50 2005
@@ -467,7 +467,7 @@
#define CSFUNC_ARGS user, channel, argc, argv, cmd
#define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
-#define CHANSERV_SYNTAX() svccmd_send_help(user, chanserv, cmd)
+#define CHANSERV_SYNTAX() svccmd_send_help_breef(user, chanserv, cmd)
#define REQUIRE_PARAMS(N) if(argc < (N)) { \
reply("MSG_MISSING_PARAMS", argv[0]); \
CHANSERV_SYNTAX(); \
@@ -1742,7 +1742,13 @@
}
else
{
- if((argc < 2) || !IsChannelName(argv[1]))
+ if(argc < 2)
+ {
+ reply("MSG_MISSING_PARAMS", cmd->name);
+ svccmd_send_help_breef(user, chanserv, cmd);
+ return 0;
+ }
+ if(!IsChannelName(argv[1]))
{
reply("MSG_NOT_CHANNEL_NAME");
return 0;
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.3 x3/src/helpfile.c:1.4
--- x3/src/helpfile.c:1.3 Sat Mar 12 12:13:14 2005
+++ x3/src/helpfile.c Tue Mar 15 21:16:51 2005
@@ -703,6 +703,28 @@
return res;
}
+
+int
+_send_help_breef(struct userNode *dest, struct userNode *src, expand_func_t expand, const char *format, ...)
+{
+ int res;
+ char* buf;
+ char* ptr;
+ va_list ap;
+
+ buf = (char *) malloc(strlen(format) +1);
+ sprintf(buf, format);
+ ptr = strchr(buf, '\n');
+ *ptr = '\0';
+ printf("buf is: %s", buf);
+ va_start(ap, buf);
+ res = vsend_message(dest->nick, src, dest->handle_info, 12, expand, buf, ap);
+ va_end(ap);
+ free(buf);
+ return res;
+}
+
+
int
send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic)
{
@@ -734,6 +756,37 @@
return _send_help(dest, src, hf->expand, rec->d.qstring);
}
+int
+send_help_breef(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic)
+{
+ struct helpfile *lang_hf;
+ struct record_data *rec;
+ struct language *curr;
+
+ if (!topic)
+ topic = "<index>";
+ if (!hf) {
+ _send_help(dest, src, NULL, "HFMSG_MISSING_HELPFILE");
+ return 0;
+ }
+ for (curr = (dest->handle_info ? dest->handle_info->language : lang_C);
+ curr;
+ curr = curr->parent) {
+ lang_hf = dict_find(curr->helpfiles, hf->name, NULL);
+ if (!lang_hf)
+ continue;
+ rec = dict_find(lang_hf->db, topic, NULL);
+ if (rec && rec->type == RECDB_QSTRING)
+ return _send_help_breef(dest, src, hf->expand, rec->d.qstring);
+ }
+ rec = dict_find(hf->db, "<missing>", NULL);
+ if (!rec)
+ return send_message(dest, src, "MSG_TOPIC_UNKNOWN");
+ if (rec->type != RECDB_QSTRING)
+ return send_message(dest, src, "HFMSG_HELP_NOT_STRING");
+ return _send_help(dest, src, hf->expand, rec->d.qstring);
+}
+
/* Grammar supported by this parser:
* condition = expr | prefix expr
* expr = atomicexpr | atomicexpr op atomicexpr
Index: x3/src/helpfile.h
diff -u x3/src/helpfile.h:1.3 x3/src/helpfile.h:1.4
--- x3/src/helpfile.h:1.3 Sat Mar 12 12:13:14 2005
+++ x3/src/helpfile.h Tue Mar 15 21:16:51 2005
@@ -82,6 +82,7 @@
int send_message_type(int msg_type, struct userNode *dest, struct userNode *src, const char *message, ...);
int send_target_message(int msg_type, const char *dest, struct userNode *src, const char *format, ...);
int send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic);
+int send_help_breef(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic);
/* size is maximum line width (up to MAX_LINE_SIZE); 0 means figure it out.
* irc_send is either irc_privmsg or irc_notice; NULL means figure it out. */
void table_send(struct userNode *from, const char *to, unsigned int size, irc_send_func irc_send, struct helpfile_table table);
Index: x3/src/main.c
diff -u x3/src/main.c:1.4 x3/src/main.c:1.5
--- x3/src/main.c:1.4 Sat Mar 12 12:13:14 2005
+++ x3/src/main.c Tue Mar 15 21:16:51 2005
@@ -96,8 +96,8 @@
{ "MSG_INVALID_GLINE", "Invalid G-line '%s'." },
{ "MSG_INVALID_DURATION", "Invalid time span '%s'." },
{ "MSG_NOT_TARGET_NAME", "You must provide the name of a channel or user." },
- { "MSG_NOT_CHANNEL_NAME", "You must provide a valid channel name." },
- { "MSG_INVALID_CHANNEL", "You must provide the name of a channel that exists." },
+ { "MSG_NOT_CHANNEL_NAME", "The channel name you specified is not a valid channel name." },
+ { "MSG_INVALID_CHANNEL", "The channel name you specified does not exist." },
{ "MSG_CHANNEL_ABSENT", "You aren't currently in $b%s$b." },
{ "MSG_CHANNEL_USER_ABSENT", "$b%s$b isn't currently in $b%s$b." },
{ "MSG_MISSING_PARAMS", "$b%s$b requires more parameters." },
Index: x3/src/modcmd.c
diff -u x3/src/modcmd.c:1.10 x3/src/modcmd.c:1.11
--- x3/src/modcmd.c:1.10 Sat Mar 12 12:13:14 2005
+++ x3/src/modcmd.c Tue Mar 15 21:16:51 2005
@@ -721,6 +721,7 @@
}
if (argc < cmd->command->min_argc) {
send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
+ svccmd_send_help_breef(user, service->bot, cmd);
return 0;
}
if (!cmd->command->func) {
@@ -784,6 +785,28 @@
}
int
+svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd) {
+ char cmdname[MAXLEN];
+ unsigned int nn;
+ int r;
+ /* Show command name (in bold). */
+ for (nn=0; cmd->name[nn]; nn++)
+ cmdname[nn] = toupper(cmd->name[nn]);
+ cmdname[nn] = 0;
+
+ /* Show the help entry for the underlying command. */
+ /* Lets not show help for a parent command, thats not what
+ * they asked for!
+ * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
+ * TODO: We actually DO want to show the parent IF there is no other help.
+ */
+ r = send_help_breef(user, bot, cmd->command->parent->helpfile, cmd->name);
+
+ return r;
+}
+
+
+int
svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic) {
struct module *module;
struct svccmd *cmd;
Index: x3/src/modcmd.h
diff -u x3/src/modcmd.h:1.2 x3/src/modcmd.h:1.3
--- x3/src/modcmd.h:1.2 Sat Mar 12 12:13:14 2005
+++ x3/src/modcmd.h Tue Mar 15 21:16:52 2005
@@ -167,6 +167,8 @@
int svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd);
/* .. and if somebody doesn't have a modcmd handy .. */
int svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic);
+/* Send breef help for a command to a user. */
+int svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd);
/* Check whether a user may invoke a command or not. If they can,
* return non-zero. If they cannot (and noisy is non-zero), tell them
* why not and return 0.
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-16 05:29:30
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-16 05:29:19 UTC
Modified files:
ChangeLog.X3
Log message:
changelog
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.8 x3/ChangeLog.X3:1.9
--- x3/ChangeLog.X3:1.8 Tue Mar 15 15:32:40 2005
+++ x3/ChangeLog.X3 Tue Mar 15 21:29:08 2005
@@ -1,6 +1,20 @@
/***********************************************************************
X3 ChangeLog
+2005-03-15 Alex Schumann <ru...@af...>
+
+ * src/chanserv.c: Improved some syntax error reporting for commands
+
+ * src/helpfile.c: Added a 'breef' help function
+
+ * src/helpfile.h: Added a 'breef' help function
+
+ * src/main.c: Improved some syntax error reporting for commands
+
+ * src/modcmd.c: Improved some syntax error reporting for commands
+
+ * src/modcmd.h: Improved some syntax error reporting for commands
+
2005-03-15 Reed Loden <re...@re...>
* Synchronization with srvx--devo--1.3--patch-19.
@@ -31,5 +45,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.8 $"
+#define CVS_VERSION "$Revision: 1.9 $"
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-17 20:18:49
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-17 20:18:39 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/helpfile.c src/opserv.c
Log message:
Made some stuff pretty.. including USERS, STATS NETWORK, and TRACE PRINT.
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.9 x3/ChangeLog.X3:1.10
--- x3/ChangeLog.X3:1.9 Tue Mar 15 21:29:08 2005
+++ x3/ChangeLog.X3 Thu Mar 17 12:18:28 2005
@@ -1,6 +1,16 @@
/***********************************************************************
X3 ChangeLog
+2005-03-17 Alex Schumann <ru...@af...>
+
+ * src/opserv.c: Improved readability of trace print output
+
+ * src/chanserv.c: Improved cmd_list_users output & cleaned it up
+ a little.
+
+ * src/helpfile.c: Improved table_send readability (used in lots
+ of listings including users and stats network etc)
+
2005-03-15 Alex Schumann <ru...@af...>
* src/chanserv.c: Improved some syntax error reporting for commands
@@ -45,5 +55,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.9 $"
+#define CVS_VERSION "$Revision: 1.10 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.16 x3/src/chanserv.c:1.17
--- x3/src/chanserv.c:1.16 Tue Mar 15 21:16:50 2005
+++ x3/src/chanserv.c Thu Mar 17 12:18:29 2005
@@ -319,8 +319,8 @@
{ "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." },
/* Channel userlist */
- { "CSMSG_ACCESS_ALL_HEADER", "%s users from level %d to %d:" },
- { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %d to %d matching %s:" },
+ { "CSMSG_ACCESS_ALL_HEADER", "=---- %s users from level %d to %d ----=" },
+ { "CSMSG_ACCESS_SEARCH_HEADER", "=-- %s users from level %d to %d matching %s --=" },
{ "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." },
{ "CSMSG_CHANGED_ACCESS", "%s now has access $b%d$b in %s." },
@@ -670,6 +670,17 @@
return level;
}
+char *
+user_level_name_from_level(int level)
+{
+ unsigned int ii;
+ for(ii = 0; (ii < ArrayLength(accessLevels)); ii++)
+ if(level == accessLevels[ii].level)
+ return accessLevels[ii].title;
+ return("UNKNOWN");
+}
+
+
int
parse_level_range(unsigned short *minl, unsigned short *maxl, const char *arg)
{
@@ -3461,6 +3472,7 @@
return 1;
}
+/* This is never used... */
static void
zoot_list(struct listData *list)
{
@@ -3556,8 +3568,10 @@
lData.highest = highest;
lData.search = (argc > 1) ? argv[1] : NULL;
send_list = def_list;
+ /* What does the following line do exactly?? */
(void)zoot_list; /* since it doesn't show user levels */
+ /* this does nothing!! -rubin
if(user->handle_info)
{
switch(user->handle_info->userlist_style)
@@ -3566,6 +3580,7 @@
case HI_STYLE_ZOOT: send_list = def_list; break;
}
}
+ */
lData.users = alloca(channel->channel_info->userCount * sizeof(struct userData *));
matches = 0;
@@ -3596,7 +3611,10 @@
ary = malloc(lData.table.width*sizeof(**lData.table.contents));
lData.table.contents[matches] = ary;
- ary[0] = strtab(uData->access);
+ /* ary[0] = strtab(uData->access);*/
+ ary[0] = user_level_name_from_level(uData->access);
+ /* TODO: replace above with func that returns static string
+ * of userlevel for that level. eg OP/MANAGER etc. -rubin */
ary[1] = uData->handle->handle;
if(uData->present)
ary[2] = "Here";
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.4 x3/src/helpfile.c:1.5
--- x3/src/helpfile.c:1.4 Tue Mar 15 21:16:51 2005
+++ x3/src/helpfile.c Thu Mar 17 12:18:29 2005
@@ -261,11 +261,22 @@
return NULL;
}
+int strlen_vis(char *str)
+{
+ int count;
+ for(count=0;*str;str++)
+ if(!iscntrl(*str))
+ count++;
+ return count;
+}
+
void
table_send(struct userNode *from, const char *to, unsigned int size, irc_send_func irc_send, struct helpfile_table table) {
unsigned int ii, jj, len, nreps, reps, tot_width, pos, spaces, *max_width;
char line[MAX_LINE_SIZE+1];
struct handle_info *hi;
+ char *sepstr = NULL;
+ int sepsize = 0;
if (IsChannelName(to) || *to == '$') {
message_dest = NULL;
@@ -334,6 +345,7 @@
for (pos=ii=0; ii<((table.flags & TABLE_REPEAT_HEADERS)?nreps:1); ii++) {
for (jj=0; 1; ) {
len = strlen(table.contents[0][jj]);
+ line[pos++] = '\02'; /* bold header */
spaces = max_width[jj] - len;
if (table.flags & TABLE_PAD_LEFT)
while (spaces--)
@@ -346,10 +358,16 @@
while (spaces--)
line[pos++] = ' ';
line[pos++] = ' ';
+ line[pos++] = '\02'; /* end bold header */
}
}
line[pos] = 0;
irc_send(from, to, line);
+ sepsize = strlen_vis(line);
+ sepstr = malloc(sepsize + 1);
+ memset(sepstr, '-', sepsize);
+ sepstr[sepsize] = 0;
+ irc_send(from, to, sepstr);
ii = 1;
}
/* Send the table. */
@@ -376,6 +394,18 @@
line[pos++] = ' ';
}
}
+ if (!(table.flags & TABLE_NO_HEADERS)) {
+ /* Send end bar & free its memory */
+ if(sepsize > 5)
+ {
+ sepstr[sepsize/2-1] = 'E';
+ sepstr[sepsize/2] = 'n';
+ sepstr[sepsize/2+1]= 'd';
+ }
+ irc_send(from, to, sepstr);
+ free(sepstr);
+ }
+
if (!(table.flags & TABLE_NO_FREE)) {
/* Deallocate table memory (but not the string memory). */
for (ii=0; ii<table.length; ii++)
@@ -704,6 +734,7 @@
}
+/*
int
_send_help_breef(struct userNode *dest, struct userNode *src, expand_func_t expand, const char *format, ...)
{
@@ -713,16 +744,16 @@
va_list ap;
buf = (char *) malloc(strlen(format) +1);
- sprintf(buf, format);
+ strcpy(buf, format);
ptr = strchr(buf, '\n');
*ptr = '\0';
- printf("buf is: %s", buf);
va_start(ap, buf);
res = vsend_message(dest->nick, src, dest->handle_info, 12, expand, buf, ap);
va_end(ap);
free(buf);
return res;
}
+*/
int
@@ -777,7 +808,18 @@
continue;
rec = dict_find(lang_hf->db, topic, NULL);
if (rec && rec->type == RECDB_QSTRING)
- return _send_help_breef(dest, src, hf->expand, rec->d.qstring);
+ {
+ char* buf;
+ int res;
+
+ buf = malloc(strlen(rec->d.qstring) + 1);
+ strcpy(buf, rec->d.qstring);
+ *strchr(buf, '\n') = 0;
+
+ res = _send_help(dest, src, hf->expand, buf);
+ free(buf);
+ return res;
+ }
}
rec = dict_find(hf->db, "<missing>", NULL);
if (!rec)
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.13 x3/src/opserv.c:1.14
--- x3/src/opserv.c:1.13 Tue Mar 15 15:31:01 2005
+++ x3/src/opserv.c Thu Mar 17 12:18:29 2005
@@ -3343,9 +3343,9 @@
{
struct discrim_and_source *das = extra;
if (match->handle_info) {
- send_message_type(4, das->source, opserv, "%s!%s@%s %s", match->nick, match->ident, match->hostname, match->handle_info->handle);
+ send_message_type(4, das->source, opserv, "%-15s\002!\002%15s\002@\002%s %s", match->nick, match->ident, match->hostname, match->handle_info->handle);
} else {
- send_message_type(4, das->source, opserv, "%s!%s@%s", match->nick, match->ident, match->hostname);
+ send_message_type(4, das->source, opserv, "%-15s\002!\002%15s\002@\002%s", match->nick, match->ident, match->hostname);
}
return 0;
}
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-18 06:20:05
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-18 06:19:53 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/helpfile.c src/modcmd.c
src/modcmd.h
Log message:
fixing spelling for reed
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.10 x3/ChangeLog.X3:1.11
--- x3/ChangeLog.X3:1.10 Thu Mar 17 12:18:28 2005
+++ x3/ChangeLog.X3 Thu Mar 17 22:19:43 2005
@@ -1,8 +1,13 @@
/***********************************************************************
X3 ChangeLog
+2005-03-18 Alex Schumann <ru...@af...>
+
+ * Changed breef to brief...
+
2005-03-17 Alex Schumann <ru...@af...>
+
* src/opserv.c: Improved readability of trace print output
* src/chanserv.c: Improved cmd_list_users output & cleaned it up
@@ -55,5 +60,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.10 $"
+#define CVS_VERSION "$Revision: 1.11 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.17 x3/src/chanserv.c:1.18
--- x3/src/chanserv.c:1.17 Thu Mar 17 12:18:29 2005
+++ x3/src/chanserv.c Thu Mar 17 22:19:43 2005
@@ -467,7 +467,7 @@
#define CSFUNC_ARGS user, channel, argc, argv, cmd
#define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
-#define CHANSERV_SYNTAX() svccmd_send_help_breef(user, chanserv, cmd)
+#define CHANSERV_SYNTAX() svccmd_send_help_brief(user, chanserv, cmd)
#define REQUIRE_PARAMS(N) if(argc < (N)) { \
reply("MSG_MISSING_PARAMS", argv[0]); \
CHANSERV_SYNTAX(); \
@@ -1756,7 +1756,7 @@
if(argc < 2)
{
reply("MSG_MISSING_PARAMS", cmd->name);
- svccmd_send_help_breef(user, chanserv, cmd);
+ svccmd_send_help_brief(user, chanserv, cmd);
return 0;
}
if(!IsChannelName(argv[1]))
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.5 x3/src/helpfile.c:1.6
--- x3/src/helpfile.c:1.5 Thu Mar 17 12:18:29 2005
+++ x3/src/helpfile.c Thu Mar 17 22:19:43 2005
@@ -352,13 +352,13 @@
line[pos++] = ' ';
memcpy(line+pos, table.contents[0][jj], len);
pos += len;
+ line[pos++] = '\02'; /* end bold header */
if (++jj == table.width)
break;
if (!(table.flags & TABLE_PAD_LEFT))
while (spaces--)
line[pos++] = ' ';
line[pos++] = ' ';
- line[pos++] = '\02'; /* end bold header */
}
}
line[pos] = 0;
@@ -733,29 +733,6 @@
return res;
}
-
-/*
-int
-_send_help_breef(struct userNode *dest, struct userNode *src, expand_func_t expand, const char *format, ...)
-{
- int res;
- char* buf;
- char* ptr;
- va_list ap;
-
- buf = (char *) malloc(strlen(format) +1);
- strcpy(buf, format);
- ptr = strchr(buf, '\n');
- *ptr = '\0';
- va_start(ap, buf);
- res = vsend_message(dest->nick, src, dest->handle_info, 12, expand, buf, ap);
- va_end(ap);
- free(buf);
- return res;
-}
-*/
-
-
int
send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic)
{
@@ -788,7 +765,7 @@
}
int
-send_help_breef(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic)
+send_help_brief(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic)
{
struct helpfile *lang_hf;
struct record_data *rec;
Index: x3/src/modcmd.c
diff -u x3/src/modcmd.c:1.11 x3/src/modcmd.c:1.12
--- x3/src/modcmd.c:1.11 Tue Mar 15 21:16:51 2005
+++ x3/src/modcmd.c Thu Mar 17 22:19:43 2005
@@ -721,7 +721,7 @@
}
if (argc < cmd->command->min_argc) {
send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
- svccmd_send_help_breef(user, service->bot, cmd);
+ svccmd_send_help_brief(user, service->bot, cmd);
return 0;
}
if (!cmd->command->func) {
@@ -785,7 +785,7 @@
}
int
-svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd) {
+svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd) {
char cmdname[MAXLEN];
unsigned int nn;
int r;
@@ -800,7 +800,7 @@
* return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
* TODO: We actually DO want to show the parent IF there is no other help.
*/
- r = send_help_breef(user, bot, cmd->command->parent->helpfile, cmd->name);
+ r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->name);
return r;
}
Index: x3/src/modcmd.h
diff -u x3/src/modcmd.h:1.3 x3/src/modcmd.h:1.4
--- x3/src/modcmd.h:1.3 Tue Mar 15 21:16:52 2005
+++ x3/src/modcmd.h Thu Mar 17 22:19:43 2005
@@ -167,8 +167,8 @@
int svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd);
/* .. and if somebody doesn't have a modcmd handy .. */
int svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic);
-/* Send breef help for a command to a user. */
-int svccmd_send_help_breef(struct userNode *user, struct userNode *bot, struct svccmd *cmd);
+/* Send brief help for a command to a user. */
+int svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd);
/* Check whether a user may invoke a command or not. If they can,
* return non-zero. If they cannot (and noisy is non-zero), tell them
* why not and return 0.
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-18 08:05:20
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-18 08:05:09 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/helpfile.h
Log message:
changed most access level outputs to words
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.11 x3/ChangeLog.X3:1.12
--- x3/ChangeLog.X3:1.11 Thu Mar 17 22:19:43 2005
+++ x3/ChangeLog.X3 Fri Mar 18 00:04:57 2005
@@ -5,6 +5,8 @@
* Changed breef to brief...
+ * chanserv.c: Changed to access level names instead of numbers.
+
2005-03-17 Alex Schumann <ru...@af...>
@@ -60,5 +62,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.11 $"
+#define CVS_VERSION "$Revision: 1.12 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.18 x3/src/chanserv.c:1.19
--- x3/src/chanserv.c:1.18 Thu Mar 17 22:19:43 2005
+++ x3/src/chanserv.c Fri Mar 18 00:04:58 2005
@@ -189,8 +189,8 @@
{ "CSMSG_BAD_RANGE", "Invalid access range; minimum (%d) must be greater than maximum (%d)." },
{ "CSMSG_DELETED_USERS", "Deleted accounts matching $b%s$b with access from $b%d$b to $b%d$b from the %s user list." },
{ "CSMSG_TRIMMED_USERS", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s." },
- { "CSMSG_INCORRECT_ACCESS", "%s has access $b%d$b, not %s." },
- { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with access %d)." },
+ { "CSMSG_INCORRECT_ACCESS", "%s has access $b%s$b, not %s." },
+ { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with %s access)." },
{ "CSMSG_CANNOT_TRIM", "You must include a minimum inactivity duration of at least 60 seconds to trim." },
{ "CSMSG_NO_SELF_CLVL", "You cannot change your own access." },
@@ -228,7 +228,7 @@
{ "CSMSG_TOPIC_SET", "Topic is now '%s'." },
{ "CSMSG_NO_TOPIC", "$b%s$b does not have a default topic." },
{ "CSMSG_TOPICMASK_CONFLICT1", "I do not know how to make that topic work with the current topic mask in $b%s$b, which is: %s" },
- { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic at most %d characters and matches the topic mask pattern." },
+ { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic is at most %d characters and matches the topic mask pattern." },
{ "CSMSG_TOPIC_LOCKED", "The %s topic is locked." },
{ "CSMSG_MASK_BUT_NO_TOPIC", "Warning: $b%s$b does not have a default topic, but you just set the topic mask." },
{ "CSMSG_TOPIC_MISMATCH", "Warning: The default topic for $b%s$b does not match the topic mask; changing it anyway." },
@@ -319,10 +319,10 @@
{ "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." },
/* Channel userlist */
- { "CSMSG_ACCESS_ALL_HEADER", "=---- %s users from level %d to %d ----=" },
- { "CSMSG_ACCESS_SEARCH_HEADER", "=-- %s users from level %d to %d matching %s --=" },
+ { "CSMSG_ACCESS_ALL_HEADER", "%s users from level %s to %s" },
+ { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %s to %s matching %s" },
{ "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." },
- { "CSMSG_CHANGED_ACCESS", "%s now has access $b%d$b in %s." },
+ { "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b in %s." },
/* Channel note list */
{ "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" },
@@ -356,9 +356,9 @@
{ "CSMSG_SQUAT_ACCESS", "$b%s$b does not have access to any channels." },
{ "CSMSG_INFOLINE_LIST", "Showing all channel entries for account $b%s$b:" },
{ "CSMSG_USER_NO_ACCESS", "%s lacks access to %s." },
- { "CSMSG_USER_HAS_ACCESS", "%s has access $b%d$b in %s." },
+ { "CSMSG_USER_HAS_ACCESS", "%s has $b%s$b access in %s." },
{ "CSMSG_HELPER_NO_ACCESS", "%s lacks access to %s but has $bsecurity override$b enabled." },
- { "CSMSG_HELPER_HAS_ACCESS", "%s has access $b%d$b in %s and has $bsecurity override$b enabled." },
+ { "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access in %s and has $bsecurity override$b enabled." },
{ "CSMSG_LAZY_SMURF_TARGET", "%s is %s ($bIRCOp$b; not logged in)." },
{ "CSMSG_SMURF_TARGET", "%s is %s ($b%s$b)." },
{ "CSMSG_LAME_SMURF_TARGET", "%s is an IRC operator." },
@@ -575,7 +575,7 @@
char *title;
unsigned short level;
char ch;
-} accessLevels[] = {
+} accessLevels[] = { /* MUST be orderd less to most! */
{ "peon", "Peon", UL_PEON, '+' },
{ "halfop", "HalfOp", UL_HALFOP, '%' },
{ "op", "Op", UL_OP, '@' },
@@ -674,10 +674,15 @@
user_level_name_from_level(int level)
{
unsigned int ii;
+ char* highest;
+
+ highest = "None";
+ if(level >= 1)
+ highest = "Peon";
for(ii = 0; (ii < ArrayLength(accessLevels)); ii++)
- if(level == accessLevels[ii].level)
- return accessLevels[ii].title;
- return("UNKNOWN");
+ if(level >= accessLevels[ii].level)
+ highest = accessLevels[ii].title;
+ return(highest);
}
@@ -2290,7 +2295,7 @@
if((actee = GetTrueChannelAccess(channel->channel_info, handle)))
{
- reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access);
+ reply("CSMSG_USER_EXISTS", handle->handle, channel->name, user_level_name_from_level(actee->access));
return 0;
}
@@ -2348,7 +2353,7 @@
}
victim->access = new_access;
- reply("CSMSG_CHANGED_ACCESS", handle->handle, new_access, channel->name);
+ reply("CSMSG_CHANGED_ACCESS", handle->handle, user_level_name_from_level(new_access), channel->name);
return 1;
}
@@ -2383,7 +2388,7 @@
}
if(access != victim->access)
{
- reply("CSMSG_INCORRECT_ACCESS", handle->handle, victim->access, argv[1]);
+ reply("CSMSG_INCORRECT_ACCESS", handle->handle, user_level_name_from_level(victim->access), argv[1]);
return 0;
}
}
@@ -3447,7 +3452,7 @@
&& ((target_handle->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel->channel_info));
if((uData = GetTrueChannelAccess(channel->channel_info, target_handle)))
{
- reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, uData->access, channel->name);
+ reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, user_level_name_from_level(uData->access), channel->name);
/* To prevent possible information leaks, only show infolines
* if the requestor is in the channel or it's their own
* handle. */
@@ -3484,9 +3489,9 @@
if(list->table.length == 1)
{
if(list->search)
- send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search);
else
- send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest));
msg = user_find_message(list->user, "MSG_NONE");
send_message_type(4, list->user, list->bot, " %s", msg);
}
@@ -3507,9 +3512,9 @@
if((curr == list->table.length) || (list->users[curr-1]->access < lowest))
{
if(list->search)
- send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, lowest, highest, list->search);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest), list->search);
else
- send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, lowest, highest);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest));
temp = list->table.contents[--start];
list->table.contents[start] = list->table.contents[0];
tmp_table.contents = list->table.contents + start;
@@ -3528,9 +3533,9 @@
{
const char *msg;
if(list->search)
- send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search);
else
- send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest);
+ send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest));
table_send(list->bot, list->user->nick, 0, NULL, list->table);
if(list->table.length == 1)
{
Index: x3/src/helpfile.h
diff -u x3/src/helpfile.h:1.4 x3/src/helpfile.h:1.5
--- x3/src/helpfile.h:1.4 Tue Mar 15 21:16:51 2005
+++ x3/src/helpfile.h Fri Mar 18 00:04:58 2005
@@ -82,7 +82,7 @@
int send_message_type(int msg_type, struct userNode *dest, struct userNode *src, const char *message, ...);
int send_target_message(int msg_type, const char *dest, struct userNode *src, const char *format, ...);
int send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic);
-int send_help_breef(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic);
+int send_help_brief(struct userNode *dest, struct userNode *src, struct helpfile *hf, const char *topic);
/* size is maximum line width (up to MAX_LINE_SIZE); 0 means figure it out.
* irc_send is either irc_privmsg or irc_notice; NULL means figure it out. */
void table_send(struct userNode *from, const char *to, unsigned int size, irc_send_func irc_send, struct helpfile_table table);
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-20 01:11:59
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-20 01:11:45 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/chanserv.h src/chanserv.help
src/helpfile.c src/main.c src/nickserv.c src/opserv.c
src/opserv.help src/sendmail.c src/tools.c
Log message:
Lots of style changes to user replies. added numeric access back
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.12 x3/ChangeLog.X3:1.13
--- x3/ChangeLog.X3:1.12 Fri Mar 18 00:04:57 2005
+++ x3/ChangeLog.X3 Sat Mar 19 17:11:34 2005
@@ -1,6 +1,19 @@
/***********************************************************************
X3 ChangeLog
+2005-03-19 Alex Schumann <ru...@af...>
+
+ * chanserv.c: Changed style of command outputs, added userlevel back
+ to users list.
+
+ * opserv.c: Changed style of command outputs
+
+ * tools.c: shortened duration string lengths
+
+ * main.c: shortened duration string lengths
+
+ * sendmail.c: Changed style of stats email
+
2005-03-18 Alex Schumann <ru...@af...>
* Changed breef to brief...
@@ -62,5 +75,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.12 $"
+#define CVS_VERSION "$Revision: 1.13 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.19 x3/src/chanserv.c:1.20
--- x3/src/chanserv.c:1.19 Fri Mar 18 00:04:58 2005
+++ x3/src/chanserv.c Sat Mar 19 17:11:34 2005
@@ -131,9 +131,9 @@
/* Do-not-register channels */
{ "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." },
- { "CSMSG_DNR_SEARCH_RESULTS", "The following do-not-registers were found:" },
- { "CSMSG_DNR_INFO", "$b%s$b is do-not-register (by $b%s$b): %s" },
- { "CSMSG_DNR_INFO_SET", "$b%s$b is do-not-register (set %s by $b%s$b): %s" },
+ { "CSMSG_DNR_SEARCH_RESULTS", "$bDo-Not-Register Channels$b" },
+ { "CSMSG_DNR_INFO", "$b%s$b (set by $b%s$b): %s" },
+ { "CSMSG_DNR_INFO_SET", "$b%s$b (set %s ago by $b%s$b): %s" },
{ "CSMSG_MORE_DNRS", "%d more do-not-register entries skipped." },
{ "CSMSG_DNR_CHANNEL", "Only network staff may register $b%s$b." },
{ "CSMSG_DNR_CHANNEL_MOVE", "Only network staff may move $b%s$b." },
@@ -184,7 +184,7 @@
{ "CSMSG_DELETED_YOU", "Your $b%d$b access has been deleted from $b%s$b." },
/* User management */
- { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %d." },
+ { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %s (%d)." },
{ "CSMSG_DELETED_USER", "Deleted %s (with access %d) from the %s user list." },
{ "CSMSG_BAD_RANGE", "Invalid access range; minimum (%d) must be greater than maximum (%d)." },
{ "CSMSG_DELETED_USERS", "Deleted accounts matching $b%s$b with access from $b%d$b to $b%d$b from the %s user list." },
@@ -319,10 +319,11 @@
{ "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." },
/* Channel userlist */
- { "CSMSG_ACCESS_ALL_HEADER", "%s users from level %s to %s" },
- { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %s to %s matching %s" },
+ { "CSMSG_ACCESS_ALL_HEADER", "$b%s Users From Level %s To %s$b" },
+ { "CSMSG_ACCESS_SEARCH_HEADER", "$b%s Users From Level %s To %s Matching %s$b" },
{ "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." },
- { "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b in %s." },
+ { "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b (%u) in %s." },
+ { "CSMSG_BANS_HEADER", "$bBans in %s$b" },
/* Channel note list */
{ "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" },
@@ -356,9 +357,9 @@
{ "CSMSG_SQUAT_ACCESS", "$b%s$b does not have access to any channels." },
{ "CSMSG_INFOLINE_LIST", "Showing all channel entries for account $b%s$b:" },
{ "CSMSG_USER_NO_ACCESS", "%s lacks access to %s." },
- { "CSMSG_USER_HAS_ACCESS", "%s has $b%s$b access in %s." },
+ { "CSMSG_USER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s." },
{ "CSMSG_HELPER_NO_ACCESS", "%s lacks access to %s but has $bsecurity override$b enabled." },
- { "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access in %s and has $bsecurity override$b enabled." },
+ { "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s and has $bsecurity override$b enabled." },
{ "CSMSG_LAZY_SMURF_TARGET", "%s is %s ($bIRCOp$b; not logged in)." },
{ "CSMSG_SMURF_TARGET", "%s is %s ($b%s$b)." },
{ "CSMSG_LAME_SMURF_TARGET", "%s is an IRC operator." },
@@ -374,7 +375,8 @@
{ "CSMSG_END_NAMES", "End of names in $b%s$b" },
/* Channel information */
- { "CSMSG_CHANNEL_INFO", "$b%s$b Information:" },
+ { "CSMSG_CHANNEL_INFO", "$bInformation About %s$b" },
+ { "CSMSG_BAR", "----------------------------------------"},
{ "CSMSG_CHANNEL_TOPIC", "$bDefault Topic: $b%s" },
{ "CSMSG_CHANNEL_MODES", "$bMode Lock: $b%s" },
{ "CSMSG_CHANNEL_NOTE", "$b%s:%*s$b%s" },
@@ -395,13 +397,15 @@
{ "CSMSG_CHANNEL_SUSPENDED_7", " %s ago by %s; revoked %s ago: %s" },
{ "CSMSG_CHANNEL_REGISTERED", "$bRegistered: $b%s ago." },
{ "CSMSG_CHANNEL_VISITED", "$bVisited: $b%s ago." },
+ { "CSMSG_CHANNEL_END", "---------------End of Info--------------"},
- { "CSMSG_PEEK_INFO", "$b%s$b Status:" },
+ { "CSMSG_PEEK_INFO", "$bStatus of %s$b" },
{ "CSMSG_PEEK_TOPIC", "$bTopic: $b%s" },
{ "CSMSG_PEEK_MODES", "$bModes: $b%s" },
{ "CSMSG_PEEK_USERS", "$bTotal users: $b%d" },
{ "CSMSG_PEEK_OPS", "$bOps:$b" },
{ "CSMSG_PEEK_NO_OPS", "$bOps: $bNone present" },
+ { "CSMSG_PEEK_END", "-------------End of Status--------------" },
/* Network information */
{ "CSMSG_NETWORK_INFO", "Network Information:" },
@@ -423,11 +427,12 @@
{ "CSMSG_ACTION_INVALID", "$b%s$b is not a recognized search action." },
{ "CSMSG_UNVISITED_HEADER", "Showing a maximum of %d channels unvisited for $b%s$b:" },
{ "CSMSG_UNVISITED_DATA", "%s: $b%s$b" },
- { "CSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" },
+ { "CSMSG_CHANNEL_SEARCH_RESULTS", "$bChannels Found Matching Search$b" },
/* Channel configuration */
{ "CSMSG_INVALID_OPTION", "$b%s$b is not a valid %s option." },
- { "CSMSG_CHANNEL_OPTIONS", "Channel Options:" },
+ { "CSMSG_CHANNEL_OPTIONS", "$bChannel Options for %s$b" },
+ { "CSMSG_CHANNEL_OPTIONS_END", "-------------End of Options-------------" },
{ "CSMSG_GREETING_TOO_LONG", "Your greeting ($b%d$b characters) must be shorter than $b%d$b characters." },
/* User settings */
@@ -447,7 +452,7 @@
{ "CSMSG_HUGGLES_YOU", "\001ACTION huggles you\001" },
/* Other things */
- { "CSMSG_EVENT_SEARCH_RESULTS", "The following channel events were found:" },
+ { "CSMSG_EVENT_SEARCH_RESULTS", "$bChannel Events for %s$b" },
{ NULL, NULL }
};
@@ -1616,6 +1621,7 @@
dict_iterator_t it;
reply("CSMSG_DNR_SEARCH_RESULTS");
+ reply("CSMSG_BAR");
matches = 0;
for(it = dict_first(handle_dnrs); it; it = iter_next(it))
{
@@ -1674,6 +1680,7 @@
}
reply("CSMSG_DNR_SEARCH_RESULTS");
+ reply("CSMSG_BAR");
if(*target == '*')
matches = chanserv_show_dnrs(user, cmd, NULL, target + 1);
else
@@ -2301,7 +2308,7 @@
actee = add_channel_user(channel->channel_info, handle, access, 0, NULL);
scan_user_presence(actee, NULL);
- reply("CSMSG_ADDED_USER", handle->handle, channel->name, access);
+ reply("CSMSG_ADDED_USER", handle->handle, channel->name, user_level_name_from_level(access), access);
return 1;
}
@@ -2353,7 +2360,7 @@
}
victim->access = new_access;
- reply("CSMSG_CHANGED_ACCESS", handle->handle, user_level_name_from_level(new_access), channel->name);
+ reply("CSMSG_CHANGED_ACCESS", handle->handle, user_level_name_from_level(new_access), new_access, channel->name);
return 1;
}
@@ -3452,7 +3459,7 @@
&& ((target_handle->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel->channel_info));
if((uData = GetTrueChannelAccess(channel->channel_info, target_handle)))
{
- reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, user_level_name_from_level(uData->access), channel->name);
+ reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, user_level_name_from_level(uData->access), uData->access, channel->name);
/* To prevent possible information leaks, only show infolines
* if the requestor is in the channel or it's their own
* handle. */
@@ -3600,15 +3607,16 @@
qsort(lData.users, matches, sizeof(lData.users[0]), userData_access_comp);
lData.table.length = matches+1;
- lData.table.width = 4;
+ lData.table.width = 5;
lData.table.flags = TABLE_NO_FREE;
lData.table.contents = malloc(lData.table.length*sizeof(*lData.table.contents));
ary = malloc(lData.table.width*sizeof(**lData.table.contents));
lData.table.contents[0] = ary;
ary[0] = "Access";
- ary[1] = "Account";
- ary[2] = "Last Seen";
- ary[3] = "Status";
+ ary[1] = "Level";
+ ary[2] = "Account";
+ ary[3] = "Last Seen";
+ ary[4] = "Status";
for(matches = 1; matches < lData.table.length; ++matches)
{
struct userData *uData = lData.users[matches-1];
@@ -3620,25 +3628,26 @@
ary[0] = user_level_name_from_level(uData->access);
/* TODO: replace above with func that returns static string
* of userlevel for that level. eg OP/MANAGER etc. -rubin */
- ary[1] = uData->handle->handle;
+ ary[1] = strtab(uData->access);
+ ary[2] = uData->handle->handle;
if(uData->present)
- ary[2] = "Here";
+ ary[3] = "Here";
else if(!uData->seen)
- ary[2] = "Never";
+ ary[3] = "Never";
else
- ary[2] = intervalString(seen, now - uData->seen, user->handle_info);
- ary[2] = strdup(ary[2]);
+ ary[3] = intervalString(seen, now - uData->seen, user->handle_info);
+ ary[3] = strdup(ary[3]);
if(IsUserSuspended(uData))
- ary[3] = "Suspended";
+ ary[4] = "Suspended";
else if(HANDLE_FLAGGED(uData->handle, FROZEN))
- ary[3] = "Vacation";
+ ary[4] = "Vacation";
else
- ary[3] = "Normal";
+ ary[4] = "Normal";
}
send_list(&lData);
for(matches = 1; matches < lData.table.length; ++matches)
{
- free((char*)lData.table.contents[matches][2]);
+ free((char*)lData.table.contents[matches][3]);
free(lData.table.contents[matches]);
}
free(lData.table.contents[0]);
@@ -3694,6 +3703,7 @@
else
search = NULL;
+ reply("CSMSG_BANS_HEADER", channel->name);
bans = alloca(channel->channel_info->banCount * sizeof(struct banData *));
for(ban = channel->channel_info->bans; ban; ban = ban->next)
@@ -3760,7 +3770,7 @@
tbl.contents[ii][3] = ban->reason;
}
table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
- reply("MSG_MATCH_COUNT", matches);
+ /* reply("MSG_MATCH_COUNT", matches); */
for(ii = 1; ii < tbl.length; ++ii)
{
free((char*)tbl.contents[ii][2]);
@@ -4025,6 +4035,7 @@
cData = channel->channel_info;
reply("CSMSG_CHANNEL_INFO", channel->name);
+ reply("CSMSG_BAR");
uData = GetChannelUser(cData, user->handle_info);
if(uData && (uData->access >= cData->lvlOpts[lvlGiveOps]))
@@ -4074,6 +4085,7 @@
reply("CSMSG_CHANNEL_SUSPENDED", channel->name);
show_suspension_info(cmd, user, cData->suspended);
}
+ reply("CSMSG_CHANNEL_END");
return 1;
}
@@ -4160,6 +4172,7 @@
irc_make_chanmode(channel, modes);
reply("CSMSG_PEEK_INFO", channel->name);
+ reply("CSMSG_BAR");
reply("CSMSG_PEEK_TOPIC", channel->topic);
reply("CSMSG_PEEK_MODES", modes);
reply("CSMSG_PEEK_USERS", channel->members.used);
@@ -4184,6 +4197,7 @@
}
else
reply("CSMSG_PEEK_NO_OPS");
+ reply("CSMSG_PEEK_END");
return 1;
}
@@ -4516,7 +4530,8 @@
discrim.severities = 1 << LOG_COMMAND;
report.reporter = chanserv;
report.user = user;
- reply("CSMSG_EVENT_SEARCH_RESULTS");
+ reply("CSMSG_EVENT_SEARCH_RESULTS", channel->name);
+ reply("CSMSG_BAR");
matches = log_entry_search(&discrim, log_report_entry, &report);
if(matches)
reply("MSG_MATCH_COUNT", matches);
@@ -4851,7 +4866,10 @@
search->limit = INT_MAX;
if(action == search_print)
+ {
reply("CSMSG_CHANNEL_SEARCH_RESULTS");
+ reply("CSMSG_BAR");
+ }
matches = chanserv_channel_search(search, action, user);
@@ -5420,12 +5438,14 @@
if(argc < 2)
{
- reply("CSMSG_CHANNEL_OPTIONS");
+ reply("CSMSG_CHANNEL_OPTIONS", channel->name);
+ reply("CSMSG_BAR");
for(ii = 0; ii < set_shows_list.used; ii++)
{
subcmd = set_shows_list.list[ii];
subcmd->command->func(user, channel, 1, argv+1, subcmd);
}
+ reply("CSMSG_CHANNEL_OPTIONS_END");
return 1;
}
Index: x3/src/chanserv.h
diff -u x3/src/chanserv.h:1.7 x3/src/chanserv.h:1.8
--- x3/src/chanserv.h:1.7 Sat Mar 12 12:13:14 2005
+++ x3/src/chanserv.h Sat Mar 19 17:11:35 2005
@@ -181,5 +181,7 @@
int check_user_level(struct chanNode *channel, struct userNode *user, enum levelOption opt, int allow_override, int exempt_owner);
void do_math(char *Buffer, char *Math);
+char* user_level_name_from_level(int level);
+
#endif
Index: x3/src/chanserv.help
diff -u x3/src/chanserv.help:1.7 x3/src/chanserv.help:1.8
--- x3/src/chanserv.help:1.7 Sun Mar 6 19:51:24 2005
+++ x3/src/chanserv.help Sat Mar 19 17:11:35 2005
@@ -205,8 +205,8 @@
"$uFor assistance, please join #Help$u",
"Example: *!*serv@*.afternet.org would ban anyone with ident 'serv' and an afternet.org hostname from joining the channel.",
"$uSee Also:$u unban, unbanall, unbanme");
-"BANS" ("/msg $C BANS <#channel>",
- "This command lists all permanent and timed bans in the channel.",
+"BANS" ("/msg $C BANS <#channel> [mask]",
+ "This command lists all permanent and timed bans in the channel matching mask.",
"$uSee Also:$u addban, delban, mdelban");
"CALC" ("/msg $C CALC <expression>",
"CALC calculates a mathematical expression, and returns the answer. It",
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.6 x3/src/helpfile.c:1.7
--- x3/src/helpfile.c:1.6 Thu Mar 17 22:19:43 2005
+++ x3/src/helpfile.c Sat Mar 19 17:11:35 2005
@@ -345,14 +345,14 @@
for (pos=ii=0; ii<((table.flags & TABLE_REPEAT_HEADERS)?nreps:1); ii++) {
for (jj=0; 1; ) {
len = strlen(table.contents[0][jj]);
- line[pos++] = '\02'; /* bold header */
+ //line[pos++] = '\02'; /* bold header */
spaces = max_width[jj] - len;
if (table.flags & TABLE_PAD_LEFT)
while (spaces--)
line[pos++] = ' ';
memcpy(line+pos, table.contents[0][jj], len);
pos += len;
- line[pos++] = '\02'; /* end bold header */
+ //line[pos++] = '\02'; /* end bold header */
if (++jj == table.width)
break;
if (!(table.flags & TABLE_PAD_LEFT))
@@ -362,12 +362,13 @@
}
}
line[pos] = 0;
- irc_send(from, to, line);
sepsize = strlen_vis(line);
sepstr = malloc(sepsize + 1);
memset(sepstr, '-', sepsize);
sepstr[sepsize] = 0;
- irc_send(from, to, sepstr);
+ irc_send(from, to, sepstr); /* ----------------- */
+ irc_send(from, to, line); /* alpha beta roe */
+ irc_send(from, to, sepstr); /* ----------------- */
ii = 1;
}
/* Send the table. */
Index: x3/src/main.c
diff -u x3/src/main.c:1.5 x3/src/main.c:1.6
--- x3/src/main.c:1.5 Tue Mar 15 21:16:51 2005
+++ x3/src/main.c Sat Mar 19 17:11:35 2005
@@ -77,6 +77,7 @@
{ "MSG_ON", "On" },
{ "MSG_OFF", "Off" },
{ "MSG_NEVER", "Never" },
+ { "MSG_BAR", "----------------------------------------" },
{ "MSG_SERVICE_IMMUNE", "$b%s$b may not be kicked, killed, banned, or deopped." },
{ "MSG_SERVICE_PRIVILEGED", "$b%s$b is a privileged service." },
{ "MSG_NOT_A_SERVICE", "$b%s$b is not a service bot." },
@@ -107,7 +108,7 @@
{ "MSG_STUPID_ACCESS_CHANGE", "Please ask someone $belse$b to demote you." },
{ "MSG_NO_SEARCH_ACCESS", "You do not have enough access to search based on $b%s$b." },
{ "MSG_INVALID_CRITERIA", "$b%s$b is an invalid search criteria." },
- { "MSG_MATCH_COUNT", "Found $b%u$b matches." },
+ { "MSG_MATCH_COUNT", "-----------Found $b%3u$b Matches------------" },
{ "MSG_NO_MATCHES", "Nothing matched the criteria of your search." },
{ "MSG_TOPIC_UNKNOWN", "No help on that topic." },
{ "MSG_INVALID_BINARY", "$b%s$b is an invalid binary value." },
@@ -117,20 +118,20 @@
{ "MSG_DB_WRITE_ERROR", "Error while writing database %s." },
{ "MSG_DB_WROTE_DB", "Wrote database %s (in "FMT_TIME_T".%06lu seconds)." },
{ "MSG_DB_WROTE_ALL", "Wrote all databases (in "FMT_TIME_T".%06lu seconds)." },
- { "MSG_AND", "and" },
+ { "MSG_AND", "," },
{ "MSG_0_SECONDS", "0 seconds" },
- { "MSG_YEAR", "year" },
- { "MSG_YEARS", "years" },
- { "MSG_WEEK", "week" },
- { "MSG_WEEKS", "weeks" },
- { "MSG_DAY", "day" },
- { "MSG_DAYS", "days" },
- { "MSG_HOUR", "hour" },
- { "MSG_HOURS", "hours" },
- { "MSG_MINUTE", "minute" },
- { "MSG_MINUTES", "minutes" },
- { "MSG_SECOND", "second" },
- { "MSG_SECONDS", "seconds" },
+ { "MSG_YEAR", "y" },
+ { "MSG_YEARS", "y" },
+ { "MSG_WEEK", "w" },
+ { "MSG_WEEKS", "w" },
+ { "MSG_DAY", "d" },
+ { "MSG_DAYS", "d" },
+ { "MSG_HOUR", "h" },
+ { "MSG_HOURS", "h" },
+ { "MSG_MINUTE", "m" },
+ { "MSG_MINUTES", "m" },
+ { "MSG_SECOND", "s" },
+ { "MSG_SECONDS", "s" },
{ NULL, NULL }
};
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.19 x3/src/nickserv.c:1.20
--- x3/src/nickserv.c:1.19 Sat Mar 12 13:10:47 2005
+++ x3/src/nickserv.c Sat Mar 19 17:11:35 2005
@@ -185,29 +185,30 @@
{ "NSMSG_TITLE_INVALID", "Titles cannot contain any dots; please choose another." },
{ "NSMSG_TITLE_TRUNCATED", "That title combined with the user's account name would result in a truncated host; please choose a shorter title." },
{ "NSMSG_FAKEHOST_INVALID", "Fake hosts must be shorter than %d characters and cannot start with a dot." },
- { "NSMSG_HANDLEINFO_ON", "Account information for $b%s$b:" },
- { "NSMSG_HANDLEINFO_ID", " Account ID: %lu" },
- { "NSMSG_HANDLEINFO_REGGED", " Registered on: %s" },
- { "NSMSG_HANDLEINFO_LASTSEEN", " Last seen: %s" },
- { "NSMSG_HANDLEINFO_LASTSEEN_NOW", " Last seen: Right now!" },
- { "NSMSG_HANDLEINFO_VACATION", " On vacation." },
- { "NSMSG_HANDLEINFO_EMAIL_ADDR", " Email address: %s" },
- { "NSMSG_HANDLEINFO_COOKIE_ACTIVATION", " Cookie: There is currently an activation cookie issued for this account" },
- { "NSMSG_HANDLEINFO_COOKIE_PASSWORD", " Cookie: There is currently a password change cookie issued for this account" },
- { "NSMSG_HANDLEINFO_COOKIE_EMAIL", " Cookie: There is currently an email change cookie issued for this account" },
- { "NSMSG_HANDLEINFO_COOKIE_ALLOWAUTH", " Cookie: There is currently an allowauth cookie issued for this account" },
- { "NSMSG_HANDLEINFO_COOKIE_UNKNOWN", " Cookie: There is currently an unknown cookie issued for this account" },
- { "NSMSG_HANDLEINFO_INFOLINE", " Infoline: %s" },
- { "NSMSG_HANDLEINFO_FLAGS", " Flags: %s" },
- { "NSMSG_HANDLEINFO_EPITHET", " Epithet: %s" },
- { "NSMSG_HANDLEINFO_FAKEHOST", " Fake host: %s" },
- { "NSMSG_HANDLEINFO_LAST_HOST", " Last quit hostmask: %s" },
- { "NSMSG_HANDLEINFO_LAST_HOST_UNKNOWN", " Last quit hostmask: Unknown" },
- { "NSMSG_HANDLEINFO_NICKS", " Nickname(s): %s" },
- { "NSMSG_HANDLEINFO_MASKS", " Hostmask(s): %s" },
- { "NSMSG_HANDLEINFO_CHANNELS", " Channel(s): %s" },
- { "NSMSG_HANDLEINFO_CURRENT", " Current nickname(s): %s" },
- { "NSMSG_HANDLEINFO_DNR", " Do-not-register (by %s): %s" },
+ { "NSMSG_HANDLEINFO_ON", "$bAccount Information for %s$b" },
+ { "NSMSG_HANDLEINFO_END", "----------End of Account Info-----------" },
+ { "NSMSG_HANDLEINFO_ID", "Account ID: %lu" },
+ { "NSMSG_HANDLEINFO_REGGED", "Registered on: %s" },
+ { "NSMSG_HANDLEINFO_LASTSEEN", "Last seen: %s" },
+ { "NSMSG_HANDLEINFO_LASTSEEN_NOW", "Last seen: Right now!" },
+ { "NSMSG_HANDLEINFO_VACATION", "On vacation." },
+ { "NSMSG_HANDLEINFO_EMAIL_ADDR", "Email address: %s" },
+ { "NSMSG_HANDLEINFO_COOKIE_ACTIVATION", "Cookie: There is currently an activation cookie issued for this account" },
+ { "NSMSG_HANDLEINFO_COOKIE_PASSWORD", "Cookie: There is currently a password change cookie issued for this account" },
+ { "NSMSG_HANDLEINFO_COOKIE_EMAIL", "Cookie: There is currently an email change cookie issued for this account" },
+ { "NSMSG_HANDLEINFO_COOKIE_ALLOWAUTH", "Cookie: There is currently an allowauth cookie issued for this account" },
+ { "NSMSG_HANDLEINFO_COOKIE_UNKNOWN", "Cookie: There is currently an unknown cookie issued for this account" },
+ { "NSMSG_HANDLEINFO_INFOLINE", "Infoline: %s" },
+ { "NSMSG_HANDLEINFO_FLAGS", "Flags: %s" },
+ { "NSMSG_HANDLEINFO_EPITHET", "Epithet: %s" },
+ { "NSMSG_HANDLEINFO_FAKEHOST", "Fake host: %s" },
+ { "NSMSG_HANDLEINFO_LAST_HOST", "Last quit hostmask: %s" },
+ { "NSMSG_HANDLEINFO_LAST_HOST_UNKNOWN", "Last quit hostmask: Unknown" },
+ { "NSMSG_HANDLEINFO_NICKS", "Nickname(s): %s" },
+ { "NSMSG_HANDLEINFO_MASKS", "Hostmask(s): %s" },
+ { "NSMSG_HANDLEINFO_CHANNELS", "Channel(s): %s" },
+ { "NSMSG_HANDLEINFO_CURRENT", "Current nickname(s): %s" },
+ { "NSMSG_HANDLEINFO_DNR", "Do-not-register (by %s): %s" },
{ "NSMSG_USERINFO_AUTHED_AS", "$b%s$b is authenticated to account $b%s$b." },
{ "NSMSG_USERINFO_NOT_AUTHED", "$b%s$b is not authenticated to any account." },
{ "NSMSG_NICKINFO_OWNER", "Nick $b%s$b is owned by account $b%s$b." },
@@ -1384,6 +1385,7 @@
nsmsg_none = handle_find_message(hi, "MSG_NONE");
reply("NSMSG_HANDLEINFO_ON", hi->handle);
+ reply("MSG_BAR");
#ifdef WITH_PROTOCOL_BAHAMUT
reply("NSMSG_HANDLEINFO_ID", hi->id);
#endif
@@ -1510,7 +1512,7 @@
}
if (IsUserSuspended(channel))
buff[pos++] = '-';
- pos += sprintf(buff+pos, "%d:%s ", channel->access, name);
+ pos += sprintf(buff+pos, "%s:%s ", user_level_name_from_level(channel->access), name);
if (next == NULL) {
print_chans_buff:
buff[pos-1] = 0;
@@ -1540,6 +1542,7 @@
}
}
+ reply("NSMSG_HANDLEINFO_END");
return 1;
}
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.14 x3/src/opserv.c:1.15
--- x3/src/opserv.c:1.14 Thu Mar 17 12:18:29 2005
+++ x3/src/opserv.c Sat Mar 19 17:11:35 2005
@@ -86,6 +86,7 @@
#define OSMSG_GAG_REQUESTED "Gag requested by %s."
static const struct message_entry msgtab[] = {
+ { "OSMSG_BAR", "----------------------------------------" },
{ "OSMSG_USER_ACCESS_IS", "$b%s$b (account $b%s$b) has %d access." },
{ "OSMSG_LEVEL_TOO_LOW", "You lack sufficient access to use this command." },
{ "OSMSG_NEED_CHANNEL", "You must specify a channel for $b%s$b." },
@@ -159,8 +160,12 @@
{ "OSMSG_MAX_CLIENTS", "Max clients: %d at %s" },
{ "OSMSG_NETWORK_INFO", "Total users: %d (%d invisible, %d opers)" },
{ "OSMSG_RESERVED_LIST", "List of reserved nicks:" },
- { "OSMSG_TRUSTED_LIST", "List of trusted hosts:" },
- { "OSMSG_HOST_IS_TRUSTED", "%s (%s; set %s ago by %s; expires %s: %s)" },
+ { "OSMSG_TRUSTED_LIST", "$bTrusted Hosts$b" },
+ { "OSMSG_TRUSTED_LIST_HEADER", "IP Address Limit By Time" },
+ { "OSMSG_HOST_IS_TRUSTED", "%-15s %-5s %-10s set %s ago, expires %s" },
+ { "OSMSG_HOST_IS_TRUSTED_DESC", " Reason: %s" },
+ { "OSMSG_TRUSTED_LIST_BAR", "----------------------------------------" },
+ { "OSMSG_TRUSTED_LIST_END", "----------End of Trusted Hosts----------" },
{ "OSMSG_HOST_NOT_TRUSTED", "%s does not have a special trust." },
{ "OSMSG_UPTIME_STATS", "Uptime: %s (%u lines processed, CPU time %.2fu/%.2fs)" },
{ "OSMSG_LINE_DUMPED", "Raw line sent." },
@@ -196,6 +201,9 @@
{ "OSMSG_SETTIME_SUCCESS", "Set time for servers named like $b%s$b." },
{ "OSMSG_BAD_ACTION", "Unrecognized trace action $b%s$b." },
{ "OSMSG_USER_SEARCH_RESULTS", "The following users were found:" },
+ { "OSMSG_USER_SEARCH_HEADER", "Nick User@Host (Account)" },
+ { "OSMSG_USER_SEARCH_BAR", "-------------------------------------------" },
+ { "OSMSG_USER_SEARCH_COUNT", "------------ Found %4u matches -----------" },
{ "OSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" },
{ "OSMSG_GLINE_SEARCH_RESULTS", "The following glines were found:" },
{ "OSMSG_LOG_SEARCH_RESULTS", "The following log entries were found:" },
@@ -214,8 +222,12 @@
{ "OSMSG_ADDED_ALERT", "Added alert named $b%s$b." },
{ "OSMSG_REMOVED_ALERT", "Removed alert named $b%s$b." },
{ "OSMSG_NO_SUCH_ALERT", "No alert named $b%s$b could be found." },
- { "OSMSG_ALERT_IS", "%s (by %s, reaction %s): %s" },
- { "OSMSG_ALERTS_LIST", "Current $O alerts:" },
+ { "OSMSG_ALERTS_LIST", "$bCurrent $O alerts$b" },
+ { "OSMSG_ALERTS_BAR", "----------------------------------------------" },
+ { "OSMSG_ALERTS_HEADER", "Name Action (by Oper)" },
+ { "OSMSG_ALERTS_DESC", " Criteria: %s" },
+ { "OSMSG_ALERT_IS", "$b%-20s$b %-6s (by %s)" },
+ { "OSMSG_ALERT_END", "----------------End of Alerts-----------------" },
{ "OSMSG_REHASH_COMPLETE", "Completed rehash of configuration database." },
{ "OSMSG_REHASH_FAILED", "Rehash of configuration database failed, previous configuration is intact." },
{ "OSMSG_REOPEN_COMPLETE", "Closed and reopened all log files." },
@@ -263,7 +275,7 @@
struct userNode *opserv;
-static dict_t opserv_chan_warn; /* data is char* */
+/*static dict_t opserv_chan_warn; */ /* data is char* */
static dict_t opserv_reserved_nick_dict; /* data is struct userNode* */
static struct string_list *opserv_bad_words;
static dict_t opserv_exempt_channels; /* data is not used */
@@ -495,6 +507,8 @@
return 1;
}
+/* This command has been replaced by 'alert notice channel #foo' */
+/*
static MODCMD_FUNC(cmd_warn)
{
char *reason, *message;
@@ -535,6 +549,7 @@
reply("OSMSG_WARN_DELETED", argv[1]);
return 1;
}
+*/
static MODCMD_FUNC(cmd_clearbans)
{
@@ -1393,8 +1408,10 @@
char buffer[400];
/* Show the bad word list.. */
+ /* TODO: convert nonprinting chars like bold to $b etc in a usable way */
for (ii=end=0; ii<opserv_bad_words->used; ii++) {
here_len = strlen(opserv_bad_words->list[ii]);
+ /* If the line is full output it & start again */
if ((end + here_len + 2) > sizeof(buffer)) {
buffer[end] = 0;
reply("OSMSG_BADWORD_LIST", buffer);
@@ -1554,6 +1571,10 @@
struct trusted_host *th;
char length[INTERVALLEN], issued[INTERVALLEN], limit[32];
+ reply("OSMSG_TRUSTED_LIST");
+ reply("OSMSG_TRUSTED_LIST_BAR");
+ reply("OSMSG_TRUSTED_LIST_HEADER");
+ reply("OSMSG_TRUSTED_LIST_BAR");
if (argc > 1) {
th = dict_find(opserv_trusted_hosts, argv[1], NULL);
if (th) {
@@ -1562,19 +1583,18 @@
if (th->expires)
intervalString(length, th->expires - now, user->handle_info);
if (th->limit)
- sprintf(limit, "limit %lu", th->limit);
+ sprintf(limit, "%lu", th->limit);
reply("OSMSG_HOST_IS_TRUSTED",
th->ipaddr,
- (th->limit ? limit : "no limit"),
- (th->issued ? issued : "some time"),
+ (th->limit ? limit : "none"),
(th->issuer ? th->issuer : "<unknown>"),
- (th->expires ? length : "never"),
- (th->reason ? th->reason : "<unknown>"));
+ (th->issued ? issued : "some time"),
+ (th->expires ? length : "never"));
+ reply("OSMSG_HOST_IS_TRUSTED_DESC", (th->reason ? th->reason : "<unknown>"));
} else {
reply("OSMSG_HOST_NOT_TRUSTED", argv[1]);
}
} else {
- reply("OSMSG_TRUSTED_LIST");
for (it = dict_first(opserv_trusted_hosts); it; it = iter_next(it)) {
th = iter_data(it);
if (th->issued)
@@ -1582,15 +1602,16 @@
if (th->expires)
intervalString(length, th->expires - now, user->handle_info);
if (th->limit)
- sprintf(limit, "limit %lu", th->limit);
+ sprintf(limit, "%lu", th->limit);
reply("OSMSG_HOST_IS_TRUSTED", iter_key(it),
- (th->limit ? limit : "no limit"),
- (th->issued ? issued : "some time"),
+ (th->limit ? limit : "none"),
(th->issuer ? th->issuer : "<unknown>"),
- (th->expires ? length : "never"),
- (th->reason ? th->reason : "<unknown>"));
+ (th->issued ? issued : "some time"),
+ (th->expires ? length : "never"));
+ reply("OSMSG_HOST_IS_TRUSTED_DESC", (th->reason ? th->reason : "<unknown>"));
}
}
+ reply("OSMSG_TRUSTED_LIST_END");
return 1;
}
@@ -1636,6 +1657,9 @@
const char *reaction;
reply("OSMSG_ALERTS_LIST");
+ reply("OSMSG_ALERTS_BAR");
+ reply("OSMSG_ALERTS_HEADER");
+ reply("OSMSG_ALERTS_BAR");
for (it = dict_first(opserv_user_alerts); it; it = iter_next(it)) {
alert = iter_data(it);
switch (alert->reaction) {
@@ -1644,8 +1668,10 @@
case REACT_GLINE: reaction = "gline"; break;
default: reaction = "<unknown>"; break;
}
- reply("OSMSG_ALERT_IS", iter_key(it), alert->owner, reaction, alert->text_discrim);
+ reply("OSMSG_ALERT_IS", iter_key(it), reaction, alert->owner);
+ reply("OSMSG_ALERTS_DESC", alert->text_discrim);
}
+ reply("OSMSG_ALERT_END");
return 1;
}
@@ -1695,6 +1721,7 @@
return 1;
}
+/*
static MODCMD_FUNC(cmd_stats_warn) {
dict_iterator_t it;
@@ -1704,6 +1731,7 @@
reply("OSMSG_WARN_LISTEND");
return 1;
}
+*/
#if defined(WITH_MALLOC_X3)
static MODCMD_FUNC(cmd_stats_memory) {
@@ -1720,9 +1748,9 @@
send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
"%u allocations in %u slabs totalling %u bytes.",
slab_alloc_count, slab_count, slab_alloc_size);
- send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
+/* send_message_type(MSG_TYPE_NOXLATE, user, cmd->parent->bot,
"%u big allocations totalling %u bytes.",
-
+ */
return 1;
}
#endif
@@ -1964,6 +1992,7 @@
timeq_add(now + opserv_conf.purge_lock_delay, opserv_part_channel, channel);
}
+/*
static void
opserv_channel_check(struct chanNode *newchan)
{
@@ -1979,9 +2008,10 @@
global_message(MESSAGE_RECIPIENT_OPERS, message);
}
- /* Wait until the join check to shut channels down. */
+ * Wait until the join check to shut channels down. *
newchan->bad_channel = opserv_bad_channel(newchan->name);
}
+*/
static void
opserv_channel_delete(struct chanNode *chan)
@@ -2712,19 +2742,21 @@
return alert;
}
+/*
static int
add_chan_warn(const char *key, void *data, UNUSED_ARG(void *extra))
{
struct record_data *rd = data;
char *reason = GET_RECORD_QSTRING(rd);
- /* i hope this can't happen */
+ * i hope this can't happen *
if (!reason)
reason = "No Reason";
dict_insert(opserv_chan_warn, strdup(key), strdup(reason));
return 0;
}
+*/
static int
add_user_alert(const char *key, void *data, UNUSED_ARG(void *extra))
@@ -2842,8 +2874,10 @@
dict_foreach(object, add_gag_helper, NULL);
if ((object = database_get_data(conf_db, KEY_ALERTS, RECDB_OBJECT)))
dict_foreach(object, add_user_alert, NULL);
+/*
if ((object = database_get_data(conf_db, KEY_WARN, RECDB_OBJECT)))
dict_foreach(object, add_chan_warn, NULL);
+*/
return 0;
}
@@ -2909,6 +2943,7 @@
saxdb_end_record(ctx);
}
/* channel warnings */
+ /*
if (dict_size(opserv_chan_warn)) {
saxdb_start_record(ctx, KEY_WARN, 0);
for (it = dict_first(opserv_chan_warn); it; it = iter_next(it)) {
@@ -2916,6 +2951,7 @@
}
saxdb_end_record(ctx);
}
+ */
/* alerts */
if (dict_size(opserv_user_alerts)) {
saxdb_start_record(ctx, KEY_ALERTS, 1);
@@ -3343,9 +3379,9 @@
{
struct discrim_and_source *das = extra;
if (match->handle_info) {
- send_message_type(4, das->source, opserv, "%-15s\002!\002%15s\002@\002%s %s", match->nick, match->ident, match->hostname, match->handle_info->handle);
+ send_message_type(4, das->source, opserv, "%-15s\002 \002%10s\002@\002%s (%s)", match->nick, match->ident, match->hostname, match->handle_info->handle);
} else {
- send_message_type(4, das->source, opserv, "%-15s\002!\002%15s\002@\002%s", match->nick, match->ident, match->hostname);
+ send_message_type(4, das->source, opserv, "%-15s\002 \002%10s\002@\002%s", match->nick, match->ident, match->hostname);
}
return 0;
}
@@ -3529,7 +3565,12 @@
return 0;
if (action == trace_print_func)
+ {
reply("OSMSG_USER_SEARCH_RESULTS");
+ reply("OSMSG_USER_SEARCH_BAR");
+ reply("OSMSG_USER_SEARCH_HEADER");
+ reply("OSMSG_USER_SEARCH_BAR");
+ }
else if (action == trace_count_func)
das.discrim->limit = INT_MAX;
else if ((action == trace_gline_func) && !das.discrim->duration)
@@ -3547,7 +3588,7 @@
dict_foreach(das.dict, opserv_show_hostinfo, &das);
if (matches)
- reply("MSG_MATCH_COUNT", matches);
+ reply("OSMSG_USER_SEARCH_COUNT", matches);
else
reply("MSG_NO_MATCHES");
@@ -4145,10 +4186,13 @@
opserv_trusted_hosts = dict_new();
dict_set_free_data(opserv_trusted_hosts, free_trusted_host);
/* set up opserv_chan_warn dict */
+
+/* alert trace notice channel #x replaces warnings
dict_delete(opserv_chan_warn);
opserv_chan_warn = dict_new();
dict_set_free_keys(opserv_chan_warn, free);
dict_set_free_data(opserv_chan_warn, free);
+*/
/* set up opserv_user_alerts */
dict_delete(opserv_channel_alerts);
opserv_channel_alerts = dict_new();
@@ -4172,7 +4216,7 @@
{
unsigned int nn;
- dict_delete(opserv_chan_warn);
+/* dict_delete(opserv_chan_warn); */
dict_delete(opserv_reserved_nick_dict);
free_string_list(opserv_bad_words);
dict_delete(opserv_exempt_channels);
@@ -4277,7 +4321,7 @@
opserv_define_func("STATS TRUSTED", cmd_stats_trusted, 0, 0, 0);
opserv_define_func("STATS UPLINK", cmd_stats_uplink, 0, 0, 0);
opserv_define_func("STATS UPTIME", cmd_stats_uptime, 0, 0, 0);
- opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0);
+/* opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0); */
#if defined(WITH_MALLOC_X3) || defined(WITH_MALLOC_SLAB)
opserv_define_func("STATS MEMORY", cmd_stats_memory, 0, 0, 0);
#endif
@@ -4294,9 +4338,9 @@
modcmd_register(opserv_module, "GTRACE UNGLINE", NULL, 0, 0, "template", "ungline", NULL);
opserv_define_func("UNJUPE", cmd_unjupe, 900, 0, 2);
opserv_define_func("UNRESERVE", cmd_unreserve, 800, 0, 2);
- opserv_define_func("UNWARN", cmd_unwarn, 800, 0, 0);
+/* opserv_define_func("UNWARN", cmd_unwarn, 800, 0, 0); */
opserv_define_func("VOICEALL", cmd_voiceall, 300, 2, 0);
- opserv_define_func("WARN", cmd_warn, 800, 0, 2);
+/* opserv_define_func("WARN", cmd_warn, 800, 0, 2); */
opserv_define_func("WHOIS", cmd_whois, 0, 0, 2);
opserv_reserved_nick_dict = dict_new();
@@ -4307,7 +4351,7 @@
reg_new_user_func(opserv_new_user_check);
reg_nick_change_func(opserv_alert_check_nick);
reg_del_user_func(opserv_user_cleanup);
- reg_new_channel_func(opserv_channel_check);
+/* reg_new_channel_func(opserv_channel_check); */
reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
Index: x3/src/opserv.help
diff -u x3/src/opserv.help:1.5 x3/src/opserv.help:1.6
--- x3/src/opserv.help:1.5 Sun Mar 6 19:51:24 2005
+++ x3/src/opserv.help Sat Mar 19 17:11:35 2005
@@ -52,9 +52,6 @@
" $bADDALERT$b Make $O automatically do something",
" when users match a criteria.",
" $bDELALERT$b Remove an alert.",
- " $bWARN$b Cause activity on a channel to warn",
- " $b$b ircops.",
- " $bUNWARN$b Remove a channel activity warning.",
" $bSTATS ALERT$b See a listing of alerts. ",
"=--------------- End of Help ----------------="
);
@@ -318,7 +315,7 @@
"ADDBAD" ("/msg $O ADDBAD <word>",
"Adds a bad word to $b$O's$b bad word list. Bad words make any channel that has a bad word anywhere in a channel's name illegal. A list of current bad words can be displayed by $bstats bad$b.",
"Access level: $b${level/addbad}$b",
- "$uSee Also:$u addexempt, delbad, stats"
+ "$uSee Also:$u addexempt, delbad, stats bad, $C:noregister"
);
"ADDEXEMPT" ("/msg $O ADDEXEMPT <#channel>",
@@ -332,7 +329,7 @@
"DELBAD" ("/msg $O DELBAD <keyword>",
"Deletes a bad word from $b$O's$b bad word list. Bad words make any channel that has a bad word anywhere in a channel's name illegal. A list of current bad words can be displayed by $bstats bad$b.",
"Access level: $b${level/delbad}$b",
- "$uSee Also:$u addbad, delexempt, stats"
+ "$uSee Also:$u addbad, delexempt, stats bad, $C:allowregister"
);
"DELEXEMPT" ("/msg $O DELEXEMPT <#channel>",
@@ -341,18 +338,6 @@
"$uSee Also:$u addexempt, delbad, stats"
);
-"UNWARN" ("/msg $O UNWARN <#channel>",
- "Deletes the activity warning for a channel.",
- "Access level: $b${level/unwarn}$b",
- "$uSee Also:$u warn, stats warn"
- );
-
-"WARN" ("/msg $O WARN <#channel> [reason]",
- "Adds an activity warning for the channel.",
- "Access level: $b${level/warn}$b",
- "$uSee Also:$u unwarn, stats warn"
- );
-
"BAN" ("/msg $O BAN <#channel> <nick|hostmask>",
"Bans the specified hostmask from the specified channel.",
"If a nick is used instead of hostmask, the hostmask is generated based on the nickname.",
@@ -621,9 +606,10 @@
);
"GAG" ("/msg $O GAG <mask> <duration> <reason>",
- "Sets a complete services-wide ignore on all users matching the provided mask. All services will completely ignore all private messages or notices from gagged users, who are only notified when a gag goes into effect, or they sign onto the network. Gags have no effect on opers, and as a safety feature, only affect the first 250 matching users. The gag will automatically expire after $b<duration>$b (or last forever if that is zero).",
+ "Sets a complete services-wide ignore on all users matching the provided mask. All services will completely ignore all private messages or notices from gagged users.",
+ "The gag will automatically expire after $b<duration>$b (or last forever if that is zero).",
"Access level: $b${level/gag}$b",
- "$uSee Also:$u ungag, trace"
+ "$uSee Also:$u ungag, trace, stats gags"
);
"HELPSERV" ("/msg $O HELPSERV <command>",
@@ -644,7 +630,7 @@
);
"UNGAG" ("/msg $O UNGAG <hostmask>",
- "Ungags a gaged hostmask and displays how many users were affected by $bungag$b. You can get a list of gaged hostmasks from $bgags$b.",
+ "Ungags a gaged hostmask.",
"Access level: $b${level/ungag}$b",
"$uSee Also:$u gag, stats gags"
);
@@ -685,7 +671,6 @@
"$bTIMEQ$b: The number of events in the timeq, and how long until the next one.",
"$bTRUSTED$b: The list of currently trusted IPs.",
"$bUPTIME$b: X3 uptime, lines processed, and CPU time.",
- "$bWARN$b: The list of channels with activity warnings.",
"$bMODULES$b: Shows loaded modules that implement commands.",
"$bSERVICES$b: Shows active service bots.",
"Access level: $b${level/stats}$b",
Index: x3/src/sendmail.c
diff -u x3/src/sendmail.c:1.2 x3/src/sendmail.c:1.3
--- x3/src/sendmail.c:1.2 Sat Mar 12 12:13:14 2005
+++ x3/src/sendmail.c Sat Mar 19 17:11:35 2005
@@ -34,7 +34,9 @@
{ "MAILMSG_EMAIL_BANNED", "Email to %s has been forbidden." },
{ "MAILMSG_EMAIL_NOT_BANNED", "Email to %s was not forbidden." },
{ "MAILMSG_EMAIL_UNBANNED", "Email to %s is now allowed." },
+ { "MAILMSG_PROHIBITED_EMAIL_HEADER", "$bBanned Email Address Masks$b" },
{ "MAILMSG_PROHIBITED_EMAIL", "%s: %s" },
+ { "MAILMSG_PROHIBITED_EMAIL_END", "-------End of Banned Address Masks------" },
{ "MAILMSG_NO_PROHIBITED_EMAIL", "All email addresses are accepted." },
{ NULL, NULL }
};
@@ -272,6 +274,8 @@
dict_iterator_t it;
int found = 0;
+ reply("MAILMSG_PROHIBITED_EMAIL_HEADER");
+ reply("MSG_BAR");
for (it=dict_first(prohibited_addrs); it; it=iter_next(it)) {
reply("MAILMSG_PROHIBITED_EMAIL", iter_key(it), (const char*)iter_data(it));
found = 1;
@@ -282,6 +286,8 @@
}
if (!found)
reply("MAILMSG_NO_PROHIBITED_EMAIL");
+ else
+ reply("MAILMSG_PROHIBITED_EMAIL_END");
return 0;
}
Index: x3/src/tools.c
diff -u x3/src/tools.c:1.10 x3/src/tools.c:1.11
--- x3/src/tools.c:1.10 Sat Mar 12 12:13:14 2005
+++ x3/src/tools.c Sat Mar 19 17:11:35 2005
@@ -767,13 +767,13 @@
if (words++ == 1) {
msg = language_find_message(lang, "MSG_AND");
- pos += sprintf(output + pos, " %s ", msg);
+ pos += sprintf(output + pos, "%s ", msg);
}
if (count == 1)
msg = language_find_message(lang, unit[type].msg_single);
else
msg = language_find_message(lang, unit[type].msg_plural);
- pos += sprintf(output + pos, "%d %s", count, msg);
+ pos += sprintf(output + pos, "%d%s", count, msg);
}
output[pos] = 0;
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-20 01:44:17
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-20 01:44:04 UTC
Modified files:
ChangeLog.X3 src/opserv.c
Log message:
Last patch caused a bug removing warn. fixed it here.
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.13 x3/ChangeLog.X3:1.14
--- x3/ChangeLog.X3:1.13 Sat Mar 19 17:11:34 2005
+++ x3/ChangeLog.X3 Sat Mar 19 17:43:54 2005
@@ -6,7 +6,7 @@
* chanserv.c: Changed style of command outputs, added userlevel back
to users list.
- * opserv.c: Changed style of command outputs
+ * opserv.c: Changed style of command outputs, removed warn feature
* tools.c: shortened duration string lengths
@@ -75,5 +75,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.13 $"
+#define CVS_VERSION "$Revision: 1.14 $"
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.15 x3/src/opserv.c:1.16
--- x3/src/opserv.c:1.15 Sat Mar 19 17:11:35 2005
+++ x3/src/opserv.c Sat Mar 19 17:43:54 2005
@@ -238,6 +238,7 @@
{ "OSMSG_SERVER_JUPED", "Added new jupe server %s." },
{ "OSMSG_SERVER_NOT_JUPE", "That server is not a juped server." },
{ "OSMSG_SERVER_UNJUPED", "Server jupe removed." },
+ /*
{ "OSMSG_WARN_ADDED", "Added channel activity warning for $b%s$b (%s)" },
{ "OSMSG_WARN_EXISTS", "Channel activity warning for $b%s$b already exists." },
{ "OSMSG_WARN_DELETED", "Removed channel activity warning for $b%s$b" },
@@ -245,6 +246,7 @@
{ "OSMSG_WARN_LISTSTART", "Channel activity warnings:" },
{ "OSMSG_WARN_LISTENTRY", "%s (%s)" },
{ "OSMSG_WARN_LISTEND", "End of activity warning list." },
+ */
{ "OSMSG_UPLINK_CONNECTING", "Establishing connection with %s (%s:%d)." },
{ "OSMSG_CURRENT_UPLINK", "$b%s$b is already the current uplink." },
{ "OSMSG_INVALID_UPLINK", "$b%s$b is not a valid uplink name." },
@@ -1992,26 +1994,26 @@
timeq_add(now + opserv_conf.purge_lock_delay, opserv_part_channel, channel);
}
-/*
static void
opserv_channel_check(struct chanNode *newchan)
{
- char *warning;
+ /*char *warning; */
if (!newchan->join_policer.params) {
newchan->join_policer.last_req = now;
newchan->join_policer.params = opserv_conf.join_policer_params;
}
+ /*
if ((warning = dict_find(opserv_chan_warn, newchan->name, NULL))) {
char message[MAXLEN];
snprintf(message, sizeof(message), "Channel activity warning for channel %s: %s", newchan->name, warning);
global_message(MESSAGE_RECIPIENT_OPERS, message);
}
+ */
- * Wait until the join check to shut channels down. *
+ /* Wait until the join check to shut channels down. */
newchan->bad_channel = opserv_bad_channel(newchan->name);
}
-*/
static void
opserv_channel_delete(struct chanNode *chan)
@@ -4351,7 +4353,7 @@
reg_new_user_func(opserv_new_user_check);
reg_nick_change_func(opserv_alert_check_nick);
reg_del_user_func(opserv_user_cleanup);
-/* reg_new_channel_func(opserv_channel_check); */
+ reg_new_channel_func(opserv_channel_check);
reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-23 05:48:46
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-23 05:48:21 UTC
Modified files:
ChangeLog.X3 x3.conf.example
Log message:
added sethost stuff to example config
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.14 x3/ChangeLog.X3:1.15
--- x3/ChangeLog.X3:1.14 Sat Mar 19 17:43:54 2005
+++ x3/ChangeLog.X3 Tue Mar 22 21:48:11 2005
@@ -1,6 +1,10 @@
/***********************************************************************
X3 ChangeLog
+2005-03-22 Alex Schumann <ru...@af...>
+
+ * x3.conf.example: added sethost/fakehost settings to conf
+
2005-03-19 Alex Schumann <ru...@af...>
* chanserv.c: Changed style of command outputs, added userlevel back
@@ -75,5 +79,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.14 $"
+#define CVS_VERSION "$Revision: 1.15 $"
Index: x3/x3.conf.example
diff -u x3/x3.conf.example:1.1 x3/x3.conf.example:1.2
--- x3/x3.conf.example:1.1 Sun Mar 6 19:51:23 2005
+++ x3/x3.conf.example Tue Mar 22 21:48:11 2005
@@ -133,6 +133,10 @@
"email_search_level" "600"; // minimum OpServ level to search based on email address
"email_visible_level" "800"; // minimum OpServ level to see somebody's email address
"sync_log" "1"; // Output password and email changes, plus registration to sync.log
+ "set_title_level" "900"; // min opserv level to set a title on an account
+ "set_fakehost_level" "1000"; //min opserv level to set a freeform fakehost
+ "titlehost_suffix" "AfterNET.Org"; // suffix to use with automatically generated fakehosts
+
};
"opserv" {
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-30 20:47:10
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-30 20:46:43 UTC
Modified files:
ChangeLog.X3 src/chanserv.c
Log message:
Fixed unban
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.15 x3/ChangeLog.X3:1.16
--- x3/ChangeLog.X3:1.15 Tue Mar 22 21:48:11 2005
+++ x3/ChangeLog.X3 Wed Mar 30 12:46:28 2005
@@ -1,6 +1,10 @@
/***********************************************************************
X3 ChangeLog
+2005-03-30 Alex Schumann <ru...@af...>
+
+ * src/chanserv.c: Fixed unban.
+
2005-03-22 Alex Schumann <ru...@af...>
* x3.conf.example: added sethost/fakehost settings to conf
@@ -79,5 +83,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.15 $"
+#define CVS_VERSION "$Revision: 1.16 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.20 x3/src/chanserv.c:1.21
--- x3/src/chanserv.c:1.20 Sat Mar 19 17:11:34 2005
+++ x3/src/chanserv.c Wed Mar 30 12:46:32 2005
@@ -3192,9 +3192,9 @@
{
unsigned int ii;
+ modcmd_chanmode_announce(change);
for(ii = 0; ii < change->argc; ++ii)
free((char*)change->args[ii].u.hostmask);
- modcmd_chanmode_announce(change);
mod_chanmode_free(change);
acted = 1;
}
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-03-31 01:01:16
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-03-31 01:00:49 UTC
Modified files:
ChangeLog.X3 x3.conf.example
Log message:
Example config note added about snoop seg
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.16 x3/ChangeLog.X3:1.17
--- x3/ChangeLog.X3:1.16 Wed Mar 30 12:46:28 2005
+++ x3/ChangeLog.X3 Wed Mar 30 17:00:36 2005
@@ -5,6 +5,9 @@
* src/chanserv.c: Fixed unban.
+ * x3.conf.example: added note in snoop config that improper
+ setting for bots nick will cause segfault.
+
2005-03-22 Alex Schumann <ru...@af...>
* x3.conf.example: added sethost/fakehost settings to conf
@@ -83,5 +86,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.16 $"
+#define CVS_VERSION "$Revision: 1.17 $"
Index: x3/x3.conf.example
diff -u x3/x3.conf.example:1.2 x3/x3.conf.example:1.3
--- x3/x3.conf.example:1.2 Tue Mar 22 21:48:11 2005
+++ x3/x3.conf.example Wed Mar 30 17:00:37 2005
@@ -285,7 +285,7 @@
"snoop" {
// Where to send snoop messages?
"channel" "#wherever";
- // Which bot?
+ // Which bot? If this is not set to your bots nick, X3 will Segfault...
"bot" "OpServ";
// Show new users and joins from net joins? (off by default)
"show_bursts" "0";
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2005-04-04 05:32:04
|
Committer : Neil Spierling <sir...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-04 05:31:53 UTC
Modified files:
ChangeLog.X3 src/proto-p10.c
Log message:
reinstate +d
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.17 x3/ChangeLog.X3:1.18
--- x3/ChangeLog.X3:1.17 Wed Mar 30 17:00:36 2005
+++ x3/ChangeLog.X3 Sun Apr 3 22:31:42 2005
@@ -1,6 +1,10 @@
/***********************************************************************
X3 ChangeLog
+2005-04-04 Neil Spierling <sir...@gm...>
+
+ * src/proto-p10.c: Reinstated +d usermode.
+
2005-03-30 Alex Schumann <ru...@af...>
* src/chanserv.c: Fixed unban.
@@ -86,5 +90,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.17 $"
+#define CVS_VERSION "$Revision: 1.18 $"
Index: x3/src/proto-p10.c
diff -u x3/src/proto-p10.c:1.12 x3/src/proto-p10.c:1.13
--- x3/src/proto-p10.c:1.12 Sat Mar 12 12:13:14 2005
+++ x3/src/proto-p10.c Sun Apr 3 22:31:43 2005
@@ -1951,7 +1951,7 @@
if (!hostname)
hostname = self->name;
make_numeric(self, local_num, numeric);
- return AddUser(self, nick, nick, hostname, modes ? modes : "+oik", numeric, desc, now, "AAAAAA");
+ return AddUser(self, nick, nick, hostname, modes ? modes : "+doik", numeric, desc, now, "AAAAAA");
}
struct userNode *
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-04-15 21:27:45
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-15 21:27:31 UTC
Modified files:
ChangeLog.X3 src/nickserv.c src/nickserv.help src/proto-common.c
Log message:
Author:
Log message:
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.18 x3/ChangeLog.X3:1.19
--- x3/ChangeLog.X3:1.18 Sun Apr 3 22:31:42 2005
+++ x3/ChangeLog.X3 Fri Apr 15 14:27:21 2005
@@ -1,6 +1,17 @@
/***********************************************************************
X3 ChangeLog
+2005-04-15 Alex Schumann <ru...@af...>
+
+ * src/proto-common.c: Temp fix for x3 not seeing -hv modes being set
+ at the same time. The whole block needs to be if/else instead of
+ switch though, to be cleaner.
+
+ * src/nickserv.help: added fakehost and title options to help oset.
+
+ * src/nickserv.c: removed 'style' setting. (was not being used in
+ code anyway)
+
2005-04-04 Neil Spierling <sir...@gm...>
* src/proto-p10.c: Reinstated +d usermode.
@@ -90,5 +101,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.18 $"
+#define CVS_VERSION "$Revision: 1.19 $"
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.20 x3/src/nickserv.c:1.21
--- x3/src/nickserv.c:1.20 Sat Mar 19 17:11:35 2005
+++ x3/src/nickserv.c Fri Apr 15 14:27:21 2005
@@ -134,7 +134,7 @@
{ "NSMSG_HANDLE_TOLONG", "The account name %s is too long. Account names must be %lu charactors or less."},
{ "NSMSG_PASSWORD_SHORT", "Your password must be at least %lu characters long." },
{ "NSMSG_PASSWORD_ACCOUNT", "Your password may not be the same as your account name." },
- { "NSMSG_PASSWORD_DICTIONARY", "Your password should not be the word \"password\", or any other dictionary word." },
+ { "NSMSG_PASSWORD_DICTIONARY", "Your password is too simple. You must choose a password that is not just a word or name." },
{ "NSMSG_PASSWORD_READABLE", "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)." },
{ "NSMSG_PARTIAL_REGISTER", "Account has been registered to you; nick was already registered to someone else." },
{ "NSMSG_OREGISTER_VICTIM", "%s has registered a new account for you (named %s)." },
@@ -274,7 +274,9 @@
{ "NSMSG_RECLAIMED_SVSNICK", "Forcibly changed %s's nick." },
{ "NSMSG_RECLAIMED_KILL", "Disconnected %s from the network." },
{ "NSMSG_CLONE_AUTH", "Warning: %s (%s@%s) authed to your account." },
- { "NSMSG_SETTING_LIST", "$b$N account settings:$b" },
+ { "NSMSG_SETTING_LIST", "$b$N account settings$b" },
+ { "NSMSG_SETTING_LIST_HEADER", "----------------------------------------" },
+ { "NSMSG_SETTING_LIST_END", "-------------End Of Settings------------" },
{ "NSMSG_INVALID_OPTION", "$b%s$b is an invalid account setting." },
{ "NSMSG_INVALID_ANNOUNCE", "$b%s$b is an invalid announcements value." },
{ "NSMSG_SET_INFO", "$bINFO: $b%s" },
@@ -2283,16 +2285,18 @@
option_func_t *opt;
unsigned int i;
char *set_display[] = {
- "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE",
+ "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", /* "STYLE", */
"EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE"
};
send_message(user, nickserv, "NSMSG_SETTING_LIST");
+ send_message(user, nickserv, "NSMSG_SETTING_LIST_HEADER");
/* Do this so options are presented in a consistent order. */
for (i = 0; i < ArrayLength(set_display); ++i)
if ((opt = dict_find(nickserv_opt_dict, set_display[i], NULL)))
opt(user, hi, override, 0, NULL);
+ send_message(user, nickserv, "NSMSG_SETTING_LIST_END");
}
static NICKSERV_FUNC(cmd_set)
@@ -2414,6 +2418,7 @@
return 1;
}
+/*
static OPTION_FUNC(opt_style)
{
char *style;
@@ -2437,6 +2442,7 @@
send_message(user, nickserv, "NSMSG_SET_STYLE", style);
return 1;
}
+*/
static OPTION_FUNC(opt_announcements)
{
@@ -4028,7 +4034,7 @@
dict_insert(nickserv_opt_dict, "TABLEWIDTH", opt_tablewidth);
dict_insert(nickserv_opt_dict, "COLOR", opt_color);
dict_insert(nickserv_opt_dict, "PRIVMSG", opt_privmsg);
- dict_insert(nickserv_opt_dict, "STYLE", opt_style);
+/* dict_insert(nickserv_opt_dict, "STYLE", opt_style); */
dict_insert(nickserv_opt_dict, "PASS", opt_password);
dict_insert(nickserv_opt_dict, "PASSWORD", opt_password);
dict_insert(nickserv_opt_dict, "FLAGS", opt_flags);
Index: x3/src/nickserv.help
diff -u x3/src/nickserv.help:1.7 x3/src/nickserv.help:1.8
--- x3/src/nickserv.help:1.7 Tue Mar 15 15:31:01 2005
+++ x3/src/nickserv.help Fri Apr 15 14:27:21 2005
@@ -376,28 +376,19 @@
"$uSee Also:$u oregnick, ounregister, ounregnick"
);
};
-"OSET" {
- "/services/nickserv/disable_nicks" (
- "/msg $N OSET <nick|*account> [<setting> <value>]",
- "Changes an account's settings for X3. In addition to the normal $bset$b settings, you may set:",
- "$bPASSWORD$b: Sets user's password.",
- "$bFLAGS$b: Changes account flags for user.",
- "$bLEVEL$b: Sets $O access level.",
- "$bEPITHET$b: The description $C shows for the user's access.",
- "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
- "$uSee Also:$u accountinfo, account flags, set, userinfo"
- );
- "!/services/nickserv/disable_nicks" (
- "/msg $N OSET <nick|*account> [<setting> <value>]",
- "Changes an account's settings for X3. In addition to the normal $bset$b settings, you may set:",
- "$bPASSWORD$b: Sets user's password.",
- "$bFLAGS$b: Changes account flags for user.",
- "$bLEVEL$b: Sets $O access level.",
- "$bEPITHET$b: The description $C shows for the user's access.",
- "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
- "$uSee Also:$u accountinfo, account flags, nickinfo, set, userinfo"
- );
-};
+"OSET" (
+ "/msg $N OSET <nick|*account> [<setting> <value>]",
+ "Allows opers/helpers to change a users account settings. You may set:",
+ "$bPASSWORD$b: Sets user's password.",
+ "$bFLAGS$b: Changes account flags (SphHdscfn) for user (see $uaccount flags$u).",
+ "$bLEVEL$b: Sets $O access level.",
+ "$bEPITHET$b: The description $C shows for the user's access.",
+ "$bTITLE$b: The title the user will get (in there hostname) when +x.",
+ "$bFAKEHOST$b: The fake hostname the user will get when +x.",
+ "..or anything $bset$b can change.",
+ "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
+ "$uSee Also:$u accountinfo, account flags, set, userinfo"
+);
"ODELCOOKIE" {
"/services/nickserv/email_enabled" (
Index: x3/src/proto-common.c
diff -u x3/src/proto-common.c:1.10 x3/src/proto-common.c:1.11
--- x3/src/proto-common.c:1.10 Sat Mar 12 18:51:11 2005
+++ x3/src/proto-common.c Fri Apr 15 14:27:21 2005
@@ -626,13 +626,23 @@
break;
}
break;
+ /* XXX Hack: this is the stupedest use of switch iv ever seen.
+ * you have to compare for EVERY POSSIBLE COMBINATION of bitmask
+ * because switch does only full comparison. This needs redone as if/else.
+ **/
case MODE_CHANOP:
case MODE_HALFOP:
case MODE_VOICE:
+ case MODE_VOICE|MODE_CHANOP:
+ case MODE_VOICE|MODE_HALFOP:
+ case MODE_CHANOP|MODE_HALFOP:
case MODE_VOICE|MODE_CHANOP|MODE_HALFOP:
case MODE_REMOVE|MODE_CHANOP:
case MODE_REMOVE|MODE_HALFOP:
case MODE_REMOVE|MODE_VOICE:
+ case MODE_REMOVE|MODE_VOICE|MODE_CHANOP:
+ case MODE_REMOVE|MODE_VOICE|MODE_HALFOP:
+ case MODE_REMOVE|MODE_CHANOP|MODE_HALFOP:
case MODE_REMOVE|MODE_VOICE|MODE_CHANOP|MODE_HALFOP:
if (change->args[ii].mode & MODE_REMOVE)
change->args[ii].u.member->modes &= ~change->args[ii].mode;
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-04-20 14:40:06
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-20 14:39:58 UTC
Modified files:
ChangeLog.X3 src/chanserv.help src/helpfile.c src/modcmd.c
src/nickserv.c src/nickserv.help src/proto-p10.c
Log message:
see changelog
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.19 x3/ChangeLog.X3:1.20
--- x3/ChangeLog.X3:1.19 Fri Apr 15 14:27:21 2005
+++ x3/ChangeLog.X3 Wed Apr 20 07:39:47 2005
@@ -1,6 +1,18 @@
/***********************************************************************
X3 ChangeLog
+2005-04-20 Alex Schumann <ru...@af...>
+
+ * src/proto-common.c: removing +d. needs to be a config option
+ or something.
+
+ * src/nickserv.help: modified main help reply of authserv
+
+ * src/nickserv.c: added title, epithet, and fakehost to oset listing
+
+ * src/modcmd.c: fixed up auto-help & alias command handling. Needs
+ totally redesigned though.
+
2005-04-15 Alex Schumann <ru...@af...>
* src/proto-common.c: Temp fix for x3 not seeing -hv modes being set
@@ -101,5 +113,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.19 $"
+#define CVS_VERSION "$Revision: 1.20 $"
Index: x3/src/chanserv.help
diff -u x3/src/chanserv.help:1.8 x3/src/chanserv.help:1.9
--- x3/src/chanserv.help:1.8 Sat Mar 19 17:11:35 2005
+++ x3/src/chanserv.help Wed Apr 20 07:39:48 2005
@@ -551,7 +551,8 @@
"NOTE: The NoAutoOp setting is equivalent to the !togop command in previous versions of X3.",
"$uSee Also:$u set");
"USET INFO" ("/msg $C USET <#channel> INFO <info>",
- "This command will set a user defined information message to be displayed when you join the channel. By setting the message to '*', you will clear your message.",
+ "This command will set a user defined information message to be displayed when you join the channel. Set to '*' to clear the message.",
+ "Note: to keep from being annoying, your info message only shows when you have been offline for more than a few minutes.",
"$uSee Also:$u access");
"USERS" ("/msg $C USERS <#channel> [mask]",
"Displays the userlist for the specified channel. If a mask is supplied, only users matching the mask will be shown.",
Index: x3/src/helpfile.c
diff -u x3/src/helpfile.c:1.7 x3/src/helpfile.c:1.8
--- x3/src/helpfile.c:1.7 Sat Mar 19 17:11:35 2005
+++ x3/src/helpfile.c Wed Apr 20 07:39:48 2005
@@ -801,9 +801,9 @@
}
rec = dict_find(hf->db, "<missing>", NULL);
if (!rec)
- return send_message(dest, src, "MSG_TOPIC_UNKNOWN");
+ return 0; /* send_message(dest, src, "MSG_TOPIC_UNKNOWN"); */
if (rec->type != RECDB_QSTRING)
- return send_message(dest, src, "HFMSG_HELP_NOT_STRING");
+ return 0; /* send_message(dest, src, "HFMSG_HELP_NOT_STRING"); */
return _send_help(dest, src, hf->expand, rec->d.qstring);
}
Index: x3/src/modcmd.c
diff -u x3/src/modcmd.c:1.12 x3/src/modcmd.c:1.13
--- x3/src/modcmd.c:1.12 Thu Mar 17 22:19:43 2005
+++ x3/src/modcmd.c Wed Apr 20 07:39:48 2005
@@ -55,6 +55,7 @@
{ "MCMSG_NO_CHANNEL_BEFORE", "You may not give a channel name before this command." },
{ "MCMSG_NO_PLUS_CHANNEL", "You may not use a +channel with this command." },
{ "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" },
+/* { "MCMSG_HELP_COMMAND_ALIAS_FOR", "$bALIAS FOR:$b %s" },*/
{ "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" },
{ "MCMSG_COMMAND_BINDING", "%s is a binding of: %s" },
{ "MCMSG_ALIAS_ERROR", "Error in alias expansion for %s; check the error log for details." },
@@ -773,7 +774,11 @@
* return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
* TODO: We actually DO want to show the parent IF there is no other help.
*/
- r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name);
+ r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name);
+ if(cmd->command->name)
+ {
+ send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name);
+ }
/* If it's an alias, show what it's an alias for. */
if (cmd->alias.used) {
@@ -800,7 +805,20 @@
* return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
* TODO: We actually DO want to show the parent IF there is no other help.
*/
+ /* If it's an alias, show what it's an alias for. */
+ if (cmd->alias.used) {
+ char alias_text[MAXLEN];
+ unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text);
+ send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name);
+ }
r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->name);
+ if(!r) {
+ if(cmd->command->name)
+ {
+ send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name);
+ r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->command->name);
+ }
+ }
return r;
}
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.21 x3/src/nickserv.c:1.22
--- x3/src/nickserv.c:1.21 Fri Apr 15 14:27:21 2005
+++ x3/src/nickserv.c Wed Apr 20 07:39:48 2005
@@ -110,7 +110,7 @@
#define NICKSERV_MIN_PARMS(N) do { \
if (argc < N) { \
reply("MSG_MISSING_PARAMS", argv[0]); \
- svccmd_send_help(user, nickserv, cmd); \
+ svccmd_send_help_brief(user, nickserv, cmd); \
return 0; \
} } while (0)
@@ -2286,7 +2286,8 @@
unsigned int i;
char *set_display[] = {
"INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", /* "STYLE", */
- "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE"
+ "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE",
+ "FAKEHOST", "TITLE", "EPITHET"
};
send_message(user, nickserv, "NSMSG_SETTING_LIST");
@@ -2609,13 +2610,15 @@
static OPTION_FUNC(opt_epithet)
{
- if (!override) {
- send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
- return 0;
- }
-
if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_epithet_level, 0)) {
- char *epithet = unsplit_string(argv+1, argc-1, NULL);
+ char *epithet;
+ if (!override) {
+ send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
+ return 0;
+ }
+
+ epithet = unsplit_string(argv+1, argc-1, NULL);
+
if (hi->epithet)
free(hi->epithet);
if ((epithet[0] == '*') && !epithet[1])
@@ -2635,12 +2638,12 @@
{
const char *title;
- if (!override) {
- send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
- return 0;
- }
-
if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_title_level, 0)) {
+ if (!override) {
+ send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
+ return 0;
+ }
+
title = argv[1];
if (strchr(title, '.')) {
send_message(user, nickserv, "NSMSG_TITLE_INVALID");
@@ -2675,12 +2678,12 @@
{
const char *fake;
- if (!override) {
- send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
- return 0;
- }
-
if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_fakehost_level, 0)) {
+ if (!override) {
+ send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
+ return 0;
+ }
+
fake = argv[1];
if ((strlen(fake) > HOSTLEN) || (fake[0] == '.')) {
send_message(user, nickserv, "NSMSG_FAKEHOST_INVALID", HOSTLEN);
Index: x3/src/nickserv.help
diff -u x3/src/nickserv.help:1.8 x3/src/nickserv.help:1.9
--- x3/src/nickserv.help:1.8 Fri Apr 15 14:27:21 2005
+++ x3/src/nickserv.help Wed Apr 20 07:39:48 2005
@@ -2,18 +2,20 @@
"/services/nickserv/disable_nicks" {
"/services/nickserv/email_enabled" (
"=------------ $b$N Help$b -----------=",
- " $b$N$b is an authentication service, ",
- " intended to serve as a central ",
- " authentication point for all other ",
- " network services. $b$C$b, $b$O$b, and ",
- " $b$G$b all depend on ",
- " $b$N$b to verify that users are valid.",
+ " $b$N$b is an authentication service,",
+ " providing login identification for",
+ " the network. $N is how you 'log in'",
+ " to get access in channels registered",
+ " with $C, and its how ircops are known",
+ " to $O and $G.",
" $b$b",
" $b$N$b help categories:",
" $bACCOUNT$b Account management.",
- " $bEMAIL$b Email maintenance commands.",
- " $bINFORMATION$b Other functions.",
- " $bOPER$b $N commands for IRC Operators.",
+ " $bEMAIL$b Email based commands",
+ " such as recovering forgotten",
+ " passwords.",
+ " $bINFORMATION$b Informational functions.",
+ " $bOPER$b Commands for IRC Operators.",
"$b$b",
" $b$N is $uNOT$u a NickServ$b! ",
" see $b/msg $N HELP NOT NICKSERV$b ",
@@ -22,17 +24,17 @@
);
"!/services/nickserv/email_enabled" (
"=------------ $b$N Help$b -----------=",
- " $b$N$b is an authentication service, ",
- " intended to serve as a central ",
- " authentication point for all other ",
- " network services. $b$C$b, $b$O$b, and ",
- " $b$G$b all depend on ",
- " $b$N$b to verify that users are valid.",
+ " $b$N$b is an authentication service,",
+ " providing login identification for",
+ " the network. $N is how you 'log in'",
+ " to get access in channels registered",
+ " with $C, and its how ircops are known",
+ " to $O and $G.",
" $b$b",
" $b$N$b help categories:",
" $bACCOUNT$b Account management.",
- " $bINFORMATION$b Other functions.",
- " $bOPER$b $N commands for IRC Operators.",
+ " $bINFORMATION$b Informational functions.",
+ " $bOPER$b Commands for IRC Operators.",
"$b$b",
" $b$N is $uNOT$u a NickServ$b! ",
" see $b/msg $N HELP NOT NICKSERV$b ",
@@ -122,7 +124,7 @@
"NOT NICKSERV" {
"/services/nickserv/disable_nicks" (
"=------------ $bNOT NICKSERV$b ------------=",
- " $N is $unot$u a NickServ. On AfterNET, ",
+ " $N is $unot$u a NickServ. On this network, ",
" nicknames are not owned. $N allows ",
" you to register a single account to ",
" log in to all channels, seperate from ",
@@ -382,7 +384,7 @@
"$bPASSWORD$b: Sets user's password.",
"$bFLAGS$b: Changes account flags (SphHdscfn) for user (see $uaccount flags$u).",
"$bLEVEL$b: Sets $O access level.",
- "$bEPITHET$b: The description $C shows for the user's access.",
+ "$bEPITHET$b: The description shown for the user's access in /whois.",
"$bTITLE$b: The title the user will get (in there hostname) when +x.",
"$bFAKEHOST$b: The fake hostname the user will get when +x.",
"..or anything $bset$b can change.",
Index: x3/src/proto-p10.c
diff -u x3/src/proto-p10.c:1.13 x3/src/proto-p10.c:1.14
--- x3/src/proto-p10.c:1.13 Sun Apr 3 22:31:43 2005
+++ x3/src/proto-p10.c Wed Apr 20 07:39:48 2005
@@ -1951,7 +1951,8 @@
if (!hostname)
hostname = self->name;
make_numeric(self, local_num, numeric);
- return AddUser(self, nick, nick, hostname, modes ? modes : "+doik", numeric, desc, now, "AAAAAA");
+ /* TODO: Make these modes part of the conf file */
+ return AddUser(self, nick, nick, hostname, modes ? modes : "+oik", numeric, desc, now, "AAAAAA");
}
struct userNode *
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-04-23 06:41:04
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-23 06:40:54 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/chanserv.h src/chanserv.help
Log message:
Author:
Log message:
topicmask & oplevel
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.20 x3/ChangeLog.X3:1.21
--- x3/ChangeLog.X3:1.20 Wed Apr 20 07:39:47 2005
+++ x3/ChangeLog.X3 Fri Apr 22 23:40:43 2005
@@ -1,6 +1,15 @@
/***********************************************************************
X3 ChangeLog
+2005-04-23 Alex Schumann <ru...@af...>
+ * src/chanserv.c: removed settings: oplevel, halfoplevel, and
+ voicelevel, hard coding them to OP, HALFOP, and PEON. Changed
+ topicmask to be an on or off setting, uninfluenced by enftopic.
+ Added feature to use mask on /topic in addition to ,topic sets.
+
+ * src/chanserv.help: updated documentation to reflect the new and
+ much simpler topicmask feature, and removed op/voice levels.
+
2005-04-20 Alex Schumann <ru...@af...>
* src/proto-common.c: removing +d. needs to be a config option
@@ -113,5 +122,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.20 $"
+#define CVS_VERSION "$Revision: 1.21 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.21 x3/src/chanserv.c:1.22
--- x3/src/chanserv.c:1.21 Wed Mar 30 12:46:32 2005
+++ x3/src/chanserv.c Fri Apr 22 23:40:44 2005
@@ -242,9 +242,11 @@
{ "CSMSG_CONFIRM_DEFAULTS", "To reset %s's settings to the defaults, you must use 'set defaults %s'." },
{ "CSMSG_SETTINGS_DEFAULTED", "All settings for %s have been reset to default values." },
{ "CSMSG_BAD_SETLEVEL", "You cannot change any setting to above your level." },
+ /*
{ "CSMSG_BAD_GIVEVOICE", "You cannot change GiveVoice to above GiveHalfOps (%d)." },
{ "CSMSG_BAD_GIVEHOPS", "You cannot change GiveHalfOps to below GiveOps (%d)." },
{ "CSMSG_BAD_GIVEOPS", "You cannot change GiveOps to below GiveVoice (%d)." },
+ */
{ "CSMSG_BAD_SETTERS", "You cannot change Setters to above your level." },
{ "CSMSG_INVALID_MODE_LOCK", "$b%s$b is an invalid mode lock." },
{ "CSMSG_INVALID_NUMERIC", "$b%d$b is not a valid choice. Choose one:" },
@@ -257,13 +259,17 @@
{ "CSMSG_SET_DYNLIMIT", "$bDynLimit $b %s" },
{ "CSMSG_SET_OFFCHANNEL", "$bOffChannel $b %s" },
{ "CSMSG_SET_USERINFO", "$bUserInfo $b %d" },
+ /*
{ "CSMSG_SET_GIVE_VOICE", "$bGiveVoice $b %d" },
{ "CSMSG_SET_GIVE_HALFOPS", "$bGiveHalfOps $b %d" },
+ */
{ "CSMSG_SET_TOPICSNARF", "$bTopicSnarf $b %d" },
{ "CSMSG_SET_INVITEME", "$bInviteMe $b %d" },
{ "CSMSG_SET_ENFOPS", "$bEnfOps $b %d" },
{ "CSMSG_SET_ENFHALFOPS", "$bEnfHalfOps $b %d" },
+ /*
{ "CSMSG_SET_GIVE_OPS", "$bGiveOps $b %d" },
+ */
{ "CSMSG_SET_ENFMODES", "$bEnfModes $b %d" },
{ "CSMSG_SET_ENFTOPIC", "$bEnfTopic $b %d" },
{ "CSMSG_SET_PUBCMD", "$bPubCmd $b %d" },
@@ -1464,7 +1470,7 @@
struct userData *cs_victim;
if((!(cs_victim = GetChannelUser(cData, victim->handle_info))
- || (cs_victim->access < cData->lvlOpts[lvlGiveOps]))
+ || (cs_victim->access < UL_OP /* cData->lvlOpts[lvlGiveOps]*/))
&& !check_user_level(channel, user, lvlEnfOps, 0, 0))
{
send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
@@ -1481,7 +1487,7 @@
struct userData *cs_victim;
if((!(cs_victim = GetChannelUser(cData, victim->handle_info))
- || (cs_victim->access < cData->lvlOpts[lvlGiveHalfOps]))
+ || (cs_victim->access < UL_HALFOP /* cData->lvlOpts[lvlGiveHalfOps] */))
&& !check_user_level(channel, user, lvlEnfHalfOps, 0, 0))
{
send_message(user, chanserv, "CSMSG_HOPBY_LOCKED");
@@ -2620,17 +2626,17 @@
reply("CSMSG_GODMODE_UP", argv[0]);
return 0;
}
- else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveOps])
+ else if(uData->access >= UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
{
change.args[0].mode = MODE_CHANOP;
errmsg = "CSMSG_ALREADY_OPPED";
}
- else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveHalfOps])
+ else if(uData->access >= UL_HALFOP /*channel->channel_info->lvlOpts[lvlGiveHalfOps]*/)
{
change.args[0].mode = MODE_HALFOP;
errmsg = "CSMSG_ALREADY_HALFOPPED";
}
- else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveVoice])
+ else if(uData->access >= UL_PEON /* channel->channel_info->lvlOpts[lvlGiveVoice]*/)
{
change.args[0].mode = MODE_VOICE;
errmsg = "CSMSG_ALREADY_VOICED";
@@ -3342,11 +3348,11 @@
string_buffer_append(&sbuf, 's');
if(IsUserAutoOp(uData))
{
- if(uData->access >= cData->lvlOpts[lvlGiveOps])
+ if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/)
string_buffer_append(&sbuf, 'o');
- else if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+ else if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
string_buffer_append(&sbuf, 'h');
- else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
+ else if(uData->access >= UL_PEON /*cData->lvlOpts[lvlGiveVoice]*/)
string_buffer_append(&sbuf, 'v');
}
if(IsUserAutoInvite(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe]))
@@ -3783,20 +3789,71 @@
return 1;
}
+/* bad_topic
+ *
+ * return + if the user does NOT have the right to set the topic, and
+ * the topic is changed.
+ */
static int
bad_topic(struct chanNode *channel, struct userNode *user, const char *new_topic)
{
struct chanData *cData = channel->channel_info;
if(check_user_level(channel, user, lvlEnfTopic, 1, 0))
return 0;
- if(cData->topic_mask)
- return !match_ircglob(new_topic, cData->topic_mask);
else if(cData->topic)
return irccasecmp(new_topic, cData->topic);
else
return 0;
}
+/* conform_topic
+ *
+ * Makes a givin topic fit into a givin topic mask and returns
+ * the results.
+ *
+ * topic_mask - the mask to conform to
+ * topic - the topic to make conform
+ * new_topic - the pre-allocated char* to put the new topic into
+ *
+ * modifies: new_topic
+ */
+void
+conform_topic(char* topic_mask, char* topic, char *new_topic)
+{
+ //char *topic_mask = cData->topic_mask;
+ char tchar;
+ int pos=0, starpos=-1, dpos=0, len;
+
+ while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
+ {
+ switch(tchar)
+ {
+ case '*':
+ if(starpos != -1)
+ {
+ strcpy(new_topic, "");
+ return;
+ }
+ len = strlen(topic);
+ if((dpos + len) > TOPICLEN)
+ len = TOPICLEN + 1 - dpos;
+ memcpy(new_topic+dpos, topic, len);
+ dpos += len;
+ starpos = pos;
+ break;
+ case '\\': tchar = topic_mask[pos++]; /* and fall through */
+ default: new_topic[dpos++] = tchar; break;
+ }
+ }
+ if((dpos > TOPICLEN) || tchar)
+ {
+ strcpy(new_topic, "");
+ return;
+ }
+ new_topic[dpos] = 0;
+ return;
+}
+
static CHANSERV_FUNC(cmd_topic)
{
struct chanData *cData;
@@ -3805,12 +3862,12 @@
cData = channel->channel_info;
if(argc < 2)
{
- if(cData->topic)
- {
- SetChannelTopic(channel, chanserv, cData->topic, 1);
- reply("CSMSG_TOPIC_SET", cData->topic);
+ if(cData->topic)
+ {
+ SetChannelTopic(channel, chanserv, cData->topic, 1);
+ reply("CSMSG_TOPIC_SET", cData->topic);
return 1;
- }
+ }
reply("CSMSG_NO_TOPIC", channel->name);
return 0;
@@ -3820,48 +3877,34 @@
/* If they say "!topic *", use an empty topic. */
if((topic[0] == '*') && (topic[1] == 0))
topic[0] = 0;
+
if(bad_topic(channel, user, topic))
{
- char *topic_mask = cData->topic_mask;
- if(topic_mask)
+ reply("CSMSG_TOPIC_LOCKED", channel->name);
+ return 0;
+ }
+ else
+ {
+ /* If there is a topicmask set, and the new topic doesnt match, make it */
+ if(cData->topic_mask && !match_ircglob(topic, cData->topic_mask))
{
- char new_topic[TOPICLEN+1], tchar;
- int pos=0, starpos=-1, dpos=0, len;
+ char *topic_mask = cData->topic_mask;
+ char new_topic[TOPICLEN+1];
- while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
- {
- switch(tchar)
- {
- case '*':
- if(starpos != -1)
- goto bad_mask;
- len = strlen(topic);
- if((dpos + len) > TOPICLEN)
- len = TOPICLEN + 1 - dpos;
- memcpy(new_topic+dpos, topic, len);
- dpos += len;
- starpos = pos;
- break;
- case '\\': tchar = topic_mask[pos++]; /* and fall through */
- default: new_topic[dpos++] = tchar; break;
- }
- }
- if((dpos > TOPICLEN) || tchar)
+ /* make a new topic fitting mask */
+ conform_topic(topic_mask, topic, new_topic);
+ if(!*new_topic)
{
- bad_mask:
+ /* Topic couldnt fit into mask, was too long */
reply("CSMSG_TOPICMASK_CONFLICT1", channel->name, topic_mask);
reply("CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
return 0;
}
- new_topic[dpos] = 0;
SetChannelTopic(channel, chanserv, new_topic, 1);
- } else {
- reply("CSMSG_TOPIC_LOCKED", channel->name);
- return 0;
}
+ else /* No mask set, just set the topic */
+ SetChannelTopic(channel, chanserv, topic, 1);
}
- else
- SetChannelTopic(channel, chanserv, topic, 1);
if(check_user_level(channel, user, lvlTopicSnarf, 1, 0))
{
@@ -4038,7 +4081,7 @@
reply("CSMSG_BAR");
uData = GetChannelUser(cData, user->handle_info);
- if(uData && (uData->access >= cData->lvlOpts[lvlGiveOps]))
+ if(uData && (uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/))
{
mod_chanmode_format(&cData->modes, modes);
reply("CSMSG_CHANNEL_TOPIC", cData->topic);
@@ -4243,8 +4286,7 @@
continue;
uData = GetChannelAccess(cData, mn->user->handle_info);
- if(!cData->lvlOpts[lvlGiveOps]
- || (uData && uData->access >= cData->lvlOpts[lvlGiveOps]))
+ if(uData && uData->access >= UL_OP /* cData->lvlOpts[lvlGiveOps]*/)
{
if(!(mn->modes & MODE_CHANOP))
{
@@ -4252,8 +4294,7 @@
changes->args[used++].u.member = mn;
}
}
- else if(!cData->lvlOpts[lvlGiveHalfOps]
- || (uData && uData->access >= cData->lvlOpts[lvlGiveHalfOps]))
+ else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
{
if(!(mn->modes & MODE_HALFOP))
{
@@ -4271,8 +4312,7 @@
changes->args[used++].u.member = mn;
}
}
- else if(!cData->lvlOpts[lvlGiveVoice]
- || (uData && uData->access >= cData->lvlOpts[lvlGiveVoice]))
+ else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/)
{
if(mn->modes & MODE_CHANOP)
{
@@ -5232,6 +5272,7 @@
}
switch(option)
{
+ /* removing these level sets..
case lvlGiveVoice:
if(value > cData->lvlOpts[lvlGiveOps])
{
@@ -5253,6 +5294,7 @@
return 0;
}
break;
+ */
case lvlSetters:
/* This test only applies to owners, since non-owners
* trying to set an option to above their level get caught
@@ -5282,7 +5324,7 @@
{
return channel_level_option(lvlEnfHalfOps, CSFUNC_ARGS);
}
-
+/*
static MODCMD_FUNC(chan_opt_giveops)
{
return channel_level_option(lvlGiveOps, CSFUNC_ARGS);
@@ -5292,7 +5334,7 @@
{
return channel_level_option(lvlGiveHalfOps, CSFUNC_ARGS);
}
-
+*/
static MODCMD_FUNC(chan_opt_enfmodes)
{
return channel_level_option(lvlEnfModes, CSFUNC_ARGS);
@@ -5323,10 +5365,12 @@
return channel_level_option(lvlUserInfo, CSFUNC_ARGS);
}
+/*
static MODCMD_FUNC(chan_opt_givevoice)
{
return channel_level_option(lvlGiveVoice, CSFUNC_ARGS);
}
+*/
static MODCMD_FUNC(chan_opt_topicsnarf)
{
@@ -5509,10 +5553,11 @@
reply("CSMSG_NOT_USER", channel->name);
return 0;
}
- if(uData->access < channel->channel_info->lvlOpts[lvlGiveOps])
+ if(uData->access < UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
return user_binary_option("CSMSG_USET_NOAUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS);
else
return user_binary_option("CSMSG_USET_NOAUTOOP", USER_AUTO_OP, CSFUNC_ARGS);
+ /* TODO: add halfops error message? or is the op one generic enough? */
}
static MODCMD_FUNC(user_opt_autoinvite)
@@ -6125,13 +6170,14 @@
{
/* don't automatically give ops or voice during a join flood */
}
+ /* I don't understand why we do this, so im removing it -rubin *
else if(cData->lvlOpts[lvlGiveOps] == 0)
modes |= MODE_CHANOP;
else if(cData->lvlOpts[lvlGiveHalfOps] == 0)
modes |= MODE_HALFOP;
else if(cData->lvlOpts[lvlGiveVoice] == 0)
modes |= MODE_VOICE;
-
+ */
greeting = cData->greeting;
if(user->handle_info)
{
@@ -6156,11 +6202,11 @@
/* Ops and above were handled by the above case. */
if(IsUserAutoOp(uData))
{
- if(uData->access >= cData->lvlOpts[lvlGiveOps])
+ if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/)
modes |= MODE_CHANOP;
- if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+ if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
modes |= MODE_HALFOP;
- else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
+ else if(uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice] */)
modes |= MODE_VOICE;
}
if(uData->access >= UL_PRESENT)
@@ -6234,11 +6280,11 @@
if(IsUserAutoOp(channel))
{
- if(channel->access >= cn->channel_info->lvlOpts[lvlGiveOps])
+ if(channel->access >= UL_OP /* cn->channel_info->lvlOpts[lvlGiveOps] */)
change.args[0].mode = MODE_CHANOP;
- else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveHalfOps])
+ else if(channel->access >= UL_HALFOP /* cn->channel_info->lvlOpts[lvlGiveHalfOps]*/)
change.args[0].mode = MODE_HALFOP;
- else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveVoice])
+ else if(channel->access >= UL_PEON /* cn->channel_info->lvlOpts[lvlGiveVoice]*/)
change.args[0].mode = MODE_VOICE;
else
change.args[0].mode = 0;
@@ -6366,14 +6412,30 @@
cData = channel->channel_info;
if(bad_topic(channel, user, channel->topic))
- {
+ { /* User doesnt have privs to set topics. Undo it */
send_message(user, chanserv, "CSMSG_TOPIC_LOCKED", channel->name);
- if(cData->topic_mask && match_ircglob(old_topic, cData->topic_mask))
- SetChannelTopic(channel, chanserv, old_topic, 1);
- else if(cData->topic)
- SetChannelTopic(channel, chanserv, cData->topic, 1);
+ SetChannelTopic(channel, chanserv, old_topic, 1);
return 1;
}
+ /* If there is a topic mask set, and the new topic doesnt match,
+ * set the topic to mask + new_topic */
+ if(cData->topic_mask && !match_ircglob(channel->topic, cData->topic_mask))
+ {
+ char new_topic[TOPICLEN+1];
+ conform_topic(cData->topic_mask, channel->topic, new_topic);
+ if(*new_topic)
+ {
+ SetChannelTopic(channel, chanserv, new_topic, 1);
+ /* and fall through to topicsnarf code below.. */
+ }
+ else /* Topic couldnt fit into mask, was too long */
+ {
+ SetChannelTopic(channel, chanserv, old_topic, 1);
+ send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT1", channel->name, cData->topic_mask);
+ send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
+ return 1;
+ }
+ }
/* With topicsnarf, grab the topic and save it as the default topic. */
if(check_user_level(channel, user, lvlTopicSnarf, 0, 0))
{
@@ -6650,7 +6712,7 @@
/* free form text */
"DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes",
/* options based on user level */
- "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveHalfOps", "GiveOps", "EnfOps",
+ "PubCmd", "InviteMe", "UserInfo",/* "GiveVoice", "GiveHalfOps", "GiveOps", */ "EnfOps",
"EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUsers",
/* multiple choice options */
"CtcpReaction", "Protect", "Toys", "TopicRefresh",
@@ -7479,13 +7541,15 @@
DEFINE_CHANNEL_OPTION(modes);
DEFINE_CHANNEL_OPTION(enfops);
DEFINE_CHANNEL_OPTION(enfhalfops);
- DEFINE_CHANNEL_OPTION(giveops);
+ /*DEFINE_CHANNEL_OPTION(giveops);
DEFINE_CHANNEL_OPTION(givehalfops);
+ */
DEFINE_CHANNEL_OPTION(protect);
DEFINE_CHANNEL_OPTION(enfmodes);
DEFINE_CHANNEL_OPTION(enftopic);
DEFINE_CHANNEL_OPTION(pubcmd);
- DEFINE_CHANNEL_OPTION(givevoice);
+ /*DEFINE_CHANNEL_OPTION(givevoice);
+ */
DEFINE_CHANNEL_OPTION(userinfo);
DEFINE_CHANNEL_OPTION(dynlimit);
DEFINE_CHANNEL_OPTION(topicsnarf);
Index: x3/src/chanserv.h
diff -u x3/src/chanserv.h:1.8 x3/src/chanserv.h:1.9
--- x3/src/chanserv.h:1.8 Sat Mar 19 17:11:35 2005
+++ x3/src/chanserv.h Fri Apr 22 23:40:44 2005
@@ -35,9 +35,10 @@
};
enum levelOption {
- lvlGiveVoice,
- lvlGiveHalfOps,
- lvlGiveOps,
+ /* TODO: Does removing values here mess up reading the db files? */
+ lvlGiveVoice, /* Depreciated */
+ lvlGiveHalfOps, /* Depreciated */
+ lvlGiveOps, /* Depreciated */
lvlEnfOps,
lvlEnfHalfOps,
lvlEnfModes,
Index: x3/src/chanserv.help
diff -u x3/src/chanserv.help:1.9 x3/src/chanserv.help:1.10
--- x3/src/chanserv.help:1.9 Wed Apr 20 07:39:48 2005
+++ x3/src/chanserv.help Fri Apr 22 23:40:44 2005
@@ -417,14 +417,11 @@
"PUBCMD: Restrictions to use commands in public.",
"INVITEME: Minimum level for users to use INVITEME or AUTOINVITE.",
"USERINFO: Minimum level for users to show an infoline on join.",
- "GIVEVOICE: The users that $b$C$b will autovoice.",
- "GIVEHOPS: The users that $b$C$b will autohalfop.",
- "GIVEOPS: The users that $b$C$b will autoop.",
"ENFOPS: Restrictions for opping users.",
"ENFHALFOPS: Restrictions for halfopping users.",
"ENFMODES: Restrictions to change the default modes.",
"ENFTOPIC: Restrictions on changing the topic.",
- "TOPICSNARF: Topics set manually (by /TOPIC #channel ...) by users this level and above change the default $b$C$b topic.",
+ "TOPICSNARF: Manual topics changes (by /TOPIC) from users this level and above will change the default $b$C$b topic.",
"SETTERS: Who may change channel settings (using $bSET$b).",
"CTCPUSERS: Who is allowed to send CTCPs to the channel.",
"CTCPREACTION: What happens when a disallowed CTCP is sent to the channel.",
@@ -435,18 +432,20 @@
"$bIRCOP ONLY$b:",
"NODELETE: Prevents channel deletion.",
"If you wish to reset your channel to the default settings, you can use the $bSET DEFAULTS$b command.",
- "$uSee Also:$u set pubcmd, set giveops, set givehalfops, set enfops, set enfhalfops, set enfmodes, set enftopic, set protect, set toys, set setters, set topicrefresh, set ctcpusers, set ctcpreaction, set defaults");
+ "$uSee Also:$u set pubcmd, set enfops, set enfhalfops, set enfmodes, set enftopic, set protect, set toys, set setters, set topicrefresh, set ctcpusers, set ctcpreaction, set defaults");
"SET DEFAULTTOPIC" ("/msg $C SET <#channel> DEFAULTTOPIC <New default topic>",
"This changes the default topic for the channel. $C will set the IRC topic to this value when the $btopic$b command is used with no arguments, when the topic refresh happens (if you have $bset topicrefresh$b), or when an unauthorized user changes the topic to something else.",
"$uSee Also:$u set, set topicrefresh, set enftopic, set topicmask");
"SET TOPICMASK" ("/msg $C SET <#channel> TOPICMASK <Topic mask with * and ?>",
- "This sets a pattern that $C allows for the topic. A $b*$b will match any number of characters (including 0); a $b?$b will match any single character -- the same as with IRC hostmasks. A user may set a topic if either $btopicmask$b or $benftopic$b allow it.",
- "For example, $b!set topicmask Hello *$b allows anyone to set the topic to be $bHello world$b, but they must be able to override the topic (according to the $bEnfTopic$b setting) to set the topic to $bGoodbye world$b.",
+ "This sets a pattern that $C forces all topics to match. A $b*$b will match any number of characters (including 0); a $b?$b will match any single character -- the same as with IRC hostmasks.",
+ "For example, $b!set topicmask Hello *$b allows the topic to be set to $bHello world$b, but not $bGoodbye world$b.",
"You may \"escape\" those characters by putting a \\ before them in the topic mask; for example, $b!set topicmask Whassup\\?$b would only allow the topic to be $bWhassup?$b, while leaving out the \\ would allow the topic to be $bWhassup!$b (among other things).",
- "For ease of use, if the TopicMask has only one * and no ?, then using $b!topic something$b will (if $bsomething$b does not match the TopicMask and you cannot override the topic lock) replace the * with the text $bsomething$b. If there is more than one * or any ? at all, $b!topic something$b will not work like that.",
+ "If the TopicMask has only one * and no ?, then using:",
+ " $btopic something$b",
+ "will replace the * with the text $bsomething$b.",
"$uSee Also:$u set, set topic, set enftopic");
"SET TOYS" ("/msg $C SET <#channel> TOYS <value>",
- "This setting changes how $C will respond to commands like !8ball, or whether it responds at all. Valid settings are:",
+ "This setting changes how $C will respond to commands like 8ball, or whether it responds at all. Valid settings are:",
"$b0$b Toys are completely disabled.",
"$b1$b Toys will only reply privately.",
"$b2$b Toys will reply publicly.",
@@ -538,7 +537,7 @@
"Displays up to a certain limit, all channels registered with $b$C$b that have not been visited within a certain duration. If a duration is not provided, a default will be used.",
"$uSee Also:$u expire, search, durations");
"UP" ("/msg $C UP <#channel>",
- "Grants you your normal channel privileges. If your access in the channel is less than the GiveVoice setting, this does nothing. Otherwise, if your access is less than the GiveOps setting, $b$C$b will give you an halfop. If your access is as GiveHalfOps, $b$C$b will give you halfops. If your access is at least GiveOps, $b$C$b will give you ops.");
+ "Grants you your normal channel privileges. Ops for OPs, HalfOps for HALFOPs, and Voice for PEONs.");
"UPALL" ("/msg $C UPALL",
"Executes the $bup$b command for each channel you have access in.",
"$uSee Also:$u up, down, downall");
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-04-23 17:48:54
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-23 17:48:44 UTC
Modified files:
ChangeLog.X3 src/nickserv.c
Log message:
accountinfo end of list fix
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.21 x3/ChangeLog.X3:1.22
--- x3/ChangeLog.X3:1.21 Fri Apr 22 23:40:43 2005
+++ x3/ChangeLog.X3 Sat Apr 23 10:48:34 2005
@@ -10,6 +10,9 @@
* src/chanserv.help: updated documentation to reflect the new and
much simpler topicmask feature, and removed op/voice levels.
+ * src/nickserv.c: added tailing 'end of' line for accountinfo
+ for non-opers too.
+
2005-04-20 Alex Schumann <ru...@af...>
* src/proto-common.c: removing +d. needs to be a config option
@@ -122,5 +125,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.21 $"
+#define CVS_VERSION "$Revision: 1.22 $"
Index: x3/src/nickserv.c
diff -u x3/src/nickserv.c:1.22 x3/src/nickserv.c:1.23
--- x3/src/nickserv.c:1.22 Wed Apr 20 07:39:48 2005
+++ x3/src/nickserv.c Sat Apr 23 10:48:34 2005
@@ -1410,8 +1410,10 @@
reply("NSMSG_HANDLEINFO_DNR", dnr->setter, dnr->reason);
if (!oper_outranks(user, hi))
return 1;
- } else if (hi != user->handle_info)
+ } else if (hi != user->handle_info) {
+ reply("NSMSG_HANDLEINFO_END");
return 1;
+ }
if (nickserv_conf.email_enabled)
reply("NSMSG_HANDLEINFO_EMAIL_ADDR", visible_email_addr(user, hi));
----------------------- End of diff -----------------------
|
|
From: Alex S. <ru...@us...> - 2005-04-24 06:07:47
|
Committer : Alex Schumann <ru...@us...>
CVSROOT : /cvsroot/x2serv
Module : x3
Commit time: 2005-04-24 06:07:36 UTC
Modified files:
ChangeLog.X3 src/chanserv.c src/modcmd.c
Log message:
See changelog
---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.22 x3/ChangeLog.X3:1.23
--- x3/ChangeLog.X3:1.22 Sat Apr 23 10:48:34 2005
+++ x3/ChangeLog.X3 Sat Apr 23 23:07:25 2005
@@ -6,6 +6,7 @@
voicelevel, hard coding them to OP, HALFOP, and PEON. Changed
topicmask to be an on or off setting, uninfluenced by enftopic.
Added feature to use mask on /topic in addition to ,topic sets.
+ Removed special consideration for ircops in protect_user()
* src/chanserv.help: updated documentation to reflect the new and
much simpler topicmask feature, and removed op/voice levels.
@@ -13,6 +14,8 @@
* src/nickserv.c: added tailing 'end of' line for accountinfo
for non-opers too.
+ * src/modcmd.c: tweaked alias notification for help and breef help.
+
2005-04-20 Alex Schumann <ru...@af...>
* src/proto-common.c: removing +d. needs to be a config option
@@ -125,5 +128,5 @@
***********************************************************************/
-#define CVS_VERSION "$Revision: 1.22 $"
+#define CVS_VERSION "$Revision: 1.23 $"
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.22 x3/src/chanserv.c:1.23
--- x3/src/chanserv.c:1.22 Fri Apr 22 23:40:44 2005
+++ x3/src/chanserv.c Sat Apr 23 23:07:26 2005
@@ -1427,7 +1427,7 @@
/* Don't protect if no one is to be protected, someone is attacking
himself, or if the aggressor is an IRC Operator. */
- if(protect == 'n' || victim == aggressor || IsOper(aggressor))
+ if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/ || IsOper(aggressor) */)
return 0;
/* Don't protect if the victim isn't authenticated (because they
Index: x3/src/modcmd.c
diff -u x3/src/modcmd.c:1.13 x3/src/modcmd.c:1.14
--- x3/src/modcmd.c:1.13 Wed Apr 20 07:39:48 2005
+++ x3/src/modcmd.c Sat Apr 23 23:07:26 2005
@@ -775,9 +775,9 @@
* TODO: We actually DO want to show the parent IF there is no other help.
*/
r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name);
- if(cmd->command->name)
+ if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name))
{
- send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name);
+ send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name);
}
/* If it's an alias, show what it's an alias for. */
@@ -815,7 +815,7 @@
if(!r) {
if(cmd->command->name)
{
- send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name);
+ send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name);
r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->command->name);
}
}
----------------------- End of diff -----------------------
|
Thanks for helping keep SourceForge clean.
X