Index: configure
===================================================================
--- configure	(.../1.0.1)	(revision 183)
+++ configure	(.../1.0.2)	(revision 183)
@@ -1,8 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for ircd-hybrid 7.2.2.
+# Generated by GNU Autoconf 2.61 for esphyb 1.0.x.
 #
-# $Id: configure 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: configure.ac 715 2006-07-14 21:01:55Z michael $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -12,7 +13,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -21,12 +23,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
 
+
+
 # PATH needs CR
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -217,7 +222,7 @@
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -235,7 +240,6 @@
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -244,18 +248,19 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
+
 :
 _ASEOF
 }; then
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -264,11 +269,13 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
+
 :
 (as_func_return () {
   (exit $1)
@@ -514,19 +521,28 @@
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -557,46 +573,46 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME='ircd-hybrid'
-PACKAGE_TARNAME='ircd-hybrid'
-PACKAGE_VERSION='7.2.2'
-PACKAGE_STRING='ircd-hybrid 7.2.2'
+PACKAGE_NAME='esphyb'
+PACKAGE_TARNAME='esphyb'
+PACKAGE_VERSION='1.0.x'
+PACKAGE_STRING='esphyb 1.0.x'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix=/usr/local/ircd
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -690,6 +706,7 @@
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP'
 
@@ -797,10 +814,10 @@
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -816,10 +833,10 @@
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1013,19 +1030,19 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=no ;;
 
   --x)
@@ -1194,7 +1211,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ircd-hybrid 7.2.2 to adapt to many kinds of systems.
+\`configure' configures esphyb 1.0.x to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1242,7 +1259,7 @@
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/ircd-hybrid]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/esphyb]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1255,7 +1272,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ircd-hybrid 7.2.2:";;
+     short | recursive ) echo "Configuration of esphyb 1.0.x:";;
    esac
   cat <<\_ACEOF
 
@@ -1297,7 +1314,7 @@
                           Define the log facility to use with ircd's syslog
                           output (default LOG_LOCAL4)
   --with-nicklen=LENGTH   Set the nick length to LENGTH (default 9)
-  --with-topiclen=NUMBER  Set the max topic length to NUMBER (default 160, max
+  --with-topiclen=NUMBER  Set the max topic length to NUMBER (default 390, max
                           390)
 
 Some influential environment variables:
@@ -1305,6 +1322,7 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1372,15 +1390,16 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ircd-hybrid configure 7.2.2
-generated by GNU Autoconf 2.60
+esphyb configure 1.0.x
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-$Id: configure 715 2006-07-14 21:01:55Z michael $
+$Id$
+$Hybrid: configure.ac 715 2006-07-14 21:01:55Z michael $
 _ACEOF
   exit
 fi
@@ -1388,8 +1407,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ircd-hybrid $as_me 7.2.2, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+It was created by esphyb $as_me 1.0.x, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1777,7 +1796,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1817,7 +1836,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1874,7 +1893,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1915,7 +1934,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -1973,7 +1992,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2017,7 +2036,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2158,7 +2177,7 @@
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -2186,6 +2205,12 @@
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2197,8 +2222,6 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -2376,27 +2399,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2451,27 +2457,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2506,27 +2495,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -2562,27 +2534,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2698,27 +2653,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -2911,7 +2849,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MKDEP="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2951,7 +2889,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MAKEDEPEND="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3083,27 +3021,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_strerror=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -3112,7 +3034,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_strerror+set}" = set; then
   break
@@ -3167,27 +3089,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
@@ -3272,17 +3177,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3316,17 +3214,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3391,17 +3282,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3435,17 +3319,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -3500,7 +3377,7 @@
   for ac_prog in grep ggrep; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3582,7 +3459,7 @@
   for ac_prog in egrep; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
     # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3788,7 +3665,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3850,7 +3727,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3890,7 +3767,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3930,7 +3807,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3970,7 +3847,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4010,7 +3887,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4050,7 +3927,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4090,7 +3967,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4130,7 +4007,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEST="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4197,27 +4074,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4394,27 +4254,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -4488,27 +4331,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4544,17 +4370,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4663,27 +4482,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_socket=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -4692,7 +4495,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_socket+set}" = set; then
   break
@@ -4767,27 +4570,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_inet_aton=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -4796,7 +4583,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_inet_aton+set}" = set; then
   break
@@ -4872,27 +4659,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_inet_pton=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -4901,7 +4672,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_inet_pton+set}" = set; then
   break
@@ -4977,27 +4748,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_inet_ntop=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -5006,7 +4761,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_inet_ntop+set}" = set; then
   break
@@ -5080,27 +4835,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_struct_sockaddr_storage=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5159,27 +4897,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in_sin_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5215,27 +4936,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in_sin_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5299,27 +5003,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_struct_addrinfo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5381,27 +5068,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_socklen_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5458,27 +5128,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 	{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
@@ -5535,27 +5188,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 	if test "$CYGWIN" = "yes"; then
 		{ echo "$as_me:$LINENO: result: no, Cygwin's IPv6 is incomplete" >&5
@@ -5602,27 +5238,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 else
@@ -5704,27 +5323,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_crypt=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -5733,7 +5336,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_crypt+set}" = set; then
   break
@@ -5791,27 +5394,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gcc_cv_header_string=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5852,7 +5438,8 @@
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
  bogus endian macros
 #endif
 
@@ -5873,27 +5460,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5928,27 +5498,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5999,27 +5552,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
 fi
@@ -6155,27 +5691,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6211,17 +5730,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6319,27 +5831,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -6356,7 +5852,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 { echo "$as_me:$LINENO: checking for strlcat" >&5
@@ -6392,27 +5888,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -6429,7 +5909,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 CFLAGS=$save_CFLAGS
@@ -6505,27 +5985,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6534,7 +5998,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -6588,27 +6052,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_int64_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6622,16 +6069,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
 echo "${ECHO_T}$ac_cv_type_int64_t" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of int64_t" >&5
 echo $ECHO_N "checking size of int64_t... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_int64_t" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -6641,7 +6087,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 int
 main ()
 {
@@ -6665,27 +6111,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -6695,7 +6124,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 int
 main ()
 {
@@ -6719,27 +6148,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -6766,7 +6178,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 int
 main ()
 {
@@ -6790,27 +6202,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -6820,7 +6215,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 int
 main ()
 {
@@ -6844,27 +6239,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -6901,7 +6279,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 int
 main ()
 {
@@ -6925,27 +6303,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -6958,11 +6319,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int64_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
+'') if test "$ac_cv_type_int64_t" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (int64_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int64_t=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6972,7 +6337,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int64_t ac__type_sizeof_;
+   typedef int64_t ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -7031,21 +6396,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
+if test "$ac_cv_type_int64_t" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (int64_t)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int64_t=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_int64_t=0
 fi
-fi
 { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int64_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int64_t" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_INT64_T $ac_cv_sizeof_int64_t
 _ACEOF
@@ -7088,27 +6457,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7122,16 +6474,15 @@
 { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
 { echo "$as_me:$LINENO: checking size of long long" >&5
 echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -7141,7 +6492,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 int
 main ()
 {
@@ -7165,27 +6516,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -7195,7 +6529,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 int
 main ()
 {
@@ -7219,27 +6553,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -7266,7 +6583,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 int
 main ()
 {
@@ -7290,27 +6607,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -7320,7 +6620,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 int
 main ()
 {
@@ -7344,27 +6644,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
@@ -7401,7 +6684,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 int
 main ()
 {
@@ -7425,27 +6708,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
@@ -7458,11 +6724,15 @@
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+'') if test "$ac_cv_type_long_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -7472,7 +6742,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
+   typedef long long ac__type_sizeof_;
 static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
@@ -7531,21 +6801,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+if test "$ac_cv_type_long_long" = yes; then
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
 echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_long_long=0
 fi
-fi
 { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
@@ -7590,27 +6864,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_uint64_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7661,27 +6918,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_int64_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7733,27 +6973,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_uint64_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7813,27 +7036,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_int64_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7899,27 +7105,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_u_int32_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -7973,27 +7162,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_uint32_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8067,27 +7239,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_u_int16_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8141,27 +7296,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_uint16_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8237,27 +7375,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_in_port_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8320,27 +7441,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_sa_family_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8439,27 +7543,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8468,7 +7556,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -8655,27 +7743,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_crypto_RSA_free=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -8684,7 +7756,7 @@
 	ac_cv_lib_crypto_RSA_free=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8769,27 +7841,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8798,7 +7854,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -8879,27 +7935,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8908,7 +7948,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -8989,27 +8029,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9018,7 +8042,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9099,27 +8123,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9128,7 +8136,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9209,27 +8217,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9238,7 +8230,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9319,27 +8311,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9348,7 +8324,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9427,27 +8403,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9483,17 +8442,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9586,27 +8538,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_z_zlibVersion=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9615,7 +8551,7 @@
 	ac_cv_lib_z_zlibVersion=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -9707,27 +8643,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9763,17 +8682,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9914,27 +8826,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_kevent=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9943,7 +8839,7 @@
 	ac_cv_func_kevent=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_kevent" >&5
@@ -9988,27 +8884,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10044,17 +8923,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10238,27 +9110,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10294,17 +9149,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10457,27 +9305,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_poll=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10486,7 +9318,7 @@
 	ac_cv_func_poll=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_poll" >&5
@@ -10558,27 +9390,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_select=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10587,7 +9403,7 @@
 	ac_cv_func_select=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_select" >&5
@@ -10732,27 +9548,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_efence_malloc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10761,7 +9561,7 @@
 	ac_cv_lib_efence_malloc=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -11190,27 +9990,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11246,17 +10029,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11363,27 +10139,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_shl_load=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -11392,7 +10152,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_shl_load+set}" = set; then
   break
@@ -11471,27 +10231,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_dlopen=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -11500,7 +10244,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_dlopen+set}" = set; then
   break
@@ -11568,27 +10312,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11624,17 +10351,10 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11757,27 +10477,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlsym=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11786,7 +10490,7 @@
 	ac_cv_func_dlsym=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_dlsym" >&5
@@ -11869,27 +10573,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11898,7 +10586,7 @@
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -11965,27 +10653,11 @@
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   found=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11994,7 +10666,7 @@
 	found=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$hold_ldflags
 
@@ -12229,7 +10901,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -12238,12 +10911,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
 
+
+
 # PATH needs CR
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -12465,19 +11141,28 @@
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -12492,8 +11177,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ircd-hybrid $as_me 7.2.2, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+This file was extended by esphyb $as_me 1.0.x, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12521,7 +11206,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -12541,8 +11226,8 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-ircd-hybrid config.status 7.2.2
-configured by $0, generated by GNU Autoconf 2.60,
+esphyb config.status 1.0.x
+configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.

Property changes on: configure
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: LICENSE
===================================================================
--- LICENSE	(.../1.0.1)	(revision 183)
+++ LICENSE	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: LICENSE 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: LICENSE 33 2005-10-02 20:50:00Z knight $
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

Property changes on: LICENSE
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: Makefile.in
===================================================================
--- Makefile.in	(.../1.0.1)	(revision 183)
+++ Makefile.in	(.../1.0.2)	(revision 183)
@@ -16,7 +16,8 @@
 #*   along with this program; if not, write to the Free Software
 #*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #*
-#*   $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+#*   $Id$
+#*   $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 #*/
 
 RM          = @RM@

Property changes on: Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/irc_getnameinfo.h
===================================================================
--- include/irc_getnameinfo.h	(.../1.0.1)	(revision 183)
+++ include/irc_getnameinfo.h	(.../1.0.2)	(revision 183)
@@ -26,7 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $Id: irc_getnameinfo.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: irc_getnameinfo.h 33 2005-10-02 20:50:00Z knight $
  */
 
 extern int irc_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,

Property changes on: include/irc_getnameinfo.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_user.h
===================================================================
--- include/s_user.h	(.../1.0.1)	(revision 183)
+++ include/s_user.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.h 573 2006-05-01 09:40:37Z michael $
+ *  $Id$
+ *  $Hybrid: s_user.h 573 2006-05-01 09:40:37Z michael $
  */
 
 #ifndef INCLUDED_s_user_h

Property changes on: include/s_user.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/ircd_getopt.h
===================================================================
--- include/ircd_getopt.h	(.../1.0.1)	(revision 183)
+++ include/ircd_getopt.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_getopt.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: ircd_getopt.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef __GETOPT_H_INCLUDED__

Property changes on: include/ircd_getopt.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/m_info.h
===================================================================
--- include/m_info.h	(.../1.0.1)	(revision 183)
+++ include/m_info.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_info.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_info.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_m_info_h

Property changes on: include/m_info.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/defaults.h
===================================================================
--- include/defaults.h	(.../1.0.1)	(revision 183)
+++ include/defaults.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: defaults.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: defaults.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_defaults_h

Property changes on: include/defaults.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/packet.h
===================================================================
--- include/packet.h	(.../1.0.1)	(revision 183)
+++ include/packet.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: packet.h 163 2005-10-20 21:09:02Z adx $
+ *  $Id$
+ *  $Hybrid: packet.h 163 2005-10-20 21:09:02Z adx $
  */
 
 #ifndef INCLUDED_packet_h

Property changes on: include/packet.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_conf.h
===================================================================
--- include/s_conf.h	(.../1.0.1)	(revision 183)
+++ include/s_conf.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.h 671 2006-06-13 07:15:38Z michael $
+ *  $Id$
+ *  $Hybrid: s_conf.h 671 2006-06-13 07:15:38Z michael $
  */
 
 #ifndef INCLUDED_s_conf_h

Property changes on: include/s_conf.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/channel.h
===================================================================
--- include/channel.h	(.../1.0.1)	(revision 183)
+++ include/channel.h	(.../1.0.2)	(revision 183)
@@ -21,7 +21,8 @@
 
 /*! \file channel.h
  * \brief Responsible for managing channels, members, bans and topics
- * \version $Id: channel.h 632 2006-06-01 10:53:00Z michael $
+ * \version $Id$
+ * \version $Hybrid: channel.h 632 2006-06-01 10:53:00Z michael $
  */
 
 #ifndef INCLUDED_channel_h

Property changes on: include/channel.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/whowas.h
===================================================================
--- include/whowas.h	(.../1.0.1)	(revision 183)
+++ include/whowas.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: whowas.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: whowas.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_whowas_h

Property changes on: include/whowas.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/inet_misc.h
===================================================================
--- include/inet_misc.h	(.../1.0.1)	(revision 183)
+++ include/inet_misc.h	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
  *	and definitions required to build ircd on some		*
  *	exotic platforms.					*
  *								*
- *	$Id: inet_misc.h 33 2005-10-02 20:50:00Z knight $							*
+ *	$Id$							*
+ *	$Hybrid: inet_misc.h 33 2005-10-02 20:50:00Z knight $							*
  *
  * Copyright (c) 1980, 1983, 1988, 1993
  *      The Regents of the University of California.  All rights reserved.

Property changes on: include/inet_misc.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/channel_mode.h
===================================================================
--- include/channel_mode.h	(.../1.0.1)	(revision 183)
+++ include/channel_mode.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: channel_mode.h 759 2006-08-18 14:29:45Z michael $
+ *  $Id$
+ *  $Hybrid: channel_mode.h 759 2006-08-18 14:29:45Z michael $
  */
 
 

Property changes on: include/channel_mode.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/ircd_handler.h
===================================================================
--- include/ircd_handler.h	(.../1.0.1)	(revision 183)
+++ include/ircd_handler.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_handler.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: ircd_handler.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_ircd_handler_h

Property changes on: include/ircd_handler.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/client.h
===================================================================
--- include/client.h	(.../1.0.1)	(revision 183)
+++ include/client.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: client.h 856 2007-02-27 02:58:49Z db $
+ *  $Id$
+ *  $Hybrid: client.h 856 2007-02-27 02:58:49Z db $
  */
 
 #ifndef INCLUDED_client_h
@@ -295,6 +296,7 @@
 #define IsServicesAdmin(x) ((x)->umodes & UMODE_SVCSADMIN)
 #define IsOper(x)		((x)->umodes & UMODE_OPER)
 #define IsAdmin(x)		((x)->umodes & UMODE_ADMIN)
+#define IsSnoop(x)      ((x)->umodes & UMODE_SNOOP)
 
 #define IsService(x)    \
           ((ServerInfo.services_name != NULL && \
@@ -395,6 +397,8 @@
 #define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
 #define UMODE_REGNICK      0x00080000 /* registered and identified with services */
 #define UMODE_REGONLY      0x00100000 /* only identified users can speak to me */
+#define UMODE_SNOOP        0x00200000 /* user can see through invisibility */
+#define UMODE_CAPTURED     0x00400000 /* user is silenced */
 
 /* user information flags, only settable by remote mode or local oper */
 #define UMODE_SVCSADMIN    0x20000000 /* Services administrator */
@@ -403,8 +407,9 @@
 
 #define UMODE_ALL	   UMODE_SERVNOTICE
 
-#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
-                      UMODE_ADMIN | UMODE_REGNICK | UMODE_REGONLY | UMODE_SVCSADMIN)
+#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | UMODE_ADMIN \
+                      | UMODE_REGNICK | UMODE_REGONLY | UMODE_SNOOP | UMODE_CAPTURED \
+                      | UMODE_SVCSADMIN)
 
 
 /* oper priv flags */
@@ -423,7 +428,7 @@
 #define OPER_FLAG_OPER_SPY     0x00001000 /* */
 #define OPER_FLAG_REMOTEBAN    0x00002000 /* */
 #define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
-#define OPER_FLAG_SNOOP        0x00008000 /* oper can see on +i users, +s channels */
+#define OPER_FLAG_SNOOP        0x00008000 /* oper can set umode +p */
 
 #define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
 
@@ -473,6 +478,12 @@
 #define SetServicesAdmin(x)      ((x)->umodes |= UMODE_SVCSADMIN)
 #define ClearServicesAdmin(x)    ((x)->umodes &= ~UMODE_SVCSADMIN)
 
+#define SetSnoop(x)              ((x)->umodes |= UMODE_SNOOP)
+#define ClearSnoop(x)            ((x)->umodes &= ~UMODE_SNOOP)
+
+#define SetCaptured(x)           { ((x)->umodes |= UMODE_CAPTURED); (x)->handler = DUMMY_HANDLER; }
+#define ClearCaptured(x)         { ((x)->umodes &= ~UMODE_CAPTURED); (x)->handler = CLIENT_HANDLER; }
+
 /* umode flags */
 #define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
 #define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
@@ -483,6 +494,7 @@
 #define IsFull(x)		((x)->umodes & UMODE_CCONN_FULL)
 #define IsRegNick(x)    ((x)->umodes & UMODE_REGNICK)
 #define IsSetRegisteredOnly(x)  ((x)->umodes & UMODE_REGONLY)
+#define IsCaptured(x)   ((x)->umodes & UMODE_CAPTURED)
 
 #define SetSendQExceeded(x)	((x)->flags |= FLAGS_SENDQEX)
 #define IsSendQExceeded(x)	((x)->flags &  FLAGS_SENDQEX)
@@ -543,10 +555,6 @@
 #define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
 #define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
 
-#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
-#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
-#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
-
 /* operflags macros */
 #define ClearOperFlags(x)	((x)->localClient->operflags = 0)
 #define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
@@ -563,7 +571,7 @@
 #define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
 #define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
 #define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
-#define IsOperSnoop(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_SNOOP : 0)
+#define IsOperSnoop(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_SNOOP : 0)
 
 /*
  * definitions for get_client_name

Property changes on: include/client.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/dbuf.h
===================================================================
--- include/dbuf.h	(.../1.0.1)	(revision 183)
+++ include/dbuf.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: dbuf.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: dbuf.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef __DBUF_H_INCLUDED

Property changes on: include/dbuf.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_gline.h
===================================================================
--- include/s_gline.h	(.../1.0.1)	(revision 183)
+++ include/s_gline.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_gline.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_gline.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_s_gline_h

Property changes on: include/s_gline.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_auth.h
===================================================================
--- include/s_auth.h	(.../1.0.1)	(revision 183)
+++ include/s_auth.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_auth.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_auth.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_s_auth_h

Property changes on: include/s_auth.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/hash.h
===================================================================
--- include/hash.h	(.../1.0.1)	(revision 183)
+++ include/hash.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hash.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: hash.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_hash_h

Property changes on: include/hash.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/listener.h
===================================================================
--- include/listener.h	(.../1.0.1)	(revision 183)
+++ include/listener.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: listener.h 516 2006-03-09 10:55:50Z michael $
+ *  $Id$
+ *  $Hybrid: listener.h 516 2006-03-09 10:55:50Z michael $
  */
 
 #ifndef INCLUDED_listener_h

Property changes on: include/listener.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/send.h
===================================================================
--- include/send.h	(.../1.0.1)	(revision 183)
+++ include/send.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: send.h 163 2005-10-20 21:09:02Z adx $
+ *  $Id$
+ *  $Hybrid: send.h 163 2005-10-20 21:09:02Z adx $
  */
 
 #ifndef INCLUDED_send_h

Property changes on: include/send.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/hostmask.h
===================================================================
--- include/hostmask.h	(.../1.0.1)	(revision 183)
+++ include/hostmask.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hostmask.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: hostmask.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDE_hostmask_h

Property changes on: include/hostmask.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_bsd.h
===================================================================
--- include/s_bsd.h	(.../1.0.1)	(revision 183)
+++ include/s_bsd.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd.h 549 2006-04-20 12:46:18Z michael $
+ *  $Id$
+ *  $Hybrid: s_bsd.h 549 2006-04-20 12:46:18Z michael $
  */
 
 #ifndef INCLUDED_s_bsd_h

Property changes on: include/s_bsd.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/balloc.h
===================================================================
--- include/balloc.h	(.../1.0.1)	(revision 183)
+++ include/balloc.h	(.../1.0.2)	(revision 183)
@@ -21,7 +21,8 @@
 
 /*! \file balloc.h
  * \brief A block allocator
- * \version $Id: balloc.h 670 2006-06-12 12:20:55Z michael $
+ * \version $Id$
+ * \version $Hybrid: balloc.h 670 2006-06-12 12:20:55Z michael $
  * \todo Get rid of all typedefs in this file
  */
 

Property changes on: include/balloc.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/tools.h
===================================================================
--- include/tools.h	(.../1.0.1)	(revision 183)
+++ include/tools.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: tools.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: tools.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef __TOOLS_H__

Property changes on: include/tools.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/hook.h
===================================================================
--- include/hook.h	(.../1.0.1)	(revision 183)
+++ include/hook.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hook.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: hook.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef __HOOK_H_INCLUDED

Property changes on: include/hook.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/handlers.h
===================================================================
--- include/handlers.h	(.../1.0.1)	(revision 183)
+++ include/handlers.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: handlers.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: handlers.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_handlers_h

Property changes on: include/handlers.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_serv.h
===================================================================
--- include/s_serv.h	(.../1.0.1)	(revision 183)
+++ include/s_serv.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.h 327 2005-12-25 09:55:48Z michael $
+ *  $Id$
+ *  $Hybrid: s_serv.h 327 2005-12-25 09:55:48Z michael $
  */
 
 #ifndef INCLUDED_serv_h

Property changes on: include/s_serv.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/numeric.h
===================================================================
--- include/numeric.h	(.../1.0.1)	(revision 183)
+++ include/numeric.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: numeric.h 660 2006-06-09 18:51:22Z adx $
+ *  $Id$
+ *  $Hybrid: numeric.h 660 2006-06-09 18:51:22Z adx $
  */
 
 #ifndef INCLUDED_numeric_h

Property changes on: include/numeric.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_log.h
===================================================================
--- include/s_log.h	(.../1.0.1)	(revision 183)
+++ include/s_log.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_log.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_log.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_s_log_h

Property changes on: include/s_log.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/irc_string.h
===================================================================
--- include/irc_string.h	(.../1.0.1)	(revision 183)
+++ include/irc_string.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: irc_string.h 633 2006-06-01 12:30:29Z db $
+ *  $Id$
+ *  $Hybrid: irc_string.h 633 2006-06-01 12:30:29Z db $
  */
 
 #ifndef INCLUDED_irc_string_h

Property changes on: include/irc_string.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/motd.h
===================================================================
--- include/motd.h	(.../1.0.1)	(revision 183)
+++ include/motd.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: motd.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: motd.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_motd_h

Property changes on: include/motd.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/fileio.h
===================================================================
--- include/fileio.h	(.../1.0.1)	(revision 183)
+++ include/fileio.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: fileio.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: fileio.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_fileio_h

Property changes on: include/fileio.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/modules.h
===================================================================
--- include/modules.h	(.../1.0.1)	(revision 183)
+++ include/modules.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: modules.h 512 2006-03-04 16:21:54Z michael $
+ *  $Id$
+ *  $Hybrid: modules.h 512 2006-03-04 16:21:54Z michael $
  */
 
 #ifndef INCLUDED_modules_h

Property changes on: include/modules.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/memory.h
===================================================================
--- include/memory.h	(.../1.0.1)	(revision 183)
+++ include/memory.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: memory.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: memory.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef _I_MEMORY_H

Property changes on: include/memory.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/parse.h
===================================================================
--- include/parse.h	(.../1.0.1)	(revision 183)
+++ include/parse.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: parse.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: parse.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_parse_h

Property changes on: include/parse.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/list.h
===================================================================
--- include/list.h	(.../1.0.1)	(revision 183)
+++ include/list.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: list.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: list.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_list_h

Property changes on: include/list.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/userhost.h
===================================================================
--- include/userhost.h	(.../1.0.1)	(revision 183)
+++ include/userhost.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: userhost.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: userhost.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_userhost_h

Property changes on: include/userhost.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/irc_reslib.h
===================================================================
--- include/irc_reslib.h	(.../1.0.1)	(revision 183)
+++ include/irc_reslib.h	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 /*
  * include/irc_reslib.h (C)opyright 1992 Darren Reed.
  *
- * $Id: irc_reslib.h 33 2005-10-02 20:50:00Z knight $
+ * $Id$
+ * $Hybrid: irc_reslib.h 33 2005-10-02 20:50:00Z knight $
  */
 #ifndef INCLUDED_ircdreslib_h
 #define INCLUDED_ircdreslib_h

Property changes on: include/irc_reslib.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_misc.h
===================================================================
--- include/s_misc.h	(.../1.0.1)	(revision 183)
+++ include/s_misc.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_misc.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_misc.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_s_misc_h

Property changes on: include/s_misc.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/ircd_signal.h
===================================================================
--- include/ircd_signal.h	(.../1.0.1)	(revision 183)
+++ include/ircd_signal.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_signal.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: ircd_signal.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_ircd_signal_h

Property changes on: include/ircd_signal.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/resv.h
===================================================================
--- include/resv.h	(.../1.0.1)	(revision 183)
+++ include/resv.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: resv.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: resv.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_resv_h

Property changes on: include/resv.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/s_stats.h
===================================================================
--- include/s_stats.h	(.../1.0.1)	(revision 183)
+++ include/s_stats.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_stats.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_stats.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_s_stats_h

Property changes on: include/s_stats.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/ircd.h
===================================================================
--- include/ircd.h	(.../1.0.1)	(revision 183)
+++ include/ircd.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: ircd.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_ircd_h

Property changes on: include/ircd.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/event.h
===================================================================
--- include/event.h	(.../1.0.1)	(revision 183)
+++ include/event.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: event.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: event.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_event_h

Property changes on: include/event.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/ircd_defs.h
===================================================================
--- include/ircd_defs.h	(.../1.0.1)	(revision 183)
+++ include/ircd_defs.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_defs.h 100 2005-10-09 14:43:13Z michael $
+ *  $Id$
+ *  $Hybrid: ircd_defs.h 100 2005-10-09 14:43:13Z michael $
  */
 
 /*
@@ -43,7 +44,7 @@
 
 #define USERLEN         10
 #define REALLEN         50
-#define KILLLEN         90
+#define KILLLEN         160
 #define LOCAL_CHANNELLEN 50
 #define CHANNELLEN      200
 #define REASONLEN       120

Property changes on: include/ircd_defs.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/sprintf_irc.h
===================================================================
--- include/sprintf_irc.h	(.../1.0.1)	(revision 183)
+++ include/sprintf_irc.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: sprintf_irc.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: sprintf_irc.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef SPRINTF_IRC

Property changes on: include/sprintf_irc.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/irc_getaddrinfo.h
===================================================================
--- include/irc_getaddrinfo.h	(.../1.0.1)	(revision 183)
+++ include/irc_getaddrinfo.h	(.../1.0.2)	(revision 183)
@@ -26,7 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $Id: irc_getaddrinfo.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: irc_getaddrinfo.h 33 2005-10-02 20:50:00Z knight $
  */
 
 extern int irc_getaddrinfo(const char *hostname, const char *servname,

Property changes on: include/irc_getaddrinfo.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/rlimits.h
===================================================================
--- include/rlimits.h	(.../1.0.1)	(revision 183)
+++ include/rlimits.h	(.../1.0.2)	(revision 183)
@@ -4,7 +4,8 @@
  *
  *  This code is in the public domain.
  *
- *  $Id: rlimits.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: rlimits.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_rlimits_h

Property changes on: include/rlimits.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/restart.h
===================================================================
--- include/restart.h	(.../1.0.1)	(revision 183)
+++ include/restart.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: restart.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: restart.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_restart_h

Property changes on: include/restart.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/stdinc.h
===================================================================
--- include/stdinc.h	(.../1.0.1)	(revision 183)
+++ include/stdinc.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- * $Id: stdinc.h 536 2006-03-23 09:59:02Z michael $
+ * $Id$
+ * $Hybrid: stdinc.h 536 2006-03-23 09:59:02Z michael $
  *
  */
 

Property changes on: include/stdinc.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/fdlist.h
===================================================================
--- include/fdlist.h	(.../1.0.1)	(revision 183)
+++ include/fdlist.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: fdlist.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: fdlist.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_fdlist_h

Property changes on: include/fdlist.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/rsa.h
===================================================================
--- include/rsa.h	(.../1.0.1)	(revision 183)
+++ include/rsa.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: rsa.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: rsa.h 33 2005-10-02 20:50:00Z knight $
  */
 #ifndef INCLUDED_rsa_h
 #define INCLUDED_rsa_h

Property changes on: include/rsa.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/supported.h
===================================================================
--- include/supported.h	(.../1.0.1)	(revision 183)
+++ include/supported.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: supported.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: supported.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_supported_h

Property changes on: include/supported.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/msg.h
===================================================================
--- include/msg.h	(.../1.0.1)	(revision 183)
+++ include/msg.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: msg.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: msg.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_msg_h

Property changes on: include/msg.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/irc_res.h
===================================================================
--- include/irc_res.h	(.../1.0.1)	(revision 183)
+++ include/irc_res.h	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 /*
  * include/irc_res.h for referencing functions in src/irc_res.c
  *
- * $Id: irc_res.h 447 2006-02-12 02:59:16Z db $
+ * $Id$
+ * $Hybrid: irc_res.h 447 2006-02-12 02:59:16Z db $
  */
 
 #ifndef INCLUDED_irc_res_h

Property changes on: include/irc_res.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/patchlevel.h
===================================================================
--- include/patchlevel.h	(.../1.0.1)	(revision 183)
+++ include/patchlevel.h	(.../1.0.2)	(revision 183)
@@ -19,9 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: patchlevel.h 858 2007-02-28 04:15:47Z lusky $
+ *  $Id$
+ *  $Hybrid: patchlevel.h 858 2007-02-28 04:15:47Z lusky $
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL   "esphyb-1.0.1"
+#define PATCHLEVEL   "esphyb-1.0.2"
 #endif

Property changes on: include/patchlevel.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: include/common.h
===================================================================
--- include/common.h	(.../1.0.1)	(revision 183)
+++ include/common.h	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: common.h 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: common.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_common_h

Property changes on: include/common.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: README.FIRST
===================================================================
--- README.FIRST	(.../1.0.1)	(revision 183)
+++ README.FIRST	(.../1.0.2)	(revision 183)
@@ -98,4 +98,5 @@
 - Other files recommended for reading: BUGS, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: README.FIRST 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README.FIRST 33 2005-10-02 20:50:00Z knight $

Property changes on: README.FIRST
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(.../1.0.1)	(revision 183)
+++ src/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 #
 # Makefile.in for ircd/src
 #
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 #
 @SET_MAKE@
 

Property changes on: src/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/crypt.c
===================================================================
--- src/crypt.c	(.../1.0.1)	(revision 183)
+++ src/crypt.c	(.../1.0.2)	(revision 183)
@@ -9,7 +9,8 @@
  *  this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
  *  ----------------------------------------------------------------------------
  *  
- *  $Id: crypt.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: crypt.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/crypt.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/m_error.c
===================================================================
--- src/m_error.c	(.../1.0.1)	(revision 183)
+++ src/m_error.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_error.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_error.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/m_error.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/channel.c
===================================================================
--- src/channel.c	(.../1.0.1)	(revision 183)
+++ src/channel.c	(.../1.0.2)	(revision 183)
@@ -21,7 +21,8 @@
 
 /*! \file channel.c
  * \brief Responsible for managing channels, members, bans and topics
- * \version $Id: channel.c 675 2006-06-13 16:51:10Z adx $
+ * \version $Id$
+ * \version $Hybrid: channel.c 675 2006-06-13 16:51:10Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/channel.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/whowas.c
===================================================================
--- src/whowas.c	(.../1.0.1)	(revision 183)
+++ src/whowas.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: whowas.c 507 2006-03-04 08:20:28Z michael $
+ *  $Id$
+ *  $Hybrid: whowas.c 507 2006-03-04 08:20:28Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/whowas.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_win32.c
===================================================================
--- src/s_bsd_win32.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_win32.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_win32.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_bsd_win32.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_win32.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/y.tab.c
===================================================================
--- src/y.tab.c	(.../1.0.1)	(revision 183)
+++ src/y.tab.c	(.../1.0.2)	(revision 183)
@@ -1,27 +1,602 @@
-#include <stdlib.h>
-#ifndef lint
-#ifdef __unused
-__unused
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ACCEPT_PASSWORD = 258,
+     ACTION = 259,
+     ADMIN = 260,
+     AFTYPE = 261,
+     T_ALLOW = 262,
+     ANTI_NICK_FLOOD = 263,
+     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
+     AUTOCONN = 265,
+     T_BLOCK = 266,
+     BURST_AWAY = 267,
+     BURST_TOPICWHO = 268,
+     BYTES = 269,
+     KBYTES = 270,
+     MBYTES = 271,
+     GBYTES = 272,
+     TBYTES = 273,
+     CALLER_ID_WAIT = 274,
+     CAN_FLOOD = 275,
+     CAN_IDLE = 276,
+     CHANNEL = 277,
+     CIDR_BITLEN_IPV4 = 278,
+     CIDR_BITLEN_IPV6 = 279,
+     CIPHER_PREFERENCE = 280,
+     CLASS = 281,
+     COMPRESSED = 282,
+     COMPRESSION_LEVEL = 283,
+     CONNECT = 284,
+     CONNECTFREQ = 285,
+     CRYPTLINK = 286,
+     DEFAULT_CIPHER_PREFERENCE = 287,
+     DEFAULT_FLOODCOUNT = 288,
+     DEFAULT_SPLIT_SERVER_COUNT = 289,
+     DEFAULT_SPLIT_USER_COUNT = 290,
+     DENY = 291,
+     DESCRIPTION = 292,
+     DIE = 293,
+     DISABLE_AUTH = 294,
+     DISABLE_FAKE_CHANNELS = 295,
+     DISABLE_HIDDEN = 296,
+     DISABLE_LOCAL_CHANNELS = 297,
+     DISABLE_REMOTE_COMMANDS = 298,
+     DOT_IN_IP6_ADDR = 299,
+     DOTS_IN_IDENT = 300,
+     DURATION = 301,
+     EGDPOOL_PATH = 302,
+     EMAIL = 303,
+     ENABLE = 304,
+     ENCRYPTED = 305,
+     EXCEED_LIMIT = 306,
+     EXEMPT = 307,
+     FAILED_OPER_NOTICE = 308,
+     FAKENAME = 309,
+     IRCD_FLAGS = 310,
+     FLATTEN_LINKS = 311,
+     FFAILED_OPERLOG = 312,
+     FKILLLOG = 313,
+     FKLINELOG = 314,
+     FGLINELOG = 315,
+     FIOERRLOG = 316,
+     FOPERLOG = 317,
+     FOPERSPYLOG = 318,
+     FUSERLOG = 319,
+     GECOS = 320,
+     GENERAL = 321,
+     GLINE = 322,
+     GLINES = 323,
+     GLINE_EXEMPT = 324,
+     GLINE_LOG = 325,
+     GLINE_TIME = 326,
+     GLINE_MIN_CIDR = 327,
+     GLINE_MIN_CIDR6 = 328,
+     GLOBAL_KILL = 329,
+     IRCD_AUTH = 330,
+     NEED_IDENT = 331,
+     HAVENT_READ_CONF = 332,
+     HELP_CHANNEL = 333,
+     HIDDEN = 334,
+     HIDDEN_ADMIN = 335,
+     HIDDEN_NAME = 336,
+     HIDDEN_OPER = 337,
+     HIDE_SERVER_IPS = 338,
+     HIDE_SERVERS = 339,
+     HIDE_SPOOF_IPS = 340,
+     HOST = 341,
+     HUB = 342,
+     HUB_MASK = 343,
+     IDLETIME = 344,
+     IGNORE_BOGUS_TS = 345,
+     INVISIBLE_ON_CONNECT = 346,
+     IP = 347,
+     KILL = 348,
+     KILL_CHASE_TIME_LIMIT = 349,
+     KLINE = 350,
+     KLINE_EXEMPT = 351,
+     KLINE_REASON = 352,
+     KLINE_WITH_REASON = 353,
+     KNOCK_DELAY = 354,
+     KNOCK_DELAY_CHANNEL = 355,
+     LAZYLINK = 356,
+     LEAF_MASK = 357,
+     LINKS_DELAY = 358,
+     LISTEN = 359,
+     T_LOG = 360,
+     LOGGING = 361,
+     LOG_LEVEL = 362,
+     MAX_ACCEPT = 363,
+     MAX_BANS = 364,
+     MAX_CHANS_PER_USER = 365,
+     MAX_GLOBAL = 366,
+     MAX_IDENT = 367,
+     MAX_LOCAL = 368,
+     MAX_NICK_CHANGES = 369,
+     MAX_NICK_TIME = 370,
+     MAX_NUMBER = 371,
+     MAX_TARGETS = 372,
+     MESSAGE_LOCALE = 373,
+     MIN_NONWILDCARD = 374,
+     MIN_NONWILDCARD_SIMPLE = 375,
+     MODULE = 376,
+     MODULES = 377,
+     NAME = 378,
+     NEED_PASSWORD = 379,
+     NETWORK_DESC = 380,
+     NETWORK_NAME = 381,
+     NICK = 382,
+     NICK_CHANGES = 383,
+     NO_CREATE_ON_SPLIT = 384,
+     NO_JOIN_ON_SPLIT = 385,
+     NO_OPER_FLOOD = 386,
+     NO_TILDE = 387,
+     NOT = 388,
+     NUMBER = 389,
+     NUMBER_PER_IDENT = 390,
+     NUMBER_PER_CIDR = 391,
+     NUMBER_PER_IP = 392,
+     NUMBER_PER_IP_GLOBAL = 393,
+     OPERATOR = 394,
+     OPERS_BYPASS_CALLERID = 395,
+     OPER_LOG = 396,
+     OPER_ONLY_UMODES = 397,
+     OPER_PASS_RESV = 398,
+     OPER_SPY_T = 399,
+     OPER_UMODES = 400,
+     JOIN_FLOOD_COUNT = 401,
+     JOIN_FLOOD_TIME = 402,
+     PACE_WAIT = 403,
+     PACE_WAIT_SIMPLE = 404,
+     PASSWORD = 405,
+     PATH = 406,
+     PING_COOKIE = 407,
+     PING_TIME = 408,
+     PING_WARNING = 409,
+     PORT = 410,
+     QSTRING = 411,
+     QUIET_ON_BAN = 412,
+     REASON = 413,
+     REDIRPORT = 414,
+     REDIRSERV = 415,
+     REGEX_T = 416,
+     REHASH = 417,
+     TREJECT_HOLD_TIME = 418,
+     REMOTE = 419,
+     REMOTEBAN = 420,
+     RESTRICT_CHANNELS = 421,
+     RESTRICTED = 422,
+     RSA_PRIVATE_KEY_FILE = 423,
+     RSA_PUBLIC_KEY_FILE = 424,
+     SSL_CERTIFICATE_FILE = 425,
+     RESV = 426,
+     RESV_EXEMPT = 427,
+     SECONDS = 428,
+     MINUTES = 429,
+     HOURS = 430,
+     DAYS = 431,
+     WEEKS = 432,
+     SENDQ = 433,
+     SEND_PASSWORD = 434,
+     SERVERHIDE = 435,
+     SERVERINFO = 436,
+     SERVLINK_PATH = 437,
+     SERVICES_NAME = 438,
+     IRCD_SID = 439,
+     TKLINE_EXPIRE_NOTICES = 440,
+     T_SHARED = 441,
+     T_CLUSTER = 442,
+     T_SNOOP = 443,
+     TYPE = 444,
+     SHORT_MOTD = 445,
+     SILENT = 446,
+     SPOOF = 447,
+     SPOOF_NOTICE = 448,
+     STATS_E_DISABLED = 449,
+     STATS_I_OPER_ONLY = 450,
+     STATS_K_OPER_ONLY = 451,
+     STATS_O_OPER_ONLY = 452,
+     STATS_P_OPER_ONLY = 453,
+     TBOOL = 454,
+     TMASKED = 455,
+     T_REJECT = 456,
+     TS_MAX_DELTA = 457,
+     TS_WARN_DELTA = 458,
+     TWODOTS = 459,
+     T_ALL = 460,
+     T_BOTS = 461,
+     T_SOFTCALLERID = 462,
+     T_CALLERID = 463,
+     T_CCONN = 464,
+     T_CCONN_FULL = 465,
+     T_CLIENT_FLOOD = 466,
+     T_DEAF = 467,
+     T_DEBUG = 468,
+     T_DRONE = 469,
+     T_EXTERNAL = 470,
+     T_FULL = 471,
+     T_INVISIBLE = 472,
+     T_IPV4 = 473,
+     T_IPV6 = 474,
+     T_LOCOPS = 475,
+     T_LOGPATH = 476,
+     T_L_CRIT = 477,
+     T_L_DEBUG = 478,
+     T_L_ERROR = 479,
+     T_L_INFO = 480,
+     T_L_NOTICE = 481,
+     T_L_TRACE = 482,
+     T_L_WARN = 483,
+     T_MAX_CLIENTS = 484,
+     T_NCHANGE = 485,
+     T_OPERWALL = 486,
+     T_REJ = 487,
+     T_SERVNOTICE = 488,
+     T_SKILL = 489,
+     T_SPY = 490,
+     T_SSL = 491,
+     T_UMODES = 492,
+     T_UNAUTH = 493,
+     T_UNRESV = 494,
+     T_UNXLINE = 495,
+     T_WALLOP = 496,
+     THROTTLE_TIME = 497,
+     TOPICBURST = 498,
+     TRUE_NO_OPER_FLOOD = 499,
+     TKLINE = 500,
+     TXLINE = 501,
+     TRESV = 502,
+     UNKLINE = 503,
+     USER = 504,
+     T_USERMODE = 505,
+     USE_EGD = 506,
+     USE_EXCEPT = 507,
+     USE_INVEX = 508,
+     USE_KNOCK = 509,
+     USE_LOGGING = 510,
+     USE_WHOIS_ACTUALLY = 511,
+     VHOST = 512,
+     VHOST6 = 513,
+     XLINE = 514,
+     WARN = 515,
+     WARN_NO_NLINE = 516,
+     WEBIRC = 517
+   };
 #endif
-static char const 
-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $";
-#endif
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYLEX yylex()
-#define YYEMPTY -1
-#define yyclearin (yychar=(YYEMPTY))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING() (yyerrflag!=0)
-#if defined(__cplusplus) || __STDC__
-static int yygrowstack(void);
-#else
-static int yygrowstack();
-#endif
-#define YYPREFIX "yy"
-#line 26 "ircd_parser.y"
+/* Tokens.  */
+#define ACCEPT_PASSWORD 258
+#define ACTION 259
+#define ADMIN 260
+#define AFTYPE 261
+#define T_ALLOW 262
+#define ANTI_NICK_FLOOD 263
+#define ANTI_SPAM_EXIT_MESSAGE_TIME 264
+#define AUTOCONN 265
+#define T_BLOCK 266
+#define BURST_AWAY 267
+#define BURST_TOPICWHO 268
+#define BYTES 269
+#define KBYTES 270
+#define MBYTES 271
+#define GBYTES 272
+#define TBYTES 273
+#define CALLER_ID_WAIT 274
+#define CAN_FLOOD 275
+#define CAN_IDLE 276
+#define CHANNEL 277
+#define CIDR_BITLEN_IPV4 278
+#define CIDR_BITLEN_IPV6 279
+#define CIPHER_PREFERENCE 280
+#define CLASS 281
+#define COMPRESSED 282
+#define COMPRESSION_LEVEL 283
+#define CONNECT 284
+#define CONNECTFREQ 285
+#define CRYPTLINK 286
+#define DEFAULT_CIPHER_PREFERENCE 287
+#define DEFAULT_FLOODCOUNT 288
+#define DEFAULT_SPLIT_SERVER_COUNT 289
+#define DEFAULT_SPLIT_USER_COUNT 290
+#define DENY 291
+#define DESCRIPTION 292
+#define DIE 293
+#define DISABLE_AUTH 294
+#define DISABLE_FAKE_CHANNELS 295
+#define DISABLE_HIDDEN 296
+#define DISABLE_LOCAL_CHANNELS 297
+#define DISABLE_REMOTE_COMMANDS 298
+#define DOT_IN_IP6_ADDR 299
+#define DOTS_IN_IDENT 300
+#define DURATION 301
+#define EGDPOOL_PATH 302
+#define EMAIL 303
+#define ENABLE 304
+#define ENCRYPTED 305
+#define EXCEED_LIMIT 306
+#define EXEMPT 307
+#define FAILED_OPER_NOTICE 308
+#define FAKENAME 309
+#define IRCD_FLAGS 310
+#define FLATTEN_LINKS 311
+#define FFAILED_OPERLOG 312
+#define FKILLLOG 313
+#define FKLINELOG 314
+#define FGLINELOG 315
+#define FIOERRLOG 316
+#define FOPERLOG 317
+#define FOPERSPYLOG 318
+#define FUSERLOG 319
+#define GECOS 320
+#define GENERAL 321
+#define GLINE 322
+#define GLINES 323
+#define GLINE_EXEMPT 324
+#define GLINE_LOG 325
+#define GLINE_TIME 326
+#define GLINE_MIN_CIDR 327
+#define GLINE_MIN_CIDR6 328
+#define GLOBAL_KILL 329
+#define IRCD_AUTH 330
+#define NEED_IDENT 331
+#define HAVENT_READ_CONF 332
+#define HELP_CHANNEL 333
+#define HIDDEN 334
+#define HIDDEN_ADMIN 335
+#define HIDDEN_NAME 336
+#define HIDDEN_OPER 337
+#define HIDE_SERVER_IPS 338
+#define HIDE_SERVERS 339
+#define HIDE_SPOOF_IPS 340
+#define HOST 341
+#define HUB 342
+#define HUB_MASK 343
+#define IDLETIME 344
+#define IGNORE_BOGUS_TS 345
+#define INVISIBLE_ON_CONNECT 346
+#define IP 347
+#define KILL 348
+#define KILL_CHASE_TIME_LIMIT 349
+#define KLINE 350
+#define KLINE_EXEMPT 351
+#define KLINE_REASON 352
+#define KLINE_WITH_REASON 353
+#define KNOCK_DELAY 354
+#define KNOCK_DELAY_CHANNEL 355
+#define LAZYLINK 356
+#define LEAF_MASK 357
+#define LINKS_DELAY 358
+#define LISTEN 359
+#define T_LOG 360
+#define LOGGING 361
+#define LOG_LEVEL 362
+#define MAX_ACCEPT 363
+#define MAX_BANS 364
+#define MAX_CHANS_PER_USER 365
+#define MAX_GLOBAL 366
+#define MAX_IDENT 367
+#define MAX_LOCAL 368
+#define MAX_NICK_CHANGES 369
+#define MAX_NICK_TIME 370
+#define MAX_NUMBER 371
+#define MAX_TARGETS 372
+#define MESSAGE_LOCALE 373
+#define MIN_NONWILDCARD 374
+#define MIN_NONWILDCARD_SIMPLE 375
+#define MODULE 376
+#define MODULES 377
+#define NAME 378
+#define NEED_PASSWORD 379
+#define NETWORK_DESC 380
+#define NETWORK_NAME 381
+#define NICK 382
+#define NICK_CHANGES 383
+#define NO_CREATE_ON_SPLIT 384
+#define NO_JOIN_ON_SPLIT 385
+#define NO_OPER_FLOOD 386
+#define NO_TILDE 387
+#define NOT 388
+#define NUMBER 389
+#define NUMBER_PER_IDENT 390
+#define NUMBER_PER_CIDR 391
+#define NUMBER_PER_IP 392
+#define NUMBER_PER_IP_GLOBAL 393
+#define OPERATOR 394
+#define OPERS_BYPASS_CALLERID 395
+#define OPER_LOG 396
+#define OPER_ONLY_UMODES 397
+#define OPER_PASS_RESV 398
+#define OPER_SPY_T 399
+#define OPER_UMODES 400
+#define JOIN_FLOOD_COUNT 401
+#define JOIN_FLOOD_TIME 402
+#define PACE_WAIT 403
+#define PACE_WAIT_SIMPLE 404
+#define PASSWORD 405
+#define PATH 406
+#define PING_COOKIE 407
+#define PING_TIME 408
+#define PING_WARNING 409
+#define PORT 410
+#define QSTRING 411
+#define QUIET_ON_BAN 412
+#define REASON 413
+#define REDIRPORT 414
+#define REDIRSERV 415
+#define REGEX_T 416
+#define REHASH 417
+#define TREJECT_HOLD_TIME 418
+#define REMOTE 419
+#define REMOTEBAN 420
+#define RESTRICT_CHANNELS 421
+#define RESTRICTED 422
+#define RSA_PRIVATE_KEY_FILE 423
+#define RSA_PUBLIC_KEY_FILE 424
+#define SSL_CERTIFICATE_FILE 425
+#define RESV 426
+#define RESV_EXEMPT 427
+#define SECONDS 428
+#define MINUTES 429
+#define HOURS 430
+#define DAYS 431
+#define WEEKS 432
+#define SENDQ 433
+#define SEND_PASSWORD 434
+#define SERVERHIDE 435
+#define SERVERINFO 436
+#define SERVLINK_PATH 437
+#define SERVICES_NAME 438
+#define IRCD_SID 439
+#define TKLINE_EXPIRE_NOTICES 440
+#define T_SHARED 441
+#define T_CLUSTER 442
+#define T_SNOOP 443
+#define TYPE 444
+#define SHORT_MOTD 445
+#define SILENT 446
+#define SPOOF 447
+#define SPOOF_NOTICE 448
+#define STATS_E_DISABLED 449
+#define STATS_I_OPER_ONLY 450
+#define STATS_K_OPER_ONLY 451
+#define STATS_O_OPER_ONLY 452
+#define STATS_P_OPER_ONLY 453
+#define TBOOL 454
+#define TMASKED 455
+#define T_REJECT 456
+#define TS_MAX_DELTA 457
+#define TS_WARN_DELTA 458
+#define TWODOTS 459
+#define T_ALL 460
+#define T_BOTS 461
+#define T_SOFTCALLERID 462
+#define T_CALLERID 463
+#define T_CCONN 464
+#define T_CCONN_FULL 465
+#define T_CLIENT_FLOOD 466
+#define T_DEAF 467
+#define T_DEBUG 468
+#define T_DRONE 469
+#define T_EXTERNAL 470
+#define T_FULL 471
+#define T_INVISIBLE 472
+#define T_IPV4 473
+#define T_IPV6 474
+#define T_LOCOPS 475
+#define T_LOGPATH 476
+#define T_L_CRIT 477
+#define T_L_DEBUG 478
+#define T_L_ERROR 479
+#define T_L_INFO 480
+#define T_L_NOTICE 481
+#define T_L_TRACE 482
+#define T_L_WARN 483
+#define T_MAX_CLIENTS 484
+#define T_NCHANGE 485
+#define T_OPERWALL 486
+#define T_REJ 487
+#define T_SERVNOTICE 488
+#define T_SKILL 489
+#define T_SPY 490
+#define T_SSL 491
+#define T_UMODES 492
+#define T_UNAUTH 493
+#define T_UNRESV 494
+#define T_UNXLINE 495
+#define T_WALLOP 496
+#define THROTTLE_TIME 497
+#define TOPICBURST 498
+#define TRUE_NO_OPER_FLOOD 499
+#define TKLINE 500
+#define TXLINE 501
+#define TRESV 502
+#define UNKLINE 503
+#define USER 504
+#define T_USERMODE 505
+#define USE_EGD 506
+#define USE_EXCEPT 507
+#define USE_INVEX 508
+#define USE_KNOCK 509
+#define USE_LOGGING 510
+#define USE_WHOIS_ACTUALLY 511
+#define VHOST 512
+#define VHOST6 513
+#define XLINE 514
+#define WARN 515
+#define WARN_NO_NLINE 516
+#define WEBIRC 517
 
+
+
+
+/* Copy the first part of user declarations.  */
+#line 25 "ircd_parser.y"
+
+
 #define YY_NO_UNPUT
 #include <sys/types.h>
 
@@ -127,2365 +702,2848 @@
   }
 }
 
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
 #line 134 "ircd_parser.y"
-typedef union {
+{
   int number;
   char *string;
-} YYSTYPE;
-#line 136 "y.tab.c"
-#define YYERRCODE 256
-#define ACCEPT_PASSWORD 257
-#define ACTION 258
-#define ADMIN 259
-#define AFTYPE 260
-#define T_ALLOW 261
-#define ANTI_NICK_FLOOD 262
-#define ANTI_SPAM_EXIT_MESSAGE_TIME 263
-#define AUTOCONN 264
-#define T_BLOCK 265
-#define BURST_AWAY 266
-#define BURST_TOPICWHO 267
-#define BYTES 268
-#define KBYTES 269
-#define MBYTES 270
-#define GBYTES 271
-#define TBYTES 272
-#define CALLER_ID_WAIT 273
-#define CAN_FLOOD 274
-#define CAN_IDLE 275
-#define CHANNEL 276
-#define CIDR_BITLEN_IPV4 277
-#define CIDR_BITLEN_IPV6 278
-#define CIPHER_PREFERENCE 279
-#define CLASS 280
-#define COMPRESSED 281
-#define COMPRESSION_LEVEL 282
-#define CONNECT 283
-#define CONNECTFREQ 284
-#define CRYPTLINK 285
-#define DEFAULT_CIPHER_PREFERENCE 286
-#define DEFAULT_FLOODCOUNT 287
-#define DEFAULT_SPLIT_SERVER_COUNT 288
-#define DEFAULT_SPLIT_USER_COUNT 289
-#define DENY 290
-#define DESCRIPTION 291
-#define DIE 292
-#define DISABLE_AUTH 293
-#define DISABLE_FAKE_CHANNELS 294
-#define DISABLE_HIDDEN 295
-#define DISABLE_LOCAL_CHANNELS 296
-#define DISABLE_REMOTE_COMMANDS 297
-#define DOT_IN_IP6_ADDR 298
-#define DOTS_IN_IDENT 299
-#define DURATION 300
-#define EGDPOOL_PATH 301
-#define EMAIL 302
-#define ENABLE 303
-#define ENCRYPTED 304
-#define EXCEED_LIMIT 305
-#define EXEMPT 306
-#define FAILED_OPER_NOTICE 307
-#define FAKENAME 308
-#define IRCD_FLAGS 309
-#define FLATTEN_LINKS 310
-#define FFAILED_OPERLOG 311
-#define FKILLLOG 312
-#define FKLINELOG 313
-#define FGLINELOG 314
-#define FIOERRLOG 315
-#define FOPERLOG 316
-#define FOPERSPYLOG 317
-#define FUSERLOG 318
-#define GECOS 319
-#define GENERAL 320
-#define GLINE 321
-#define GLINES 322
-#define GLINE_EXEMPT 323
-#define GLINE_LOG 324
-#define GLINE_TIME 325
-#define GLINE_MIN_CIDR 326
-#define GLINE_MIN_CIDR6 327
-#define GLOBAL_KILL 328
-#define IRCD_AUTH 329
-#define NEED_IDENT 330
-#define HAVENT_READ_CONF 331
-#define HELP_CHANNEL 332
-#define HIDDEN 333
-#define HIDDEN_ADMIN 334
-#define HIDDEN_NAME 335
-#define HIDDEN_OPER 336
-#define HIDE_SERVER_IPS 337
-#define HIDE_SERVERS 338
-#define HIDE_SPOOF_IPS 339
-#define HOST 340
-#define HUB 341
-#define HUB_MASK 342
-#define IDLETIME 343
-#define IGNORE_BOGUS_TS 344
-#define INVISIBLE_ON_CONNECT 345
-#define IP 346
-#define KILL 347
-#define KILL_CHASE_TIME_LIMIT 348
-#define KLINE 349
-#define KLINE_EXEMPT 350
-#define KLINE_REASON 351
-#define KLINE_WITH_REASON 352
-#define KNOCK_DELAY 353
-#define KNOCK_DELAY_CHANNEL 354
-#define LAZYLINK 355
-#define LEAF_MASK 356
-#define LINKS_DELAY 357
-#define LISTEN 358
-#define T_LOG 359
-#define LOGGING 360
-#define LOG_LEVEL 361
-#define MAX_ACCEPT 362
-#define MAX_BANS 363
-#define MAX_CHANS_PER_USER 364
-#define MAX_GLOBAL 365
-#define MAX_IDENT 366
-#define MAX_LOCAL 367
-#define MAX_NICK_CHANGES 368
-#define MAX_NICK_TIME 369
-#define MAX_NUMBER 370
-#define MAX_TARGETS 371
-#define MESSAGE_LOCALE 372
-#define MIN_NONWILDCARD 373
-#define MIN_NONWILDCARD_SIMPLE 374
-#define MODULE 375
-#define MODULES 376
-#define NAME 377
-#define NEED_PASSWORD 378
-#define NETWORK_DESC 379
-#define NETWORK_NAME 380
-#define NICK 381
-#define NICK_CHANGES 382
-#define NO_CREATE_ON_SPLIT 383
-#define NO_JOIN_ON_SPLIT 384
-#define NO_OPER_FLOOD 385
-#define NO_TILDE 386
-#define NOT 387
-#define NUMBER 388
-#define NUMBER_PER_IDENT 389
-#define NUMBER_PER_CIDR 390
-#define NUMBER_PER_IP 391
-#define NUMBER_PER_IP_GLOBAL 392
-#define OPERATOR 393
-#define OPERS_BYPASS_CALLERID 394
-#define OPER_LOG 395
-#define OPER_ONLY_UMODES 396
-#define OPER_PASS_RESV 397
-#define OPER_SPY_T 398
-#define OPER_UMODES 399
-#define JOIN_FLOOD_COUNT 400
-#define JOIN_FLOOD_TIME 401
-#define PACE_WAIT 402
-#define PACE_WAIT_SIMPLE 403
-#define PASSWORD 404
-#define PATH 405
-#define PING_COOKIE 406
-#define PING_TIME 407
-#define PING_WARNING 408
-#define PORT 409
-#define QSTRING 410
-#define QUIET_ON_BAN 411
-#define REASON 412
-#define REDIRPORT 413
-#define REDIRSERV 414
-#define REGEX_T 415
-#define REHASH 416
-#define TREJECT_HOLD_TIME 417
-#define REMOTE 418
-#define REMOTEBAN 419
-#define RESTRICT_CHANNELS 420
-#define RESTRICTED 421
-#define RSA_PRIVATE_KEY_FILE 422
-#define RSA_PUBLIC_KEY_FILE 423
-#define SSL_CERTIFICATE_FILE 424
-#define RESV 425
-#define RESV_EXEMPT 426
-#define SECONDS 427
-#define MINUTES 428
-#define HOURS 429
-#define DAYS 430
-#define WEEKS 431
-#define SENDQ 432
-#define SEND_PASSWORD 433
-#define SERVERHIDE 434
-#define SERVERINFO 435
-#define SERVLINK_PATH 436
-#define SERVICES_NAME 437
-#define IRCD_SID 438
-#define TKLINE_EXPIRE_NOTICES 439
-#define T_SHARED 440
-#define T_CLUSTER 441
-#define T_SNOOP 442
-#define TYPE 443
-#define SHORT_MOTD 444
-#define SILENT 445
-#define SPOOF 446
-#define SPOOF_NOTICE 447
-#define STATS_E_DISABLED 448
-#define STATS_I_OPER_ONLY 449
-#define STATS_K_OPER_ONLY 450
-#define STATS_O_OPER_ONLY 451
-#define STATS_P_OPER_ONLY 452
-#define TBOOL 453
-#define TMASKED 454
-#define T_REJECT 455
-#define TS_MAX_DELTA 456
-#define TS_WARN_DELTA 457
-#define TWODOTS 458
-#define T_ALL 459
-#define T_BOTS 460
-#define T_SOFTCALLERID 461
-#define T_CALLERID 462
-#define T_CCONN 463
-#define T_CCONN_FULL 464
-#define T_CLIENT_FLOOD 465
-#define T_DEAF 466
-#define T_DEBUG 467
-#define T_DRONE 468
-#define T_EXTERNAL 469
-#define T_FULL 470
-#define T_INVISIBLE 471
-#define T_IPV4 472
-#define T_IPV6 473
-#define T_LOCOPS 474
-#define T_LOGPATH 475
-#define T_L_CRIT 476
-#define T_L_DEBUG 477
-#define T_L_ERROR 478
-#define T_L_INFO 479
-#define T_L_NOTICE 480
-#define T_L_TRACE 481
-#define T_L_WARN 482
-#define T_MAX_CLIENTS 483
-#define T_NCHANGE 484
-#define T_OPERWALL 485
-#define T_REJ 486
-#define T_SERVNOTICE 487
-#define T_SKILL 488
-#define T_SPY 489
-#define T_SSL 490
-#define T_UMODES 491
-#define T_UNAUTH 492
-#define T_UNRESV 493
-#define T_UNXLINE 494
-#define T_WALLOP 495
-#define THROTTLE_TIME 496
-#define TOPICBURST 497
-#define TRUE_NO_OPER_FLOOD 498
-#define TKLINE 499
-#define TXLINE 500
-#define TRESV 501
-#define UNKLINE 502
-#define USER 503
-#define T_USERMODE 504
-#define USE_EGD 505
-#define USE_EXCEPT 506
-#define USE_INVEX 507
-#define USE_KNOCK 508
-#define USE_LOGGING 509
-#define USE_WHOIS_ACTUALLY 510
-#define VHOST 511
-#define VHOST6 512
-#define XLINE 513
-#define WARN 514
-#define WARN_NO_NLINE 515
-#define WEBIRC 516
-const short yylhs[] = {                                        -1,
-    0,    0,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    2,    2,    1,    1,    1,
-    1,    1,    1,    4,    4,    3,    3,    3,    3,   25,
-   27,   27,   28,   28,   28,   29,   30,   13,   31,   31,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   45,   42,   33,   44,   36,   37,
-   38,   39,   40,   34,   43,   41,   35,    6,   46,   46,
-   47,   47,   47,   47,   48,   50,   49,    7,   51,   51,
-   52,   52,   52,   52,   52,   52,   52,   52,   52,   52,
-   52,   52,   52,   53,   54,   57,   64,   58,   62,   59,
-   60,   63,   61,   55,   55,   55,   55,   55,   55,   55,
-   56,   66,    8,   65,   65,   67,   67,   69,   69,   69,
-   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-   69,   70,   68,   71,   72,   90,   91,   76,   93,   75,
-   94,   94,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,   77,   78,   84,   79,   80,   81,   82,   83,   85,
-   86,   87,   73,   74,   88,   89,   96,   92,   97,   97,
-  100,   98,  101,   98,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-   99,  102,   26,  103,  103,  104,  104,  104,  105,  106,
-  108,   10,  107,  107,  109,  109,  111,  111,  111,  111,
-  111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-  112,  110,  115,  116,  118,  119,  120,  121,  122,  123,
-  124,  113,  114,  117,  125,   11,  128,  127,  129,  129,
-  130,  130,  126,  126,  131,  131,  131,  131,  131,  136,
-  132,  135,  135,  137,  137,  133,  134,  138,   12,  139,
-  139,  140,  140,  140,  140,  140,  140,  140,  140,  140,
-  140,  140,  140,  140,  140,  140,  140,  140,  141,  142,
-  151,  143,  156,  157,  144,  158,  158,  161,  159,  162,
-  159,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-  160,  145,  146,  147,  154,  148,  149,  150,  152,  153,
-  155,  163,   15,  164,  164,  165,  165,  165,  165,  166,
-  167,  168,  169,   16,  170,  170,  171,  171,  171,  171,
-  172,  173,  175,  174,  176,  176,  177,  177,  177,  177,
-  177,  177,  177,  177,  177,  177,  177,  177,  178,   17,
-  179,  179,  180,  180,  180,  181,  183,  182,  184,  184,
-  185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
-  185,  187,   18,  186,  186,  188,  188,  190,  190,  190,
-  190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-  190,  190,  190,  190,  190,  190,  190,  191,  189,  192,
-  193,  194,  195,  197,  196,  196,  198,  210,  199,  211,
-  211,  214,  212,  215,  212,  213,  213,  213,  213,  213,
-  213,  207,  204,  206,  205,  203,  209,  200,  201,  202,
-  208,  216,   19,  219,  218,  220,  220,  221,  217,  217,
-  222,  222,  222,  222,  223,  224,  225,   20,  226,  226,
-  227,  227,  227,  228,  229,   21,  230,  230,  231,  231,
-  232,  233,   24,  236,  235,  237,  237,  238,  234,  234,
-  239,  239,  239,  239,  240,  241,   22,  242,  242,  243,
-  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-  243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
-  243,  243,  243,  243,  243,  294,  295,  292,  296,  297,
-  293,  254,  244,  245,  283,  246,  247,  248,  249,  250,
-  251,  252,  253,  288,  255,  256,  257,  258,  298,  260,
-  265,  261,  261,  263,  263,  262,  277,  278,  264,  266,
-  267,  268,  269,  271,  270,  259,  273,  282,  284,  285,
-  274,  275,  290,  291,  287,  299,  276,  300,  300,  301,
-  301,  301,  301,  301,  301,  301,  301,  301,  301,  301,
-  301,  301,  301,  301,  301,  301,  301,  301,  302,  272,
-  303,  303,  304,  304,  304,  304,  304,  304,  304,  304,
-  304,  304,  304,  304,  304,  304,  304,  304,  304,  304,
-  304,  280,  281,  279,  286,  289,  305,   23,  306,  306,
-  307,  307,  307,  307,  307,  307,  307,  308,  309,  314,
-  310,  315,  315,  316,  316,  311,  312,  317,  313,  318,
-  318,  319,  319,    9,  320,  320,  321,  321,  321,  321,
-  321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-  321,  321,  321,  321,  321,  339,  334,  322,  323,  324,
-  325,  327,  328,  329,  330,  326,  331,  332,  333,  335,
-  336,  337,  338,   14,  340,  340,  341,  341,  341,  341,
-  341,  341,  341,  341,  342,  343,  347,  344,  346,  345,
-  348,
+}
+/* Line 193 of yacc.c.  */
+#line 734 "y.tab.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 747 "y.tab.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  2
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1437
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  268
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  350
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  754
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  1518
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   517
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint16 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,   267,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   263,
+       2,   266,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   265,     2,   264,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262
 };
-const short yylen[] = {                                         2,
-    0,    2,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    2,    2,    0,    1,    2,    3,    3,
-    3,    3,    3,    0,    1,    2,    3,    3,    3,    5,
-    2,    1,    1,    1,    2,    4,    4,    5,    2,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    2,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    5,    2,    1,
-    1,    1,    1,    2,    4,    4,    4,    5,    2,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    2,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    0,    7,    0,    1,    2,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    2,    4,    1,    4,    4,    4,    4,    4,    0,    5,
-    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    0,    5,    3,    1,
-    0,    3,    0,    2,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    0,    6,    2,    1,    1,    1,    2,    4,    4,
-    0,    7,    0,    1,    2,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-    4,    1,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    0,    6,    0,    5,    3,    1,
-    1,    1,    2,    1,    1,    1,    1,    1,    2,    0,
-    5,    3,    1,    1,    3,    4,    4,    0,    6,    2,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    2,    4,    4,
-    4,    4,    4,    0,    5,    3,    1,    0,    3,    0,
-    2,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    0,    6,    2,    1,    1,    1,    1,    2,    4,
-    4,    4,    0,    6,    2,    1,    1,    1,    1,    2,
-    4,    4,    0,    5,    3,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    0,    6,
-    2,    1,    1,    1,    2,    4,    0,    5,    3,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    0,    7,    0,    1,    2,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    2,    4,    1,    4,
-    4,    4,    4,    4,    4,    4,    4,    0,    5,    3,
-    1,    0,    3,    0,    2,    1,    1,    1,    1,    1,
-    1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    0,    6,    0,    5,    3,    1,    1,    2,    1,
-    1,    1,    1,    1,    4,    4,    0,    6,    2,    1,
-    1,    1,    1,    4,    4,    5,    2,    1,    1,    1,
-    4,    0,    6,    0,    5,    3,    1,    1,    2,    1,
-    1,    1,    1,    1,    4,    4,    5,    2,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    0,    5,    3,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    0,    5,
-    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    4,    4,    4,    4,    4,    0,    6,    2,    1,
-    1,    1,    1,    1,    1,    1,    1,    4,    4,    0,
-    5,    3,    1,    1,    1,    4,    4,    0,    5,    3,
-    1,    1,    1,    5,    2,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    5,    2,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    4,    4,    4,    4,    4,    4,
-    4,
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
+      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
+      39,    41,    43,    45,    47,    49,    52,    55,    56,    58,
+      61,    65,    69,    73,    77,    81,    82,    84,    87,    91,
+      95,    99,   105,   108,   110,   112,   114,   117,   122,   127,
+     133,   136,   138,   140,   142,   144,   146,   148,   150,   152,
+     154,   156,   158,   160,   162,   164,   167,   172,   177,   182,
+     187,   192,   197,   202,   207,   212,   217,   222,   227,   232,
+     238,   241,   243,   245,   247,   249,   252,   257,   262,   267,
+     273,   276,   278,   280,   282,   284,   286,   288,   290,   292,
+     294,   296,   298,   300,   302,   305,   310,   315,   320,   325,
+     330,   335,   340,   345,   350,   355,   360,   365,   370,   375,
+     380,   385,   390,   395,   396,   404,   405,   407,   410,   412,
+     414,   416,   418,   420,   422,   424,   426,   428,   430,   432,
+     434,   436,   438,   440,   442,   444,   446,   448,   450,   452,
+     454,   456,   458,   461,   466,   468,   473,   478,   483,   488,
+     493,   494,   500,   504,   506,   508,   510,   512,   514,   516,
+     518,   520,   522,   524,   526,   528,   530,   532,   534,   536,
+     538,   540,   542,   544,   546,   551,   556,   561,   566,   571,
+     576,   581,   586,   591,   596,   601,   606,   611,   616,   621,
+     622,   628,   632,   634,   635,   639,   640,   643,   645,   647,
+     649,   651,   653,   655,   657,   659,   661,   663,   665,   667,
+     669,   671,   673,   675,   677,   678,   685,   688,   690,   692,
+     694,   697,   702,   707,   708,   716,   717,   719,   722,   724,
+     726,   728,   730,   732,   734,   736,   738,   740,   742,   744,
+     746,   748,   750,   753,   758,   760,   765,   770,   775,   780,
+     785,   790,   795,   800,   805,   810,   815,   820,   821,   828,
+     829,   835,   839,   841,   843,   845,   848,   850,   852,   854,
+     856,   858,   861,   862,   868,   872,   874,   876,   880,   885,
+     890,   891,   898,   901,   903,   905,   907,   909,   911,   913,
+     915,   917,   919,   921,   923,   925,   927,   929,   931,   933,
+     935,   938,   943,   948,   953,   958,   963,   964,   970,   974,
+     976,   977,   981,   982,   985,   987,   989,   991,   993,   995,
+     997,   999,  1001,  1003,  1005,  1010,  1015,  1020,  1025,  1030,
+    1035,  1040,  1045,  1050,  1055,  1056,  1063,  1066,  1068,  1070,
+    1072,  1074,  1077,  1082,  1087,  1092,  1093,  1100,  1103,  1105,
+    1107,  1109,  1111,  1114,  1119,  1124,  1125,  1131,  1135,  1137,
+    1139,  1141,  1143,  1145,  1147,  1149,  1151,  1153,  1155,  1157,
+    1159,  1161,  1162,  1169,  1172,  1174,  1176,  1178,  1181,  1186,
+    1187,  1193,  1197,  1199,  1201,  1203,  1205,  1207,  1209,  1211,
+    1213,  1215,  1217,  1219,  1221,  1222,  1230,  1231,  1233,  1236,
+    1238,  1240,  1242,  1244,  1246,  1248,  1250,  1252,  1254,  1256,
+    1258,  1260,  1262,  1264,  1266,  1268,  1270,  1272,  1274,  1276,
+    1279,  1284,  1286,  1291,  1296,  1301,  1306,  1311,  1316,  1321,
+    1326,  1327,  1333,  1337,  1339,  1340,  1344,  1345,  1348,  1350,
+    1352,  1354,  1356,  1358,  1360,  1365,  1370,  1375,  1380,  1385,
+    1390,  1395,  1400,  1405,  1410,  1411,  1418,  1419,  1425,  1429,
+    1431,  1433,  1436,  1438,  1440,  1442,  1444,  1446,  1451,  1456,
+    1457,  1464,  1467,  1469,  1471,  1473,  1475,  1480,  1485,  1491,
+    1494,  1496,  1498,  1500,  1505,  1506,  1513,  1514,  1520,  1524,
+    1526,  1528,  1531,  1533,  1535,  1537,  1539,  1541,  1546,  1551,
+    1557,  1560,  1562,  1564,  1566,  1568,  1570,  1572,  1574,  1576,
+    1578,  1580,  1582,  1584,  1586,  1588,  1590,  1592,  1594,  1596,
+    1598,  1600,  1602,  1604,  1606,  1608,  1610,  1612,  1614,  1616,
+    1618,  1620,  1622,  1624,  1626,  1628,  1630,  1632,  1634,  1636,
+    1638,  1640,  1642,  1644,  1646,  1648,  1650,  1652,  1654,  1656,
+    1658,  1660,  1662,  1664,  1666,  1668,  1670,  1672,  1674,  1679,
+    1684,  1689,  1694,  1699,  1704,  1709,  1714,  1719,  1724,  1729,
+    1734,  1739,  1744,  1749,  1754,  1759,  1764,  1769,  1774,  1779,
+    1784,  1789,  1794,  1799,  1804,  1809,  1814,  1819,  1824,  1829,
+    1834,  1839,  1844,  1849,  1854,  1859,  1864,  1869,  1874,  1879,
+    1884,  1889,  1894,  1899,  1904,  1909,  1914,  1919,  1924,  1925,
+    1931,  1935,  1937,  1939,  1941,  1943,  1945,  1947,  1949,  1951,
+    1953,  1955,  1957,  1959,  1961,  1963,  1965,  1967,  1969,  1971,
+    1973,  1975,  1976,  1982,  1986,  1988,  1990,  1992,  1994,  1996,
+    1998,  2000,  2002,  2004,  2006,  2008,  2010,  2012,  2014,  2016,
+    2018,  2020,  2022,  2024,  2026,  2028,  2033,  2038,  2043,  2048,
+    2053,  2054,  2061,  2064,  2066,  2068,  2070,  2072,  2074,  2076,
+    2078,  2080,  2085,  2090,  2091,  2097,  2101,  2103,  2105,  2107,
+    2112,  2117,  2118,  2124,  2128,  2130,  2132,  2134,  2140,  2143,
+    2145,  2147,  2149,  2151,  2153,  2155,  2157,  2159,  2161,  2163,
+    2165,  2167,  2169,  2171,  2173,  2175,  2177,  2179,  2181,  2183,
+    2188,  2193,  2198,  2203,  2208,  2213,  2218,  2223,  2228,  2233,
+    2238,  2243,  2248,  2253,  2258,  2263,  2268,  2273,  2279,  2282,
+    2284,  2286,  2288,  2290,  2292,  2294,  2296,  2298,  2300,  2305,
+    2310,  2315,  2320,  2325,  2330
 };
-const short yydefred[] = {                                      1,
-    0,    0,    0,    0,  231,  402,  477,    0,  492,    0,
-  667,  288,  462,  265,    0,    0,  122,  342,    0,    0,
-  353,  379,  222,    2,    3,    4,    5,    6,    7,    8,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   80,   81,   82,   83,  715,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  696,  697,  698,
-  699,  700,  701,  702,  703,  704,  705,  706,  707,  708,
-  709,  710,  711,  712,  713,  714,  252,    0,  234,  429,
-    0,  405,    0,  490,    0,    0,  488,  489,    0,  565,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  639,    0,  616,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  509,  510,  511,  512,
-  513,  514,  515,  516,  517,  518,  519,  520,  521,  522,
-  523,  524,  525,  526,  527,  528,  529,  530,  531,  532,
-  533,  534,  535,  536,  537,  538,  539,  540,  541,  542,
-  543,  544,  545,  546,  547,  548,  549,  550,  551,  552,
-  553,  554,  555,  556,  557,  558,  559,  560,  561,  562,
-  563,  564,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   90,   91,   92,   93,   94,   95,   96,   97,   98,   99,
-  100,  101,  102,    0,    0,    0,    0,   42,   43,   44,
-  153,    0,  125,    0,  744,    0,    0,    0,    0,    0,
-    0,    0,    0,  736,  737,  738,  739,  740,  741,  742,
-  743,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   50,   51,   52,   53,
-   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,
-    0,    0,    0,   84,    0,    0,    0,    0,   79,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  695,    0,
-    0,  483,    0,    0,    0,  480,  481,  482,    0,    0,
-  487,  504,    0,    0,  494,    0,  503,  500,  501,  502,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  508,  677,  688,    0,
-    0,  680,    0,    0,    0,  670,  671,  672,  673,  674,
-  675,  676,    0,    0,    0,    0,    0,  314,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,  302,  303,  304,  305,  306,  307,  474,    0,  464,
-    0,    0,  473,  470,  471,  472,    0,  267,    0,    0,
-    0,    0,  276,  274,  275,  277,  278,  103,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   89,   45,    0,    0,    0,   41,    0,    0,    0,
-    0,    0,    0,  345,  346,  347,  348,    0,    0,    0,
-    0,    0,    0,    0,    0,  735,   64,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   49,    0,    0,  363,    0,    0,  356,  357,  358,
-  359,    0,    0,  387,    0,  382,  383,  384,    0,    0,
-    0,    0,  225,  226,  227,    0,    0,    0,   78,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  694,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  236,  237,  238,  239,  240,  241,
-  242,  243,  244,  245,  246,  247,  248,  249,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  438,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  407,
-  408,  409,  410,  411,  412,  413,  414,  415,  416,  417,
-  418,  419,  420,  421,  422,  423,  424,  425,  426,    0,
-    0,    0,  479,    0,  486,    0,    0,    0,    0,  499,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  507,    0,
-    0,    0,    0,    0,    0,    0,  669,  308,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  290,    0,    0,    0,    0,
-  469,  279,    0,    0,    0,    0,    0,  273,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   88,    0,    0,   40,
-    0,    0,    0,    0,    0,  197,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  159,    0,    0,    0,    0,  127,  128,  129,  130,  131,
-  132,  133,  134,  135,  136,  137,  138,  139,  140,  141,
-  142,  143,  144,  145,  146,  147,  148,  149,  150,  349,
-    0,    0,    0,    0,  344,    0,    0,    0,    0,    0,
-    0,    0,  734,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   48,  360,    0,    0,
-    0,    0,  355,  385,    0,    0,    0,  381,  228,    0,
-    0,    0,  224,   87,   86,   85,  731,  728,  727,  716,
-  718,    0,    0,    0,    0,    0,   27,   28,  722,  723,
-  726,  724,  729,  730,  732,  733,  725,  717,  719,  720,
-  721,  250,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  235,  427,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  406,    0,
-    0,  478,  491,    0,    0,    0,  493,  577,  581,  568,
-  597,  610,  609,  664,  614,  575,  666,  606,  612,  576,
-  566,  567,  584,  573,  605,  574,  587,  572,  586,  585,
-  580,  579,  578,  607,  604,  662,  663,  601,  598,  643,
-  659,  660,  644,  645,  646,  647,  654,  648,  657,  661,
-  650,  655,  651,  656,  649,  653,  652,  658,    0,  642,
-  603,  620,  636,  637,  621,  622,  623,  624,  631,  625,
-  634,  638,  627,  632,  628,  633,  626,  630,  629,  635,
-    0,  619,  596,  599,  613,  570,  608,  571,  600,  589,
-  594,  595,  592,  593,  590,  591,  583,  582,    0,    0,
-    0,   35,   36,  665,  615,  602,  611,  569,  588,    0,
-    0,    0,    0,    0,    0,  668,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  289,    0,    0,    0,  463,    0,    0,    0,
-    0,    0,  283,  266,  107,  113,  111,  110,  112,  108,
-  109,  106,  114,  120,  115,  119,  117,  118,  116,  105,
-  104,  121,   46,   47,  151,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  126,
-    0,    0,    0,  343,  750,  745,  749,  747,  751,  746,
-  748,   69,   73,   77,   67,   71,   70,   66,   65,   72,
-   68,   76,   74,   75,    0,    0,    0,  354,    0,    0,
-  380,    0,    0,  223,   29,   30,   31,   32,   33,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  232,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  403,  484,  485,  505,  506,  498,    0,
-  497,  640,    0,  617,    0,   37,   38,   39,  693,  692,
-    0,  691,  679,  678,  685,  684,    0,  683,  687,  686,
-  335,  312,  313,  334,  318,    0,  317,    0,  337,  333,
-  332,  341,  336,  310,  340,  339,  338,  311,  309,  476,
-  468,    0,  467,  475,  272,  271,    0,  270,  287,  286,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  123,  351,  352,  350,
-  361,  367,  373,  378,  376,  375,  372,  368,  371,  374,
-  369,  377,  370,    0,  366,  362,  386,  391,  397,  401,
-  400,  399,  396,  392,  395,  398,  393,  394,    0,  390,
-  229,  230,  262,  263,  256,  258,  260,  259,  257,  251,
-  264,  255,  253,  254,  261,  433,  435,  436,  456,  461,
-  460,  455,  454,  453,  437,  442,    0,  441,    0,  430,
-  458,  459,  428,  434,  452,  432,  457,  431,  495,    0,
-  641,  618,  689,    0,  681,    0,    0,  315,    0,  326,
-  327,  323,  329,  325,  324,  331,  328,  330,  322,  321,
-  465,    0,  268,    0,  285,  282,  281,  192,  158,  190,
-  156,  201,    0,  200,    0,  188,  182,  193,  194,  185,
-  152,  189,  155,  191,  183,  184,  157,  196,  195,  163,
-  179,  180,  164,  165,  166,  167,  174,  168,  177,  181,
-  170,  175,  171,  176,  169,  173,  172,  178,    0,  162,
-  187,  154,  186,  364,    0,  388,    0,    0,  439,    0,
-  449,  450,  447,  448,  446,  451,  445,  496,  690,  682,
-  319,  316,  466,  269,    0,  198,    0,  213,  211,  220,
-  210,  205,  214,  218,  207,  215,  217,  212,  206,  219,
-  221,  216,  208,  209,  204,  160,    0,  365,  389,  443,
-  440,  202,  199,  161,
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     269,     0,    -1,    -1,   269,   270,    -1,   296,    -1,   302,
+      -1,   317,    -1,   587,    -1,   361,    -1,   380,    -1,   394,
+      -1,   280,    -1,   608,    -1,   420,    -1,   427,    -1,   437,
+      -1,   446,    -1,   477,    -1,   487,    -1,   493,    -1,   507,
+      -1,   571,    -1,   497,    -1,   275,    -1,   355,    -1,     1,
+     263,    -1,     1,   264,    -1,    -1,   272,    -1,   134,   271,
+      -1,   134,   173,   271,    -1,   134,   174,   271,    -1,   134,
+     175,   271,    -1,   134,   176,   271,    -1,   134,   177,   271,
+      -1,    -1,   274,    -1,   134,   273,    -1,   134,    14,   273,
+      -1,   134,    15,   273,    -1,   134,    16,   273,    -1,   122,
+     265,   276,   264,   263,    -1,   276,   277,    -1,   277,    -1,
+     278,    -1,   279,    -1,     1,   263,    -1,   121,   266,   156,
+     263,    -1,   151,   266,   156,   263,    -1,   181,   265,   281,
+     264,   263,    -1,   281,   282,    -1,   282,    -1,   285,    -1,
+     292,    -1,   295,    -1,   287,    -1,   288,    -1,   289,    -1,
+     290,    -1,   291,    -1,   294,    -1,   284,    -1,   293,    -1,
+     286,    -1,   283,    -1,     1,   263,    -1,   170,   266,   156,
+     263,    -1,   168,   266,   156,   263,    -1,   123,   266,   156,
+     263,    -1,   184,   266,   156,   263,    -1,    37,   266,   156,
+     263,    -1,   126,   266,   156,   263,    -1,   125,   266,   156,
+     263,    -1,   183,   266,   156,   263,    -1,    78,   266,   156,
+     263,    -1,   257,   266,   156,   263,    -1,   258,   266,   156,
+     263,    -1,   229,   266,   134,   263,    -1,    87,   266,   199,
+     263,    -1,     5,   265,   297,   264,   263,    -1,   297,   298,
+      -1,   298,    -1,   299,    -1,   301,    -1,   300,    -1,     1,
+     263,    -1,   123,   266,   156,   263,    -1,    48,   266,   156,
+     263,    -1,    37,   266,   156,   263,    -1,   106,   265,   303,
+     264,   263,    -1,   303,   304,    -1,   304,    -1,   305,    -1,
+     306,    -1,   315,    -1,   316,    -1,   307,    -1,   309,    -1,
+     311,    -1,   312,    -1,   314,    -1,   310,    -1,   313,    -1,
+     308,    -1,     1,   263,    -1,   221,   266,   156,   263,    -1,
+     141,   266,   156,   263,    -1,    64,   266,   156,   263,    -1,
+      57,   266,   156,   263,    -1,    62,   266,   156,   263,    -1,
+      63,   266,   156,   263,    -1,    60,   266,   156,   263,    -1,
+      59,   266,   156,   263,    -1,    61,   266,   156,   263,    -1,
+      58,   266,   156,   263,    -1,   107,   266,   222,   263,    -1,
+     107,   266,   224,   263,    -1,   107,   266,   228,   263,    -1,
+     107,   266,   226,   263,    -1,   107,   266,   227,   263,    -1,
+     107,   266,   225,   263,    -1,   107,   266,   223,   263,    -1,
+     255,   266,   199,   263,    -1,    -1,   139,   318,   319,   265,
+     320,   264,   263,    -1,    -1,   323,    -1,   320,   321,    -1,
+     321,    -1,   322,    -1,   324,    -1,   325,    -1,   344,    -1,
+     345,    -1,   329,    -1,   328,    -1,   333,    -1,   334,    -1,
+     336,    -1,   337,    -1,   338,    -1,   339,    -1,   340,    -1,
+     335,    -1,   341,    -1,   342,    -1,   343,    -1,   346,    -1,
+     347,    -1,   326,    -1,   327,    -1,   348,    -1,     1,   263,
+      -1,   123,   266,   156,   263,    -1,   156,    -1,   249,   266,
+     156,   263,    -1,   150,   266,   156,   263,    -1,    50,   266,
+     199,   263,    -1,   169,   266,   156,   263,    -1,    26,   266,
+     156,   263,    -1,    -1,   237,   330,   266,   331,   263,    -1,
+     331,   267,   332,    -1,   332,    -1,   206,    -1,   209,    -1,
+     210,    -1,   212,    -1,   213,    -1,   216,    -1,   234,    -1,
+     230,    -1,   232,    -1,   238,    -1,   235,    -1,   215,    -1,
+     231,    -1,   233,    -1,   217,    -1,   241,    -1,   207,    -1,
+     208,    -1,   220,    -1,   188,    -1,    74,   266,   199,   263,
+      -1,   164,   266,   199,   263,    -1,   165,   266,   199,   263,
+      -1,    95,   266,   199,   263,    -1,   259,   266,   199,   263,
+      -1,   248,   266,   199,   263,    -1,    67,   266,   199,   263,
+      -1,   128,   266,   199,   263,    -1,    38,   266,   199,   263,
+      -1,   162,   266,   199,   263,    -1,     5,   266,   199,   263,
+      -1,    80,   266,   199,   263,    -1,    82,   266,   199,   263,
+      -1,   231,   266,   199,   263,    -1,   188,   266,   199,   263,
+      -1,    -1,    55,   349,   266,   350,   263,    -1,   350,   267,
+     351,    -1,   351,    -1,    -1,   133,   352,   354,    -1,    -1,
+     353,   354,    -1,    74,    -1,   164,    -1,    95,    -1,   248,
+      -1,   259,    -1,    67,    -1,    38,    -1,   162,    -1,     5,
+      -1,    80,    -1,   128,    -1,   231,    -1,   144,    -1,    82,
+      -1,   165,    -1,    50,    -1,   188,    -1,    -1,   262,   356,
+     265,   357,   264,   263,    -1,   357,   358,    -1,   358,    -1,
+     359,    -1,   360,    -1,     1,   263,    -1,    86,   266,   156,
+     263,    -1,   150,   266,   156,   263,    -1,    -1,    26,   362,
+     363,   265,   364,   264,   263,    -1,    -1,   367,    -1,   364,
+     365,    -1,   365,    -1,   366,    -1,   377,    -1,   378,    -1,
+     368,    -1,   369,    -1,   379,    -1,   370,    -1,   371,    -1,
+     372,    -1,   373,    -1,   374,    -1,   375,    -1,   376,    -1,
+       1,   263,    -1,   123,   266,   156,   263,    -1,   156,    -1,
+     153,   266,   272,   263,    -1,   154,   266,   272,   263,    -1,
+     137,   266,   134,   263,    -1,    30,   266,   272,   263,    -1,
+     116,   266,   134,   263,    -1,   111,   266,   134,   263,    -1,
+     113,   266,   134,   263,    -1,   112,   266,   134,   263,    -1,
+     178,   266,   274,   263,    -1,    23,   266,   134,   263,    -1,
+      24,   266,   134,   263,    -1,   136,   266,   134,   263,    -1,
+      -1,   104,   381,   265,   386,   264,   263,    -1,    -1,    55,
+     383,   266,   384,   263,    -1,   384,   267,   385,    -1,   385,
+      -1,   236,    -1,    79,    -1,   386,   387,    -1,   387,    -1,
+     388,    -1,   382,    -1,   392,    -1,   393,    -1,     1,   263,
+      -1,    -1,   155,   266,   390,   389,   263,    -1,   390,   267,
+     391,    -1,   391,    -1,   134,    -1,   134,   204,   134,    -1,
+      92,   266,   156,   263,    -1,    86,   266,   156,   263,    -1,
+      -1,    75,   395,   265,   396,   264,   263,    -1,   396,   397,
+      -1,   397,    -1,   398,    -1,   399,    -1,   401,    -1,   403,
+      -1,   410,    -1,   411,    -1,   412,    -1,   414,    -1,   415,
+      -1,   416,    -1,   400,    -1,   417,    -1,   418,    -1,   413,
+      -1,   419,    -1,   402,    -1,     1,   263,    -1,   249,   266,
+     156,   263,    -1,   150,   266,   156,   263,    -1,   193,   266,
+     199,   263,    -1,    26,   266,   156,   263,    -1,    50,   266,
+     199,   263,    -1,    -1,    55,   404,   266,   405,   263,    -1,
+     405,   267,   406,    -1,   406,    -1,    -1,   133,   407,   409,
+      -1,    -1,   408,   409,    -1,   193,    -1,    51,    -1,    96,
+      -1,    76,    -1,    20,    -1,    21,    -1,   132,    -1,    69,
+      -1,   172,    -1,   124,    -1,    96,   266,   199,   263,    -1,
+      76,   266,   199,   263,    -1,    51,   266,   199,   263,    -1,
+      20,   266,   199,   263,    -1,   132,   266,   199,   263,    -1,
+      69,   266,   199,   263,    -1,   192,   266,   156,   263,    -1,
+     160,   266,   156,   263,    -1,   159,   266,   134,   263,    -1,
+     124,   266,   199,   263,    -1,    -1,   171,   421,   265,   422,
+     264,   263,    -1,   422,   423,    -1,   423,    -1,   424,    -1,
+     425,    -1,   426,    -1,     1,   263,    -1,   158,   266,   156,
+     263,    -1,    22,   266,   156,   263,    -1,   127,   266,   156,
+     263,    -1,    -1,   186,   428,   265,   429,   264,   263,    -1,
+     429,   430,    -1,   430,    -1,   431,    -1,   432,    -1,   433,
+      -1,     1,   263,    -1,   123,   266,   156,   263,    -1,   249,
+     266,   156,   263,    -1,    -1,   189,   434,   266,   435,   263,
+      -1,   435,   267,   436,    -1,   436,    -1,    95,    -1,   245,
+      -1,   248,    -1,   259,    -1,   246,    -1,   240,    -1,   171,
+      -1,   247,    -1,   239,    -1,   220,    -1,   250,    -1,   205,
+      -1,    -1,   187,   438,   265,   439,   264,   263,    -1,   439,
+     440,    -1,   440,    -1,   441,    -1,   442,    -1,     1,   263,
+      -1,   123,   266,   156,   263,    -1,    -1,   189,   443,   266,
+     444,   263,    -1,   444,   267,   445,    -1,   445,    -1,    95,
+      -1,   245,    -1,   248,    -1,   259,    -1,   246,    -1,   240,
+      -1,   171,    -1,   247,    -1,   239,    -1,   220,    -1,   205,
+      -1,    -1,    29,   447,   448,   265,   449,   264,   263,    -1,
+      -1,   452,    -1,   449,   450,    -1,   450,    -1,   451,    -1,
+     453,    -1,   454,    -1,   455,    -1,   456,    -1,   458,    -1,
+     457,    -1,   459,    -1,   460,    -1,   473,    -1,   474,    -1,
+     475,    -1,   471,    -1,   468,    -1,   470,    -1,   469,    -1,
+     467,    -1,   476,    -1,   472,    -1,     1,   263,    -1,   123,
+     266,   156,   263,    -1,   156,    -1,    86,   266,   156,   263,
+      -1,   257,   266,   156,   263,    -1,   179,   266,   156,   263,
+      -1,     3,   266,   156,   263,    -1,   155,   266,   134,   263,
+      -1,     6,   266,   218,   263,    -1,     6,   266,   219,   263,
+      -1,    54,   266,   156,   263,    -1,    -1,    55,   461,   266,
+     462,   263,    -1,   462,   267,   463,    -1,   463,    -1,    -1,
+     133,   464,   466,    -1,    -1,   465,   466,    -1,   101,    -1,
+      27,    -1,    31,    -1,    10,    -1,    12,    -1,   243,    -1,
+     169,   266,   156,   263,    -1,    50,   266,   199,   263,    -1,
+      31,   266,   199,   263,    -1,    27,   266,   199,   263,    -1,
+      10,   266,   199,   263,    -1,   243,   266,   199,   263,    -1,
+      88,   266,   156,   263,    -1,   102,   266,   156,   263,    -1,
+      26,   266,   156,   263,    -1,    25,   266,   156,   263,    -1,
+      -1,    93,   478,   265,   483,   264,   263,    -1,    -1,   189,
+     480,   266,   481,   263,    -1,   481,   267,   482,    -1,   482,
+      -1,   161,    -1,   483,   484,    -1,   484,    -1,   485,    -1,
+     486,    -1,   479,    -1,     1,    -1,   249,   266,   156,   263,
+      -1,   158,   266,   156,   263,    -1,    -1,    36,   488,   265,
+     489,   264,   263,    -1,   489,   490,    -1,   490,    -1,   491,
+      -1,   492,    -1,     1,    -1,    92,   266,   156,   263,    -1,
+     158,   266,   156,   263,    -1,    52,   265,   494,   264,   263,
+      -1,   494,   495,    -1,   495,    -1,   496,    -1,     1,    -1,
+      92,   266,   156,   263,    -1,    -1,    65,   498,   265,   503,
+     264,   263,    -1,    -1,   189,   500,   266,   501,   263,    -1,
+     501,   267,   502,    -1,   502,    -1,   161,    -1,   503,   504,
+      -1,   504,    -1,   505,    -1,   506,    -1,   499,    -1,     1,
+      -1,   123,   266,   156,   263,    -1,   158,   266,   156,   263,
+      -1,    66,   265,   508,   264,   263,    -1,   508,   509,    -1,
+     509,    -1,   517,    -1,   518,    -1,   520,    -1,   521,    -1,
+     522,    -1,   523,    -1,   524,    -1,   525,    -1,   526,    -1,
+     527,    -1,   516,    -1,   529,    -1,   530,    -1,   531,    -1,
+     532,    -1,   548,    -1,   534,    -1,   536,    -1,   538,    -1,
+     537,    -1,   541,    -1,   535,    -1,   542,    -1,   543,    -1,
+     544,    -1,   545,    -1,   547,    -1,   546,    -1,   562,    -1,
+     549,    -1,   553,    -1,   554,    -1,   558,    -1,   539,    -1,
+     540,    -1,   568,    -1,   566,    -1,   567,    -1,   550,    -1,
+     519,    -1,   551,    -1,   552,    -1,   569,    -1,   557,    -1,
+     528,    -1,   570,    -1,   555,    -1,   556,    -1,   512,    -1,
+     515,    -1,   510,    -1,   511,    -1,   513,    -1,   514,    -1,
+     533,    -1,     1,    -1,    72,   266,   134,   263,    -1,    73,
+     266,   134,   263,    -1,    12,   266,   199,   263,    -1,   256,
+     266,   199,   263,    -1,   163,   266,   272,   263,    -1,   185,
+     266,   199,   263,    -1,    94,   266,   134,   263,    -1,    85,
+     266,   199,   263,    -1,    90,   266,   199,   263,    -1,    43,
+     266,   199,   263,    -1,    53,   266,   199,   263,    -1,     8,
+     266,   199,   263,    -1,   115,   266,   272,   263,    -1,   114,
+     266,   134,   263,    -1,   108,   266,   134,   263,    -1,     9,
+     266,   272,   263,    -1,   203,   266,   272,   263,    -1,   202,
+     266,   272,   263,    -1,    77,   266,   134,   263,    -1,    98,
+     266,   199,   263,    -1,    97,   266,   156,   263,    -1,    91,
+     266,   199,   263,    -1,   261,   266,   199,   263,    -1,   194,
+     266,   199,   263,    -1,   197,   266,   199,   263,    -1,   198,
+     266,   199,   263,    -1,   196,   266,   199,   263,    -1,   196,
+     266,   200,   263,    -1,   195,   266,   199,   263,    -1,   195,
+     266,   200,   263,    -1,   148,   266,   272,   263,    -1,    19,
+     266,   272,   263,    -1,   140,   266,   199,   263,    -1,   149,
+     266,   272,   263,    -1,   190,   266,   199,   263,    -1,   131,
+     266,   199,   263,    -1,   244,   266,   199,   263,    -1,   143,
+     266,   199,   263,    -1,   118,   266,   156,   263,    -1,    89,
+     266,   272,   263,    -1,    45,   266,   134,   263,    -1,   117,
+     266,   134,   263,    -1,   182,   266,   156,   263,    -1,    32,
+     266,   156,   263,    -1,    28,   266,   134,   263,    -1,   251,
+     266,   199,   263,    -1,    47,   266,   156,   263,    -1,   152,
+     266,   199,   263,    -1,    39,   266,   199,   263,    -1,   242,
+     266,   272,   263,    -1,    -1,   145,   559,   266,   560,   263,
+      -1,   560,   267,   561,    -1,   561,    -1,   206,    -1,   209,
+      -1,   210,    -1,   212,    -1,   213,    -1,   216,    -1,   234,
+      -1,   230,    -1,   232,    -1,   238,    -1,   235,    -1,   215,
+      -1,   231,    -1,   233,    -1,   217,    -1,   241,    -1,   207,
+      -1,   208,    -1,   220,    -1,    -1,   142,   563,   266,   564,
+     263,    -1,   564,   267,   565,    -1,   565,    -1,   206,    -1,
+     209,    -1,   210,    -1,   212,    -1,   213,    -1,   216,    -1,
+     234,    -1,   230,    -1,   232,    -1,   238,    -1,   235,    -1,
+     215,    -1,   231,    -1,   233,    -1,   217,    -1,   241,    -1,
+     207,    -1,   208,    -1,   220,    -1,   188,    -1,   119,   266,
+     134,   263,    -1,   120,   266,   134,   263,    -1,    33,   266,
+     134,   263,    -1,   211,   266,   274,   263,    -1,    44,   266,
+     199,   263,    -1,    -1,    68,   572,   265,   573,   264,   263,
+      -1,   573,   574,    -1,   574,    -1,   575,    -1,   576,    -1,
+     577,    -1,   581,    -1,   582,    -1,   583,    -1,     1,    -1,
+      49,   266,   199,   263,    -1,    46,   266,   272,   263,    -1,
+      -1,   106,   578,   266,   579,   263,    -1,   579,   267,   580,
+      -1,   580,    -1,   201,    -1,    11,    -1,   249,   266,   156,
+     263,    -1,   123,   266,   156,   263,    -1,    -1,     4,   584,
+     266,   585,   263,    -1,   585,   267,   586,    -1,   586,    -1,
+     201,    -1,    11,    -1,    22,   265,   588,   264,   263,    -1,
+     588,   589,    -1,   589,    -1,   592,    -1,   593,    -1,   594,
+      -1,   595,    -1,   600,    -1,   596,    -1,   597,    -1,   598,
+      -1,   599,    -1,   601,    -1,   602,    -1,   603,    -1,   591,
+      -1,   604,    -1,   605,    -1,   606,    -1,   607,    -1,   590,
+      -1,     1,    -1,    40,   266,   199,   263,    -1,   166,   266,
+     199,   263,    -1,    42,   266,   199,   263,    -1,   252,   266,
+     199,   263,    -1,   253,   266,   199,   263,    -1,   254,   266,
+     199,   263,    -1,    99,   266,   272,   263,    -1,   100,   266,
+     272,   263,    -1,   110,   266,   134,   263,    -1,   157,   266,
+     199,   263,    -1,   109,   266,   134,   263,    -1,    35,   266,
+     134,   263,    -1,    34,   266,   134,   263,    -1,   129,   266,
+     199,   263,    -1,   130,   266,   199,   263,    -1,    13,   266,
+     199,   263,    -1,   146,   266,   134,   263,    -1,   147,   266,
+     272,   263,    -1,   180,   265,   609,   264,   263,    -1,   609,
+     610,    -1,   610,    -1,   611,    -1,   612,    -1,   614,    -1,
+     616,    -1,   615,    -1,   613,    -1,   617,    -1,     1,    -1,
+      56,   266,   199,   263,    -1,    84,   266,   199,   263,    -1,
+      81,   266,   156,   263,    -1,   103,   266,   272,   263,    -1,
+      79,   266,   199,   263,    -1,    41,   266,   199,   263,    -1,
+      83,   266,   199,   263,    -1
 };
-const short yydgoto[] = {                                       1,
-  917,  918, 1072, 1073,   24,   25,   26,   27,   28,   29,
-   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-   40,   41,   42,   43,   44,   45,  277,  278,  279,  280,
-  316,  317,  318,  319,  320,  321,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,   73,   74,   75,   76,   77,
-  260,  261,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  282,   62,  835,  283,  836,  837,
-  838,  839,  840,  841,  842,  843,  844,  845,  846,  847,
-  848,  849,  850,  851,  852,  853,  854,  855,  856,  857,
-  858,  859, 1155, 1459, 1460, 1140, 1423, 1424, 1505, 1485,
- 1425,   68,  582,  583,  584,  585,  118,   50,  624,  119,
-  625,  626,  627,  628,  629,  630,  631,  632,  633,  634,
-  635,  636,  637,  638,   59,  502,  503,  783, 1287, 1288,
-  504,  505,  506,  507, 1112, 1293, 1113,   57,  470,  471,
-  472,  473,  474,  475,  476,  477,  478,  479,  480,  481,
-  482,  483,  484,  485,  486,  487,  763, 1266, 1267, 1410,
- 1397, 1268,   63,  533,  534,  535,  536,  537,   66,  567,
-  568,  569,  570,  571,  890, 1334, 1335,   67,  575,  576,
-  577,  578,  896, 1349, 1350,  121,   51,  659,  122,  660,
-  661,  662,  663,  664,  665,  666,  667,  668,  669,  670,
-  671,  672,  673,  674,  675,  676,  677,  678,  679,  958,
- 1377, 1378, 1477, 1468, 1379,   58,  492,  493,  778, 1282,
- 1283,  494,  495,  496,   52,  365,  366,  367,  368,  126,
-  127,  128,   54,  376,  377,  688, 1240, 1241,  378,  379,
-  380,  186,  187,  188,  189,  190,  191,  192,  193,  194,
-  195,  196,  197,  198,  199,  200,  201,  202,  203,  204,
-  205,  206,  207,  208,  209,  210,  211,  212,  213,  214,
-  215,  216,  217,  218,  219,  220,  221,  222,  223,  224,
-  225,  226,  227,  228,  229,  230,  231,  232,  233,  234,
-  235,  236,  237,  238,  239,  240,  241,  242,  415, 1051,
- 1052,  413, 1029, 1030,   56,  445,  446,  447,  448,  449,
-  450,  451,  452,  753, 1257, 1258,  750, 1251, 1252,   97,
-   98,   99,  100,  101,  102,  103,  104,  105,  106,  107,
-  108,  109,  110,  111,  112,  113,  114,  115,  116,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   400,   400,   401,   404,   405,   406,   407,   408,   409,
+     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   430,   430,   431,
+     435,   439,   443,   447,   451,   457,   457,   458,   459,   460,
+     461,   468,   471,   471,   472,   472,   472,   474,   491,   502,
+     505,   506,   507,   507,   508,   508,   509,   509,   510,   510,
+     511,   512,   512,   513,   513,   514,   516,   550,   610,   624,
+     639,   648,   662,   671,   680,   689,   717,   747,   770,   820,
+     822,   822,   823,   823,   824,   824,   826,   835,   844,   857,
+     859,   860,   862,   862,   863,   864,   864,   865,   865,   866,
+     866,   867,   867,   868,   869,   871,   875,   879,   886,   893,
+     900,   907,   914,   921,   928,   935,   939,   943,   947,   951,
+     955,   959,   965,   975,   974,  1068,  1068,  1069,  1069,  1070,
+    1070,  1070,  1070,  1071,  1071,  1072,  1072,  1072,  1073,  1073,
+    1073,  1074,  1074,  1074,  1075,  1075,  1075,  1075,  1075,  1076,
+    1076,  1077,  1077,  1079,  1091,  1103,  1137,  1149,  1160,  1202,
+    1212,  1211,  1217,  1217,  1218,  1222,  1226,  1230,  1234,  1238,
+    1242,  1246,  1250,  1254,  1258,  1262,  1266,  1270,  1274,  1278,
+    1282,  1286,  1290,  1294,  1300,  1311,  1322,  1333,  1344,  1355,
+    1366,  1377,  1388,  1399,  1410,  1421,  1432,  1443,  1454,  1466,
+    1465,  1469,  1469,  1470,  1470,  1471,  1471,  1473,  1480,  1487,
+    1494,  1501,  1508,  1515,  1522,  1529,  1536,  1543,  1550,  1557,
+    1564,  1571,  1578,  1585,  1598,  1597,  1613,  1613,  1614,  1614,
+    1614,  1616,  1625,  1641,  1640,  1690,  1690,  1692,  1692,  1693,
+    1694,  1694,  1695,  1696,  1697,  1698,  1699,  1700,  1701,  1702,
+    1703,  1704,  1705,  1707,  1716,  1725,  1731,  1737,  1743,  1749,
+    1755,  1761,  1767,  1773,  1779,  1785,  1791,  1801,  1800,  1817,
+    1816,  1821,  1821,  1822,  1826,  1832,  1832,  1833,  1833,  1833,
+    1833,  1833,  1835,  1835,  1837,  1837,  1839,  1853,  1873,  1882,
+    1895,  1894,  1963,  1963,  1964,  1964,  1964,  1964,  1965,  1965,
+    1966,  1966,  1966,  1967,  1967,  1968,  1968,  1968,  1969,  1969,
+    1969,  1971,  2008,  2021,  2032,  2041,  2053,  2052,  2056,  2056,
+    2057,  2057,  2058,  2058,  2060,  2068,  2075,  2082,  2089,  2096,
+    2103,  2110,  2117,  2124,  2133,  2144,  2155,  2166,  2177,  2188,
+    2200,  2219,  2229,  2238,  2254,  2253,  2269,  2269,  2270,  2270,
+    2270,  2270,  2272,  2281,  2296,  2310,  2309,  2325,  2325,  2326,
+    2326,  2326,  2326,  2328,  2337,  2360,  2359,  2365,  2365,  2366,
+    2370,  2374,  2378,  2382,  2386,  2390,  2394,  2398,  2402,  2406,
+    2410,  2420,  2419,  2436,  2436,  2437,  2437,  2437,  2439,  2446,
+    2445,  2451,  2451,  2452,  2456,  2460,  2464,  2468,  2472,  2476,
+    2480,  2484,  2488,  2492,  2502,  2501,  2647,  2647,  2648,  2648,
+    2649,  2649,  2649,  2650,  2650,  2651,  2651,  2652,  2652,  2652,
+    2653,  2653,  2653,  2654,  2654,  2654,  2655,  2655,  2656,  2656,
+    2658,  2670,  2682,  2691,  2717,  2735,  2753,  2759,  2763,  2771,
+    2781,  2780,  2784,  2784,  2785,  2785,  2786,  2786,  2788,  2795,
+    2806,  2813,  2820,  2827,  2837,  2878,  2889,  2900,  2915,  2926,
+    2937,  2950,  2963,  2972,  3008,  3007,  3072,  3071,  3075,  3075,
+    3076,  3082,  3082,  3083,  3083,  3083,  3083,  3085,  3104,  3114,
+    3113,  3135,  3135,  3136,  3136,  3136,  3138,  3147,  3159,  3161,
+    3161,  3162,  3162,  3164,  3186,  3185,  3228,  3227,  3231,  3231,
+    3232,  3238,  3238,  3239,  3239,  3239,  3239,  3241,  3247,  3256,
+    3259,  3259,  3260,  3260,  3261,  3261,  3262,  3262,  3263,  3263,
+    3264,  3264,  3265,  3265,  3266,  3266,  3267,  3267,  3268,  3268,
+    3269,  3269,  3270,  3270,  3271,  3271,  3272,  3272,  3273,  3273,
+    3274,  3274,  3275,  3275,  3276,  3276,  3277,  3277,  3278,  3278,
+    3279,  3279,  3280,  3281,  3281,  3282,  3282,  3283,  3283,  3284,
+    3284,  3285,  3285,  3286,  3286,  3287,  3287,  3288,  3292,  3297,
+    3302,  3307,  3312,  3317,  3322,  3327,  3332,  3337,  3342,  3347,
+    3352,  3357,  3362,  3367,  3372,  3377,  3383,  3394,  3399,  3408,
+    3413,  3418,  3423,  3428,  3433,  3436,  3441,  3444,  3449,  3454,
+    3459,  3464,  3469,  3474,  3479,  3484,  3489,  3500,  3505,  3510,
+    3515,  3524,  3556,  3574,  3579,  3588,  3593,  3598,  3604,  3603,
+    3608,  3608,  3609,  3612,  3615,  3618,  3621,  3624,  3627,  3630,
+    3633,  3636,  3639,  3642,  3645,  3648,  3651,  3654,  3657,  3660,
+    3663,  3669,  3668,  3673,  3673,  3674,  3677,  3680,  3683,  3686,
+    3689,  3692,  3695,  3698,  3701,  3704,  3707,  3710,  3713,  3716,
+    3719,  3722,  3725,  3728,  3731,  3736,  3741,  3746,  3751,  3756,
+    3765,  3764,  3788,  3788,  3789,  3790,  3791,  3792,  3793,  3794,
+    3795,  3797,  3803,  3810,  3809,  3814,  3814,  3815,  3819,  3825,
+    3859,  3869,  3868,  3918,  3918,  3919,  3923,  3932,  3935,  3935,
+    3936,  3936,  3937,  3937,  3938,  3938,  3939,  3939,  3940,  3940,
+    3941,  3942,  3942,  3943,  3943,  3944,  3944,  3945,  3945,  3947,
+    3952,  3957,  3962,  3967,  3972,  3977,  3982,  3987,  3992,  3997,
+    4002,  4007,  4012,  4017,  4022,  4027,  4032,  4040,  4043,  4043,
+    4044,  4044,  4045,  4046,  4047,  4047,  4048,  4049,  4051,  4057,
+    4063,  4072,  4086,  4092,  4098
 };
-const short yysindex[] = {                                      0,
-  320,  -40,  -95,  -77,    0,    0,    0,  -74,    0,  -69,
-    0,    0,    0,    0,  -66,  -60,    0,    0,  -55,  -53,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0, -247,  720, -386,
- -314,  -22, -222,   -2,  425,    8,   10,   15,   25, -205,
- -236, -287,   39,  234,  121,   59,   68,   70,  100,  117,
-  140,  142, -119,    0,    0,    0,    0,    0,  149,  150,
-  157,  159,  163,  167,  177,  180,  183,  184,  187,  199,
-  204,  210,  236,  239,  242,  244,  111,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  188,    0,    0,
-  189,    0, -231,    0,  245, -103,    0,    0, -216,    0,
-  252,  257,  258,  259,  264,  270,  280,  281,  285,  286,
-  287,  289,  292,  293,  294,  296,  297,  298,  300,  301,
-  302,  303,  304,  308,  310,  311,  312,  318,  324,  328,
-  334,  335,    0,  337,    0,  340,  342,  352,  353,  355,
-  356,  364,  367,  368,  369,  370,  380,  381,  382,  383,
-  384,  388,  391,  396,  400, -122,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, -241,  715, -246,   51,  404,  405,  406,  407,
-  412,  415,  416,  418,  419,  420,  421,  422,  424,  -25,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  428,  427,  430, -109,    0,    0,    0,
-    0,  317,    0, -226,    0,  435,  436,  441,  442,  443,
-  444,  448,  213,    0,    0,    0,    0,    0,    0,    0,
-    0,  451,  452,  454,  455,  457,  458,  459,  460,  463,
-  464,  465,  466,  467,  469,  -56,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- -209, -227, -224,    0,   79,  123,  124,  479,    0,   96,
-  164,  166,  102,  103,  169,  169,  174,  176,  112,  113,
-  185,  169,  115,  131,  133,  134,  135,  524,    0,  170,
-  646,    0,  528,  532, -114,    0,    0,    0,  191,  535,
-    0,    0,  534,  536,    0, -104,    0,    0,    0,    0,
-  154,  169,  155,  169,  221,  201,  224,  160,  161,  162,
-  228,  211,  172,  232,  240,  241,  181,  169,  190,  192,
-  247,  220,  193,  248,  249,  169,  250,  238,  256,  262,
-  198,  202,  591,  203,  604,  169,  169,  217,  169,  261,
-  219,  222,  223, -418, -280,  226,  229,  169,  169,  278,
-  169,  230,  237,  251,  253,  609,    0,    0,    0,  613,
-  616,    0,  628,  631,  -44,    0,    0,    0,    0,    0,
-    0,    0,  614,  633,  634,  636,  639,    0,  642,  644,
-  647,  649,  654,  655,  656,  658,  659,  660,  664,  128,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  666,    0,
-  667, -111,    0,    0,    0,    0,  626,    0,  669,  670,
-  672, -107,    0,    0,    0,    0,    0,    0,  325,  326,
-  327,  329,  330,  331,  332,  333,  182,  336,  338,  291,
-  675,    0,    0,  339,  343,  679,    0,  559,  691,  697,
-  698,  701, -113,    0,    0,    0,    0,  313,  314,  319,
-  361,  321,  322,  169,  719,    0,    0,  372,  375,  347,
-  376,  378,  385,  392,  393,  394,  398,  401,  399,  402,
-  721,    0,  731,  718,    0,  730,  -99,    0,    0,    0,
-    0,  733,  740,    0,  -98,    0,    0,    0,  747,  750,
-  752, -121,    0,    0,    0,  755,  757,  758,    0,  761,
-  764,  766,  770,  771,   -8,  773,  774,  775,  776,  778,
-  779,  781,  782,  784,  785,  786,  787,  788,    0,  789,
-  791,  792,  793,  794,  795,  796,  797,  798,  799,  801,
-  804,  809,  810,  215,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  790,  811,
-  818,  823,  824,  825,  827,  828,  830,  831,    0,  833,
-  835,  836,  837,  838,  839,  840,  843,  844,  130,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  456,
-  497,  850,    0,  852,    0,  502,  503,  853,  856,    0,
-  858,  859,  860,  861,  863,  865,  870,  873,  874,  875,
-  878,  879,  880,  883,  884,  885,  887,  888,  889,  890,
-  892,  894,  897,  898,  900,  903,  905,  906,  907,  908,
-  909,  910,  722,  911,  769,  913,  915,  920,  921,  922,
-  924,  925,  926,  931,  932,  933,  934,  935,  937,  938,
-  939, -204,  940,  941,  944,  945,  946,  948,    0,  949,
-  169,  558,  951,  603,  605,  958,    0,    0,  565,  611,
-  572,  574,  967,  576,  577,  578,  579,  580,  625,  648,
-  629,  637,  581,  638,  982,    0,  641,  985,  643,  990,
-    0,    0,  991,  650,  653,  668,  995,    0,  998,  999,
- 1000, 1005, 1008, 1009, 1011, 1016, 1017, 1018, 1019, 1021,
- 1022, 1023, 1026, 1028, 1029, 1030,    0, 1031, 1032,    0,
- 1033, 1034, 1035, 1036, 1037,    0, 1038, 1039, 1046, 1047,
- 1049, 1054, 1056, 1057, 1061, 1062, 1063, 1066, 1069, 1071,
-    0, 1072, 1073, 1074,  -67,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  684,  728,  729, 1082,    0, 1083, 1085, 1086, 1087, 1088,
- 1089, 1090,    0, 1091, 1093, 1094, 1095, 1096, 1097, 1099,
- 1100, 1101, 1104, 1105, 1106, 1107,    0,    0,  759, 1111,
-  763, 1108,    0,    0,  765, 1113, 1109,    0,    0,  777,
-  802, 1121,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  169,  169,  169,  169,  169,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  806,  807,  169,  812,  813,  814,  815,  803,
-  816,  817,  169,  169,  278, 1122,    0,    0,  832, -285,
-  744,  834,  841,  745,  746,  762,  842, 1155,  849,  867,
-  868,  871,  846,  872,  876,  767,  877, 1160,    0, 1162,
- 1163,    0,    0, 1164, 1165,  822,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  -21,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   -3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  278,  278,
-  278,    0,    0,    0,    0,    0,    0,    0,    0, -260,
- 1166, 1182, -257, 1186, 1187,    0, 1188, 1189, 1190, 1191,
-  886, 1201, 1203, 1204, 1211, 1221, 1224, 1225, 1226, 1229,
- 1236, 1237,    0, 1239,  891, 1240,    0, -320, 1242, 1243,
-  845, 1260,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  854,  895,  855,  857, 1248,
-  862,  864,  866,  869,  881,  901,  882,  902,  893,  896,
-  899,  904,  912,  914, 1252,  916,  917,  918, 1257,    0,
- 1259, 1261, 1262,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, 1264,  612, 1265,    0, 1266,  677,
-    0, 1267, 1269,    0,    0,    0,    0,    0,    0, 1270,
- 1271, 1272, 1273, 1274, 1277, 1278, 1279, 1280, 1281, 1282,
- 1283, 1284,    0, 1285, 1286, 1288, 1289, 1291, 1292, 1294,
- 1295, 1296, 1297,  970, 1299, 1300, 1301, 1302, 1303, 1304,
- 1305, 1307, 1309,    0,    0,    0,    0,    0,    0,    1,
-    0,    0,  722,    0,  769,    0,    0,    0,    0,    0,
-   23,    0,    0,    0,    0,    0,   31,    0,    0,    0,
-    0,    0,    0,    0,    0,   33,    0, -232,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   35,    0,    0,    0,    0,   36,    0,    0,    0,
-  984,  668, 1311, 1314, 1315, 1316, 1317,  992, 1318, 1319,
- 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330,
- 1331, 1332,  805, 1333, 1334, 1335,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   43,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   44,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   45,    0, -233,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  822,
-    0,    0,    0, -260,    0, -257, -232,    0,  886,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  891,    0, -320,    0,    0,    0,    0,    0,    0,
-    0,    0,   55,    0,  365,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   61,    0,
-    0,    0,    0,    0,  612,    0,  677, -233,    0,  970,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  365,    0,  992,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  805,    0,    0,    0,
-    0,    0,    0,    0,
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
+  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
+  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
+  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CAN_IDLE",
+  "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE",
+  "CLASS", "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ",
+  "CRYPTLINK", "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
+  "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
+  "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
+  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
+  "DOT_IN_IP6_ADDR", "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL",
+  "ENABLE", "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
+  "FAKENAME", "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
+  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
+  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
+  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
+  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF",
+  "HELP_CHANNEL", "HIDDEN", "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER",
+  "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB",
+  "HUB_MASK", "IDLETIME", "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP",
+  "KILL", "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
+  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LAZYLINK",
+  "LEAF_MASK", "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL",
+  "MAX_ACCEPT", "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL",
+  "MAX_IDENT", "MAX_LOCAL", "MAX_NICK_CHANGES", "MAX_NICK_TIME",
+  "MAX_NUMBER", "MAX_TARGETS", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
+  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
+  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
+  "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
+  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
+  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
+  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
+  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
+  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
+  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
+  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
+  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
+  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "RESV", "RESV_EXEMPT",
+  "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD",
+  "SERVERHIDE", "SERVERINFO", "SERVLINK_PATH", "SERVICES_NAME", "IRCD_SID",
+  "TKLINE_EXPIRE_NOTICES", "T_SHARED", "T_CLUSTER", "T_SNOOP", "TYPE",
+  "SHORT_MOTD", "SILENT", "SPOOF", "SPOOF_NOTICE", "STATS_E_DISABLED",
+  "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY",
+  "STATS_P_OPER_ONLY", "TBOOL", "TMASKED", "T_REJECT", "TS_MAX_DELTA",
+  "TS_WARN_DELTA", "TWODOTS", "T_ALL", "T_BOTS", "T_SOFTCALLERID",
+  "T_CALLERID", "T_CCONN", "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF",
+  "T_DEBUG", "T_DRONE", "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4",
+  "T_IPV6", "T_LOCOPS", "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR",
+  "T_L_INFO", "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS",
+  "T_NCHANGE", "T_OPERWALL", "T_REJ", "T_SERVNOTICE", "T_SKILL", "T_SPY",
+  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_WALLOP",
+  "THROTTLE_TIME", "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE",
+  "TRESV", "UNKLINE", "USER", "T_USERMODE", "USE_EGD", "USE_EXCEPT",
+  "USE_INVEX", "USE_KNOCK", "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST",
+  "VHOST6", "XLINE", "WARN", "WARN_NO_NLINE", "WEBIRC", "';'", "'}'",
+  "'{'", "'='", "','", "$accept", "conf", "conf_item", "timespec_",
+  "timespec", "sizespec_", "sizespec", "modules_entry", "modules_items",
+  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
+  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
+  "serverinfo_rsa_private_key_file", "serverinfo_name", "serverinfo_sid",
+  "serverinfo_description", "serverinfo_network_name",
+  "serverinfo_network_desc", "serverinfo_services_name",
+  "serverinfo_help_channel", "serverinfo_vhost", "serverinfo_vhost6",
+  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
+  "admin_item", "admin_name", "admin_email", "admin_description",
+  "logging_entry", "logging_items", "logging_item", "logging_path",
+  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
+  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
+  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
+  "logging_log_level", "logging_use_logging", "oper_entry", "@1",
+  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
+  "oper_user", "oper_password", "oper_encrypted",
+  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "@2",
+  "oper_umodes_items", "oper_umodes_item", "oper_global_kill",
+  "oper_remote", "oper_remoteban", "oper_kline", "oper_xline",
+  "oper_unkline", "oper_gline", "oper_nick_changes", "oper_die",
+  "oper_rehash", "oper_admin", "oper_hidden_admin", "oper_hidden_oper",
+  "oper_operwall", "oper_snoop", "oper_flags", "@3", "oper_flags_items",
+  "oper_flags_item", "@4", "@5", "oper_flags_item_atom", "webirc_entry",
+  "@6", "webirc_items", "webirc_item", "webirc_host", "webirc_passwd",
+  "class_entry", "@7", "class_name_b", "class_items", "class_item",
+  "class_name", "class_name_t", "class_ping_time", "class_ping_warning",
+  "class_number_per_ip", "class_connectfreq", "class_max_number",
+  "class_max_global", "class_max_local", "class_max_ident", "class_sendq",
+  "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
+  "class_number_per_cidr", "listen_entry", "@8", "listen_flags", "@9",
+  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
+  "listen_port", "@10", "port_items", "port_item", "listen_address",
+  "listen_host", "auth_entry", "@11", "auth_items", "auth_item",
+  "auth_user", "auth_passwd", "auth_spoof_notice", "auth_class",
+  "auth_encrypted", "auth_flags", "@12", "auth_flags_items",
+  "auth_flags_item", "@13", "@14", "auth_flags_item_atom",
+  "auth_kline_exempt", "auth_need_ident", "auth_exceed_limit",
+  "auth_can_flood", "auth_no_tilde", "auth_gline_exempt", "auth_spoof",
+  "auth_redir_serv", "auth_redir_port", "auth_need_password", "resv_entry",
+  "@15", "resv_items", "resv_item", "resv_creason", "resv_channel",
+  "resv_nick", "shared_entry", "@16", "shared_items", "shared_item",
+  "shared_name", "shared_user", "shared_type", "@17", "shared_types",
+  "shared_type_item", "cluster_entry", "@18", "cluster_items",
+  "cluster_item", "cluster_name", "cluster_type", "@19", "cluster_types",
+  "cluster_type_item", "connect_entry", "@20", "connect_name_b",
+  "connect_items", "connect_item", "connect_name", "connect_name_t",
+  "connect_host", "connect_vhost", "connect_send_password",
+  "connect_accept_password", "connect_port", "connect_aftype",
+  "connect_fakename", "connect_flags", "@21", "connect_flags_items",
+  "connect_flags_item", "@22", "@23", "connect_flags_item_atom",
+  "connect_rsa_public_key_file", "connect_encrypted", "connect_cryptlink",
+  "connect_compressed", "connect_auto", "connect_topicburst",
+  "connect_hub_mask", "connect_leaf_mask", "connect_class",
+  "connect_cipher_preference", "kill_entry", "@24", "kill_type", "@25",
+  "kill_type_items", "kill_type_item", "kill_items", "kill_item",
+  "kill_user", "kill_reason", "deny_entry", "@26", "deny_items",
+  "deny_item", "deny_ip", "deny_reason", "exempt_entry", "exempt_items",
+  "exempt_item", "exempt_ip", "gecos_entry", "@27", "gecos_flags", "@28",
+  "gecos_flags_items", "gecos_flags_item", "gecos_items", "gecos_item",
+  "gecos_name", "gecos_reason", "general_entry", "general_items",
+  "general_item", "general_gline_min_cidr", "general_gline_min_cidr6",
+  "general_burst_away", "general_use_whois_actually",
+  "general_reject_hold_time", "general_tkline_expire_notices",
+  "general_kill_chase_time_limit", "general_hide_spoof_ips",
+  "general_ignore_bogus_ts", "general_disable_remote_commands",
+  "general_failed_oper_notice", "general_anti_nick_flood",
+  "general_max_nick_time", "general_max_nick_changes",
+  "general_max_accept", "general_anti_spam_exit_message_time",
+  "general_ts_warn_delta", "general_ts_max_delta",
+  "general_havent_read_conf", "general_kline_with_reason",
+  "general_kline_reason", "general_invisible_on_connect",
+  "general_warn_no_nline", "general_stats_e_disabled",
+  "general_stats_o_oper_only", "general_stats_P_oper_only",
+  "general_stats_k_oper_only", "general_stats_i_oper_only",
+  "general_pace_wait", "general_caller_id_wait",
+  "general_opers_bypass_callerid", "general_pace_wait_simple",
+  "general_short_motd", "general_no_oper_flood",
+  "general_true_no_oper_flood", "general_oper_pass_resv",
+  "general_message_locale", "general_idletime", "general_dots_in_ident",
+  "general_max_targets", "general_servlink_path",
+  "general_default_cipher_preference", "general_compression_level",
+  "general_use_egd", "general_egdpool_path", "general_ping_cookie",
+  "general_disable_auth", "general_throttle_time", "general_oper_umodes",
+  "@29", "umode_oitems", "umode_oitem", "general_oper_only_umodes", "@30",
+  "umode_items", "umode_item", "general_min_nonwildcard",
+  "general_min_nonwildcard_simple", "general_default_floodcount",
+  "general_client_flood", "general_dot_in_ip6_addr", "gline_entry", "@31",
+  "gline_items", "gline_item", "gline_enable", "gline_duration",
+  "gline_logging", "@32", "gline_logging_types", "gline_logging_type_item",
+  "gline_user", "gline_server", "gline_action", "@33", "gdeny_types",
+  "gdeny_type_item", "channel_entry", "channel_items", "channel_item",
+  "channel_disable_fake_channels", "channel_restrict_channels",
+  "channel_disable_local_channels", "channel_use_except",
+  "channel_use_invex", "channel_use_knock", "channel_knock_delay",
+  "channel_knock_delay_channel", "channel_max_chans_per_user",
+  "channel_quiet_on_ban", "channel_max_bans",
+  "channel_default_split_user_count", "channel_default_split_server_count",
+  "channel_no_create_on_split", "channel_no_join_on_split",
+  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
+  "serverhide_entry", "serverhide_items", "serverhide_item",
+  "serverhide_flatten_links", "serverhide_hide_servers",
+  "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
+  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
 };
-const short yyrindex[] = {                                      0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, 1275,
- 1276,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 1287,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, 1336,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 1337,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 1336, 1336, 1336, 1336, 1336,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1337, 1337,
- 1337,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  379,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   73, 1338,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, -188,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  624,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  379,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, -188,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  624,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
+     515,   516,   517,    59,   125,   123,    61,    44
 };
-const short yygindex[] = {                                      0,
- -345, -787, -428, -863,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0, 1123,    0,    0,
-    0, 1092,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, 1339,    0,    0,    0,
-    0, 1141,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  567,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, -102,    0,    0,  -84,  -81,    0,
-    0,    0,    0,  829,    0,    0,    0,    0,    0,    0,
-  783,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   -5,
-  919,    0,    0,    0,    0,    0,  114,    0,    0,  943,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   16,   17,
-    0,    0,    0,    0,  923,    0,    0,    0,    0,    0,
-  851,    0,    0,    0,    0,    0,  -49,    0,    0,  847,
-    0,    0,    0,    0,  -50,    0,    0,    0,    0,  760,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  -47,  -48,    0,    0,    0,    0,    0,    0,    0,
-   12,  936,    0,    0,    0,    0, 1060,    0,    0,    0,
- 1306,    0,    0,    0,    0,    0,    0,   37, 1050,    0,
-    0,    0, 1244,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  186,    0,    0,  194,    0,    0,  988,    0,    0,    0,
-    0,    0,    0,    0,    0,   38,    0,    0,   41,    0,
- 1341,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 1136,    0,    0,    0,    0,    0,    0,    0,
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   268,   269,   269,   270,   270,   270,   270,   270,   270,
+     270,   270,   270,   270,   270,   270,   270,   270,   270,   270,
+     270,   270,   270,   270,   270,   270,   270,   271,   271,   272,
+     272,   272,   272,   272,   272,   273,   273,   274,   274,   274,
+     274,   275,   276,   276,   277,   277,   277,   278,   279,   280,
+     281,   281,   282,   282,   282,   282,   282,   282,   282,   282,
+     282,   282,   282,   282,   282,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   297,   298,   298,   298,   298,   299,   300,   301,   302,
+     303,   303,   304,   304,   304,   304,   304,   304,   304,   304,
+     304,   304,   304,   304,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   315,   315,   315,   315,
+     315,   315,   316,   318,   317,   319,   319,   320,   320,   321,
+     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
+     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
+     321,   321,   321,   322,   323,   324,   325,   326,   327,   328,
+     330,   329,   331,   331,   332,   332,   332,   332,   332,   332,
+     332,   332,   332,   332,   332,   332,   332,   332,   332,   332,
+     332,   332,   332,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,   346,   347,   349,
+     348,   350,   350,   352,   351,   353,   351,   354,   354,   354,
+     354,   354,   354,   354,   354,   354,   354,   354,   354,   354,
+     354,   354,   354,   354,   356,   355,   357,   357,   358,   358,
+     358,   359,   360,   362,   361,   363,   363,   364,   364,   365,
+     365,   365,   365,   365,   365,   365,   365,   365,   365,   365,
+     365,   365,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,   379,   381,   380,   383,
+     382,   384,   384,   385,   385,   386,   386,   387,   387,   387,
+     387,   387,   389,   388,   390,   390,   391,   391,   392,   393,
+     395,   394,   396,   396,   397,   397,   397,   397,   397,   397,
+     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
+     397,   398,   399,   400,   401,   402,   404,   403,   405,   405,
+     407,   406,   408,   406,   409,   409,   409,   409,   409,   409,
+     409,   409,   409,   409,   410,   411,   412,   413,   414,   415,
+     416,   417,   418,   419,   421,   420,   422,   422,   423,   423,
+     423,   423,   424,   425,   426,   428,   427,   429,   429,   430,
+     430,   430,   430,   431,   432,   434,   433,   435,   435,   436,
+     436,   436,   436,   436,   436,   436,   436,   436,   436,   436,
+     436,   438,   437,   439,   439,   440,   440,   440,   441,   443,
+     442,   444,   444,   445,   445,   445,   445,   445,   445,   445,
+     445,   445,   445,   445,   447,   446,   448,   448,   449,   449,
+     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
+     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
+     451,   452,   453,   454,   455,   456,   457,   458,   458,   459,
+     461,   460,   462,   462,   464,   463,   465,   463,   466,   466,
+     466,   466,   466,   466,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   478,   477,   480,   479,   481,   481,
+     482,   483,   483,   484,   484,   484,   484,   485,   486,   488,
+     487,   489,   489,   490,   490,   490,   491,   492,   493,   494,
+     494,   495,   495,   496,   498,   497,   500,   499,   501,   501,
+     502,   503,   503,   504,   504,   504,   504,   505,   506,   507,
+     508,   508,   509,   509,   509,   509,   509,   509,   509,   509,
+     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
+     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
+     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
+     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
+     509,   509,   509,   509,   509,   509,   509,   509,   510,   511,
+     512,   513,   514,   515,   516,   517,   518,   519,   520,   521,
+     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
+     532,   533,   534,   535,   536,   536,   537,   537,   538,   539,
+     540,   541,   542,   543,   544,   545,   546,   547,   548,   549,
+     550,   551,   552,   553,   554,   555,   556,   557,   559,   558,
+     560,   560,   561,   561,   561,   561,   561,   561,   561,   561,
+     561,   561,   561,   561,   561,   561,   561,   561,   561,   561,
+     561,   563,   562,   564,   564,   565,   565,   565,   565,   565,
+     565,   565,   565,   565,   565,   565,   565,   565,   565,   565,
+     565,   565,   565,   565,   565,   566,   567,   568,   569,   570,
+     572,   571,   573,   573,   574,   574,   574,   574,   574,   574,
+     574,   575,   576,   578,   577,   579,   579,   580,   580,   581,
+     582,   584,   583,   585,   585,   586,   586,   587,   588,   588,
+     589,   589,   589,   589,   589,   589,   589,   589,   589,   589,
+     589,   589,   589,   589,   589,   589,   589,   589,   589,   590,
+     591,   592,   593,   594,   595,   596,   597,   598,   599,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   609,
+     610,   610,   610,   610,   610,   610,   610,   610,   611,   612,
+     613,   614,   615,   616,   617
 };
-#define YYTABLESIZE 1456
-const short yytable[] = {                                     596,
-  597,  743,  436,  902, 1249,  338,  603, 1255,   69,  488,
-  682,  864, 1285,  780,  438,  526,  439,  787,   46,  274,
-  689,  370, 1243,  117,  362,  892,  897,   48,  572,  529,
- 1471,  579, 1472,  124,  734,  735,  692, 1242,  694,  372,
- 1245, 1400, 1401,   70, 1390,   49,  563, 1473,   53,  530,
-  247, 1474,  708,   55,   71, 1244,   60, 1159,  440, 1389,
-  716,  441,   61, 1069, 1070, 1071, 1394,   64,  561,   65,
-  726,  727, 1402,  729, 1396,  444, 1399,  444, 1412, 1414,
-  756, 1393,  740,  741,   47,  744, 1465, 1467, 1470, 1395,
- 1403, 1398,  444, 1411, 1413,  120,  444, 1404, 1487,  521,
-  123, 1464, 1466, 1469, 1507,  248,  249,  250,  251,  252,
-  253,  254,  255, 1486,  363,  580,  284, 1405,  442, 1506,
-  129, 1475,  281,  125, 1195, 1196, 1197, 1198, 1199,   72,
-  243,  284,  244,  130,  579,  443,   69,  245,  275,  131,
-  132,  362,  529,  133,  488, 1406,  274,  246,  497,  573,
-  134,  372,  124, 1407,  531,  256,  563,  572,  334,  135,
-  373,  284,  530,  136,  137,  489,  444,  564,  276, 1286,
-  138,   70,  736,  737,  139,  140,  141,  335,  142,  581,
-  364,  331,   71,  742,  143,  532, 1215, 1216,  811,  257,
-  332,  812,  333, 1408, 1250,  374,  490, 1256,  872,  302,
-  336,  498,  337,  144,  145, 1246, 1247, 1248,  146,  340,
-  341,  438,  813,  439, 1409,  574,  147,  342,  580,  343,
-  148,  149,  150,  344,  814,  151,  375,  345,  152,  153,
-  247,  363,  499,  565,  303,  358,  815,  346,  500,  154,
-  347,  816,  125,  348,  349,  155,  156,  350,  157,  158,
-  159,  160,  775,  817,  968,  440,  491,   72,  441,  351,
-  818,  444,  161, 1476,  352,  275,  819,  531,  820,  258,
-  353,  162,  373,  163,  164,  304,  165,  564,  573,  166,
-  167,  821,  581,  168,  305,  248,  249,  250,  251,  252,
-  253,  254,  255,  566,  169,  276,  354,  364,  532,  355,
-  489,  501,  356,  259,  357,  369,  497,  374,  444,  822,
-  360,  361,  381,  170,  823,  442,  171,  382,  383,  384,
-  306,  172,  307,  308,  385,  173,  174,  175,  176,  177,
-  386,  490,  443,  178,  179,  256,  824,  545,  375,  946,
-  387,  388,  180,  565,  574,  389,  390,  391,  825,  392,
-  826,  827,  393,  394,  395,  828,  396,  397,  398,  498,
-  399,  400,  401,  402,  403,  309,   78,  310,  404,  257,
-  405,  406,  407,  181,  829,  182,  302,   79,  408,  595,
-  311,  312,  183,  453,  409,  639,  640,  184,  410,  641,
-  499,  491,  185,  642,  411,  412,  500,  414,   80,   81,
-  416,  454,  417,  566,   82, 1081,   83,  455,  643,  644,
-  645,  303,  418,  419,  646,  420,  421,  830,  912,  913,
-  914,  915,  916,  831,  422,  610,  313,  423,  424,  425,
-  426,  456,  457,  647,  832,  833,  458,  648,  649,  528,
-  427,  428,  429,  430,  431,  834,  611,  612,  432,  258,
-  459,  433,  304,  613,  314,  315,  434,  460,  444,  501,
-  435,  305,  508,   84,   85,  509,  510,  511,  285,  650,
-  610,  651,  512,   86,   87,  513,  514,  461,  515,  516,
-  517,  518,  519,  259,  520,  652,  523,  524,  586,  285,
-  525,  611,  612,   88,   89,  538,  539,  306,  613,  307,
-  308,  540,  541,  542,  543,  462,  653,  286,  544,  547,
-   90,   91,  548,  463,  549,  550, 1212,  551,  552,  553,
-  554,   92,  287,  555,  556,  557,  558,  559,  286,  560,
-   93,  464,  587,  588,  614,  615,  616,  589,  654,  617,
-  465,  466,  309,  287,  310,  288,  618,  289,  590,  290,
-  291,  591,  655,  592,  593,  594,  595,  311,  312,  619,
-  620,  598,  656,  599,  600,  601,  288,  604,  289,  292,
-  290,  291,  602,  467,  468,    2,  621,  622,    3,  614,
-  615,  616,  609,  605,  617,  606,  607,  608,  680, 1202,
-  292,  618,  681,  685,  686,    4,  687, 1210, 1211,    5,
-  684,  623,    6,  313,  619,  620,  691,  693,  695,    7,
-  696,  697,  698,  699,  700,  701,   94,   95,   96,  704,
-  702,  621,  622, 1488,  703,    8,  657,  705,  706,  712,
-  469,  314,  315,  707,  711,  714,  715,  717,    9,   10,
-  658,   11,  709,  719,  710,  713,  623,  718,   12,  720,
-  721,  723,  320,  320,  722,  724, 1489,  797,  798,  799,
-  800,  801,  802,  803,  725,  742,   13,  749, 1490,  728,
-  730,  731,  758,  751,  732,  733,  752,   14,  738,   15,
-  130,  739,  745,  320,  782, 1491,  131,  132,  754,  746,
-  133,  755, 1492,  759,  760,   16,  761,  134, 1493,  762,
- 1494,  320,  764,  747,  765,  748,  135,  766,  320,  767,
-  136,  137,   17, 1495,  768,  769,  770,  138,  771,  772,
-  773,  139,  140,  141,  774,  142,  777,  779,  320,  784,
-  785,  143,  786,  807,  789,  790,  791,  810,  792,  793,
-  794,  795,  796,  806,   18,  804, 1496,  805,  808,  860,
-  144,  145,  809,   19,   20,  146,  320,  861,  862,   21,
-   22,  863, 1497,  147,  320,  866,  867,  148,  149,  150,
-  869,  868,  151,  870,  871,  152,  153,  873,  889,  887,
- 1498,  874, 1499, 1500,  875,  877,  154,  878,  884,  888,
-  891,  894,  155,  156,  879,  157,  158,  159,  160,  876,
-  895,  880,  881,  882,  320,  899, 1501,  883,  885,  161,
-  900,  886,  901,  904,  811,  905,  906,  812,  162,  907,
-  163,  164,  908,  165,  909,  320,  166,  167,  910,  911,
-  168,  919,  920,  921,  922,   23,  923,  924,  813,  925,
-  926,  169,  927,  928,  929,  930,  931,  932,  948, 1502,
-  814,  933,  934,  935,  936,  937,  938,  939,  940,  941,
-  170,  942,  815,  171,  943,  970, 1503,  816,  172,  944,
-  945,  949,  173,  174,  175,  176,  177, 1504,  950,  817,
-  178,  179,  203,  951,  952,  953,  818,  954,  955,  180,
-  956,  957,  819,  959,  820,  960,  961,  962,  963,  964,
-  965,  639,  640,  966,  967,  641,  971,  821,  972,  642,
-  973,  974,  975,  976,  977,  203,  978,  979,  980,  981,
-  181,  982,  182,  983,  643,  644,  645,  203,  984,  183,
-  646,  985,  986,  987,  184,  822,  988,  989,  990,  185,
-  823,  991,  992,  993,  203,  994,  995,  996,  997,  647,
-  998,  203,  999,  648,  649, 1000, 1001,  203, 1002,  203,
- 1322, 1003,  824, 1004, 1005, 1006, 1007, 1008, 1009, 1031,
-  453, 1053,  203, 1054,  825,   78,  826,  827, 1055, 1056,
- 1057,  828, 1058, 1059, 1060,  650,   79,  651,  454, 1061,
- 1062, 1063, 1064, 1065,  455, 1066, 1067, 1068, 1074, 1075,
-  829,  652, 1076, 1077, 1078,  203, 1079,   80,   81, 1080,
- 1082, 1083, 1084,   82, 1085,   83, 1086, 1087,  456,  457,
- 1088,  203,  653,  458, 1089, 1338, 1090, 1091, 1092, 1093,
- 1094, 1095, 1096, 1101, 1097, 1098, 1323,  459, 1099,  203,
- 1103,  203,  203,  830,  460, 1105, 1100, 1102, 1107,  831,
- 1104, 1108, 1106, 1114,  654, 1111, 1115, 1116, 1117, 1109,
-  832,  833, 1110, 1118,  461,  203, 1119, 1120,  655, 1121,
- 1324,  834,   84,   85, 1122, 1123, 1124, 1125,  656, 1126,
- 1127, 1128,   86,   87, 1129, 1325, 1130, 1131, 1132, 1133,
- 1134, 1135,  462, 1161, 1136, 1137, 1138, 1139, 1141, 1142,
-  463, 1339,   88,   89, 1326, 1327, 1143, 1144,  203, 1145,
- 1328, 1329, 1330, 1331, 1146, 1332, 1147, 1148,  464,   90,
-   91, 1149, 1150, 1151, 1333,  203, 1152,  465,  466, 1153,
-   92, 1154, 1156, 1157, 1158, 1340,  203, 1162, 1163,   93,
- 1164, 1165,  657, 1166, 1167, 1168, 1169, 1170, 1171, 1172,
- 1341, 1173, 1174, 1175, 1176, 1177,  658, 1178, 1179, 1180,
-  467,  468, 1181, 1182, 1183, 1184, 1188, 1191, 1185, 1342,
- 1343, 1186, 1187, 1190, 1189, 1344, 1345, 1346, 1347, 1194,
- 1213, 1010, 1011, 1012, 1013, 1014, 1192, 1015, 1016, 1348,
- 1017, 1018, 1019, 1200, 1201, 1020, 1217, 1220, 1221, 1203,
- 1204, 1205, 1206, 1208, 1209, 1021, 1022, 1023, 1024, 1025,
- 1026, 1193, 1207, 1027, 1222, 1224, 1028,  469, 1234, 1232,
- 1235, 1236, 1237, 1238, 1253,   94,   95,   96, 1032, 1033,
- 1034, 1035, 1036, 1229, 1037, 1038, 1239, 1039, 1040, 1041,
- 1254, 1214, 1042, 1218, 1259, 1260, 1261, 1262, 1263, 1264,
- 1219, 1223, 1043, 1044, 1045, 1046, 1047, 1048, 1225, 1269,
- 1049, 1270, 1271, 1050, 1440, 1441, 1442, 1443, 1444, 1272,
- 1445, 1446, 1265, 1447, 1448, 1449, 1226, 1227, 1450, 1273,
- 1228, 1230, 1274, 1275, 1276, 1231, 1233, 1277, 1451, 1452,
- 1453, 1454, 1455, 1456, 1278, 1279, 1457, 1280, 1284, 1458,
- 1289, 1290, 1291, 1292, 1295, 1281, 1294, 1296, 1298, 1297,
- 1304, 1306, 1313, 1310, 1299, 1317, 1300, 1318, 1301, 1319,
- 1320, 1302, 1321, 1336, 1337, 1351, 1315, 1352, 1353, 1354,
- 1355, 1356, 1357, 1303, 1305, 1358, 1359, 1360, 1361, 1362,
- 1363, 1364, 1365, 1366, 1367, 1307, 1368, 1369, 1308, 1370,
- 1371, 1309, 1372, 1373, 1374, 1375, 1376, 1380, 1381, 1382,
- 1383, 1384, 1385, 1386, 1311, 1387, 1312, 1388, 1314, 1417,
- 1316, 1415, 1418, 1419, 1420, 1421, 1426, 1427, 1422, 1428,
- 1429, 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438,
- 1439, 1461, 1462, 1463,   26,   34,  280,  233,  404,  527,
-  522, 1160, 1513, 1512, 1514, 1416,  947,  562, 1484,  124,
-  903,  339,  776, 1481, 1482, 1508, 1509,  893,  969, 1510,
-  788,  898, 1511, 1483,  683,  690, 1478,  781,  546,  437,
- 1392,  371,  757, 1480, 1479,    0, 1391,  359,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  865,
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     2,     0,     1,     2,
+       3,     3,     3,     3,     3,     0,     1,     2,     3,     3,
+       3,     5,     2,     1,     1,     1,     2,     4,     4,     5,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     5,
+       2,     1,     1,     1,     1,     2,     4,     4,     4,     5,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     0,     7,     0,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     4,     1,     4,     4,     4,     4,     4,
+       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     0,
+       5,     3,     1,     0,     3,     0,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     6,     2,     1,     1,     1,
+       2,     4,     4,     0,     7,     0,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     4,     1,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     0,     6,     0,
+       5,     3,     1,     1,     1,     2,     1,     1,     1,     1,
+       1,     2,     0,     5,     3,     1,     1,     3,     4,     4,
+       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     4,     4,     4,     4,     4,     0,     5,     3,     1,
+       0,     3,     0,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     0,     6,     2,     1,     1,     1,
+       1,     2,     4,     4,     4,     0,     6,     2,     1,     1,
+       1,     1,     2,     4,     4,     0,     5,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     6,     2,     1,     1,     1,     2,     4,     0,
+       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     7,     0,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       4,     1,     4,     4,     4,     4,     4,     4,     4,     4,
+       0,     5,     3,     1,     0,     3,     0,     2,     1,     1,
+       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     0,     6,     0,     5,     3,     1,
+       1,     2,     1,     1,     1,     1,     1,     4,     4,     0,
+       6,     2,     1,     1,     1,     1,     4,     4,     5,     2,
+       1,     1,     1,     4,     0,     6,     0,     5,     3,     1,
+       1,     2,     1,     1,     1,     1,     1,     4,     4,     5,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     5,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     4,     4,     4,     4,     4,
+       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     4,     4,     0,     5,     3,     1,     1,     1,     4,
+       4,     0,     5,     3,     1,     1,     1,     5,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     5,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
+       4,     4,     4,     4,     4
 };
-const short yycheck[] = {                                     345,
-  346,  430,  125,  125,  265,  125,  352,  265,  256,  256,
-  125,  125,  333,  125,  256,  125,  258,  125,   59,  256,
-  125,  125,   44,  410,  256,  125,  125,  123,  256,  256,
-  264,  256,  266,  256,  453,  454,  382,   59,  384,  256,
-   44,  274,  275,  291,   44,  123,  256,  281,  123,  276,
-  256,  285,  398,  123,  302,   59,  123,  125,  300,   59,
-  406,  303,  123,  268,  269,  270,   44,  123,  125,  123,
-  416,  417,  305,  419,   44,  264,   44,  266,   44,   44,
-  125,   59,  428,  429,  125,  431,   44,   44,   44,   59,
-  323,   59,  281,   59,   59,  410,  285,  330,   44,  125,
-  123,   59,   59,   59,   44,  311,  312,  313,  314,  315,
-  316,  317,  318,   59,  346,  340,   44,  350,  360,   59,
-  123,  355,  410,  346,  912,  913,  914,  915,  916,  377,
-  123,   59,  123,  256,  256,  377,  256,  123,  375,  262,
-  263,  256,  256,  266,  256,  378,  256,  123,  256,  377,
-  273,  256,  256,  386,  381,  361,  256,  256,   59,  282,
-  377,  123,  276,  286,  287,  412,  355,  377,  405,  490,
-  293,  291,  453,  454,  297,  298,  299,   61,  301,  404,
-  412,  123,  302,  388,  307,  412,  472,  473,  256,  395,
-  123,  259,  123,  426,  455,  412,  443,  455,  544,  256,
-   61,  309,   61,  326,  327, 1069, 1070, 1071,  331,   61,
-   61,  256,  280,  258,  447,  443,  339,   61,  340,   61,
-  343,  344,  345,   61,  292,  348,  443,   61,  351,  352,
-  256,  346,  340,  443,  291,  125,  304,   61,  346,  362,
-   61,  309,  346,   61,   61,  368,  369,   61,  371,  372,
-  373,  374,  125,  321,  125,  300,  503,  377,  303,   61,
-  328,  503,  385,  497,   61,  375,  334,  381,  336,  475,
-   61,  394,  377,  396,  397,  332,  399,  377,  377,  402,
-  403,  349,  404,  406,  341,  311,  312,  313,  314,  315,
-  316,  317,  318,  503,  417,  405,   61,  412,  412,   61,
-  412,  409,   61,  509,   61,   61,  256,  412,  497,  377,
-  123,  123,   61,  436,  382,  360,  439,   61,   61,   61,
-  377,  444,  379,  380,   61,  448,  449,  450,  451,  452,
-   61,  443,  377,  456,  457,  361,  404,  125,  443,  125,
-   61,   61,  465,  443,  443,   61,   61,   61,  416,   61,
-  418,  419,   61,   61,   61,  423,   61,   61,   61,  309,
-   61,   61,   61,   61,   61,  422,  256,  424,   61,  395,
-   61,   61,   61,  496,  442,  498,  256,  267,   61,  388,
-  437,  438,  505,  256,   61,  256,  257,  510,   61,  260,
-  340,  503,  515,  264,   61,   61,  346,   61,  288,  289,
-   61,  274,   61,  503,  294,  751,  296,  280,  279,  280,
-  281,  291,   61,   61,  285,   61,   61,  485,  427,  428,
-  429,  430,  431,  491,   61,  256,  483,   61,   61,   61,
-   61,  304,  305,  304,  502,  503,  309,  308,  309,  123,
-   61,   61,   61,   61,   61,  513,  277,  278,   61,  475,
-  323,   61,  332,  284,  511,  512,   61,  330,  503,  409,
-   61,  341,   59,  353,  354,   61,   61,   61,  256,  340,
-  256,  342,   61,  363,  364,   61,   61,  350,   61,   61,
-   61,   61,   61,  509,   61,  356,   59,   61,  410,  256,
-   61,  277,  278,  383,  384,   61,   61,  377,  284,  379,
-  380,   61,   61,   61,   61,  378,  377,  295,   61,   59,
-  400,  401,   61,  386,   61,   61,  945,   61,   61,   61,
-   61,  411,  310,   61,   61,   61,   61,   61,  295,   61,
-  420,  404,  410,  410,  365,  366,  367,   59,  409,  370,
-  413,  414,  422,  310,  424,  333,  377,  335,  453,  337,
-  338,  388,  423,  388,  453,  453,  388,  437,  438,  390,
-  391,  388,  433,  388,  453,  453,  333,  453,  335,  357,
-  337,  338,  388,  446,  447,  256,  407,  408,  259,  365,
-  366,  367,   59,  453,  370,  453,  453,  453,   61,  935,
-  357,  377,   61,   59,   61,  276,   61,  943,  944,  280,
-  410,  432,  283,  483,  390,  391,  453,  453,  388,  290,
-  410,  388,  453,  453,  453,  388,  506,  507,  508,  388,
-  410,  407,  408,  259,  453,  306,  497,  388,  388,  410,
-  503,  511,  512,  453,  388,  388,  388,  388,  319,  320,
-  511,  322,  453,  388,  453,  453,  432,  410,  329,  388,
-  453,   61,  274,  275,  453,  453,  292,  476,  477,  478,
-  479,  480,  481,  482,   61,  388,  347,   59,  304,  453,
-  410,  453,   59,   61,  453,  453,   61,  358,  453,  360,
-  256,  453,  453,  305,   59,  321,  262,  263,   61,  453,
-  266,   61,  328,   61,   61,  376,   61,  273,  334,   61,
-  336,  323,   61,  453,   61,  453,  282,   61,  330,   61,
-  286,  287,  393,  349,   61,   61,   61,  293,   61,   61,
-   61,  297,  298,  299,   61,  301,   61,   61,  350,   61,
-   61,  307,   61,   59,  410,  410,  410,   59,  410,  410,
-  410,  410,  410,  453,  425,  410,  382,  410,  410,   59,
-  326,  327,  410,  434,  435,  331,  378,   61,   61,  440,
-  441,   61,  398,  339,  386,  453,  453,  343,  344,  345,
-  410,  453,  348,  453,  453,  351,  352,   59,   61,   59,
-  416,  410,  418,  419,  410,  410,  362,  410,  388,   59,
-   61,   59,  368,  369,  410,  371,  372,  373,  374,  453,
-   61,  410,  410,  410,  426,   59,  442,  410,  410,  385,
-   61,  410,   61,   59,  256,   59,   59,  259,  394,   59,
-  396,  397,   59,  399,   59,  447,  402,  403,   59,   59,
-  406,   59,   59,   59,   59,  516,   59,   59,  280,   59,
-   59,  417,   59,   59,   59,   59,   59,   59,   59,  485,
-  292,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-  436,   61,  304,  439,   61,  410,  502,  309,  444,   61,
-   61,   61,  448,  449,  450,  451,  452,  513,   61,  321,
-  456,  457,  259,   61,   61,   61,  328,   61,   61,  465,
-   61,   61,  334,   61,  336,   61,   61,   61,   61,   61,
-   61,  256,  257,   61,   61,  260,  410,  349,   59,  264,
-   59,  410,  410,   61,   59,  292,   59,   59,   59,   59,
-  496,   59,  498,   59,  279,  280,  281,  304,   59,  505,
-  285,   59,   59,   59,  510,  377,   59,   59,   59,  515,
-  382,   59,   59,   59,  321,   59,   59,   59,   59,  304,
-   59,  328,   59,  308,  309,   59,   59,  334,   59,  336,
-  349,   59,  404,   59,   59,   59,   59,   59,   59,   59,
-  256,   59,  349,   59,  416,  256,  418,  419,   59,   59,
-   59,  423,   59,   59,   59,  340,  267,  342,  274,   59,
-   59,   59,   59,   59,  280,   59,   59,   59,   59,   59,
-  442,  356,   59,   59,   59,  382,   59,  288,  289,   61,
-  453,   61,  410,  294,  410,  296,   59,  453,  304,  305,
-  410,  398,  377,  309,  453,  349,  453,   61,  453,  453,
-  453,  453,  453,  453,  410,  388,  425,  323,  410,  416,
-   59,  418,  419,  485,  330,   61,  410,  410,   59,  491,
-  410,   61,  410,   59,  409,  388,   59,   59,   59,  410,
-  502,  503,  410,   59,  350,  442,   59,   59,  423,   59,
-  459,  513,  353,  354,   59,   59,   59,   59,  433,   59,
-   59,   59,  363,  364,   59,  474,   59,   59,   59,   59,
-   59,   59,  378,  410,   61,   61,   61,   61,   61,   61,
-  386,  425,  383,  384,  493,  494,   61,   61,  485,   61,
-  499,  500,  501,  502,   61,  504,   61,   61,  404,  400,
-  401,   61,   61,   61,  513,  502,   61,  413,  414,   61,
-  411,   61,   61,   61,   61,  459,  513,  410,  410,  420,
-   59,   59,  497,   59,   59,   59,   59,   59,   59,   59,
-  474,   59,   59,   59,   59,   59,  511,   59,   59,   59,
-  446,  447,   59,   59,   59,   59,   59,   59,  410,  493,
-  494,   61,  410,   61,  410,  499,  500,  501,  502,   59,
-   59,  460,  461,  462,  463,  464,  410,  466,  467,  513,
-  469,  470,  471,  388,  388,  474,  453,  453,  453,  388,
-  388,  388,  388,  388,  388,  484,  485,  486,  487,  488,
-  489,  410,  410,  492,  453,   61,  495,  503,   59,  453,
-   59,   59,   59,   59,   59,  506,  507,  508,  460,  461,
-  462,  463,  464,  388,  466,  467,  415,  469,  470,  471,
-   59,  410,  474,  410,   59,   59,   59,   59,   59,   59,
-  410,  410,  484,  485,  486,  487,  488,  489,  410,   59,
-  492,   59,   59,  495,  460,  461,  462,  463,  464,   59,
-  466,  467,  387,  469,  470,  471,  410,  410,  474,   59,
-  410,  410,   59,   59,   59,  410,  410,   59,  484,  485,
-  486,  487,  488,  489,   59,   59,  492,   59,   59,  495,
-   59,   59,  458,   44,  410,  415,  453,  453,   61,  453,
-  410,  410,   61,  410,  453,   59,  453,   59,  453,   59,
-   59,  453,   59,   59,   59,   59,  410,   59,   59,   59,
-   59,   59,   59,  453,  453,   59,   59,   59,   59,   59,
-   59,   59,   59,   59,   59,  453,   59,   59,  453,   59,
-   59,  453,   59,   59,   59,   59,  387,   59,   59,   59,
-   59,   59,   59,   59,  453,   59,  453,   59,  453,   59,
-  453,  388,   59,   59,   59,   59,   59,   59,  387,   59,
-   59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
-   59,   59,   59,   59,   59,   59,   59,  123,  123,  277,
-  260,  835, 1487, 1485, 1507, 1292,  624,  316, 1414,  123,
-  582,   73,  470, 1397, 1399, 1465, 1467,  567,  659, 1468,
-  502,  575, 1470, 1412,  365,  376, 1390,  492,  293,  186,
- 1245,  126,  445, 1396, 1394,   -1, 1243,   97,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  533,
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       2,     0,     1,     0,     0,     0,   233,   404,   479,     0,
+     494,     0,   670,   290,   464,   267,     0,     0,   123,   344,
+       0,     0,   355,   381,   224,     3,    23,    11,     4,     5,
+       6,    24,     8,     9,    10,    13,    14,    15,    16,    17,
+      18,    19,    22,    20,    21,     7,    12,    25,    26,     0,
+       0,   235,   406,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   125,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    81,    82,    84,    83,   718,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   699,
+     717,   712,   700,   701,   702,   703,   705,   706,   707,   708,
+     704,   709,   710,   711,   713,   714,   715,   716,   254,     0,
+     236,   431,     0,   407,     0,   492,     0,     0,   490,   491,
+       0,   567,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   641,     0,   618,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   511,   562,
+     563,   560,   564,   565,   561,   522,   512,   513,   551,   514,
+     515,   516,   517,   518,   519,   520,   521,   556,   523,   524,
+     525,   526,   566,   528,   533,   529,   531,   530,   545,   546,
+     532,   534,   535,   536,   537,   539,   538,   527,   541,   550,
+     552,   553,   542,   543,   558,   559,   555,   544,   540,   548,
+     549,   547,   554,   557,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    91,    92,    93,    96,   103,    97,   101,    98,
+      99,   102,   100,    94,    95,     0,     0,     0,     0,    43,
+      44,    45,   154,     0,   126,     0,   747,     0,     0,     0,
+       0,     0,     0,     0,     0,   739,   740,   741,   745,   742,
+     744,   743,   746,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    51,    64,
+      61,    52,    63,    55,    56,    57,    58,    59,    53,    62,
+      60,    54,     0,     0,     0,    85,     0,     0,     0,     0,
+      80,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     698,     0,     0,   485,     0,     0,     0,   482,   483,   484,
+       0,     0,   489,   506,     0,     0,   496,   505,     0,   502,
+     503,   504,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   510,   680,
+     691,     0,     0,   683,     0,     0,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,     0,     0,     0,     0,   316,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   293,   294,   295,   304,   296,   309,   297,   298,
+     299,   300,   307,   301,   302,   303,   305,   306,   308,   476,
+       0,   466,     0,   475,     0,   472,   473,   474,     0,   269,
+       0,     0,     0,   278,     0,   276,   277,   279,   280,   104,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    90,    46,     0,     0,     0,    42,     0,
+       0,     0,     0,     0,     0,   347,   348,   349,   350,     0,
+       0,     0,     0,     0,     0,     0,     0,   738,    65,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    50,     0,     0,   365,     0,     0,   358,
+     359,   360,   361,     0,     0,   389,     0,   384,   385,   386,
+       0,     0,     0,     0,   227,   228,   229,     0,     0,     0,
+      79,     0,     0,     0,     0,     0,    27,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     697,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   238,   239,   242,   243,
+     245,   246,   247,   248,   249,   250,   251,   240,   241,   244,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     440,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   409,   410,   411,   412,   413,   414,   416,   415,   417,
+     418,   426,   423,   425,   424,   422,   428,   419,   420,   421,
+     427,     0,     0,     0,   481,     0,   488,     0,     0,     0,
+       0,   501,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+     509,     0,     0,     0,     0,     0,     0,     0,   672,   310,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   292,     0,     0,
+       0,     0,   471,   281,     0,     0,     0,     0,     0,   275,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    89,     0,
+       0,    41,     0,     0,     0,     0,     0,   199,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   160,     0,     0,     0,     0,   128,   129,   130,
+     131,   149,   150,   135,   134,   136,   137,   143,   138,   139,
+     140,   141,   142,   144,   145,   146,   132,   133,   147,   148,
+     151,   351,     0,     0,     0,     0,   346,     0,     0,     0,
+       0,     0,     0,     0,   737,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    49,   362,
+       0,     0,     0,     0,   357,   387,     0,     0,     0,   383,
+     230,     0,     0,     0,   226,    88,    87,    86,   734,   731,
+     730,   719,   721,    27,    27,    27,    27,    27,    29,    28,
+     725,   726,   729,   727,   732,   733,   735,   736,   728,   720,
+     722,   723,   724,   252,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   237,   429,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     408,     0,     0,   480,   493,     0,     0,     0,   495,   579,
+     583,   570,   599,   612,   611,   667,   616,   577,   669,   608,
+     614,   578,   568,   569,   586,   575,   607,   576,   589,   574,
+     588,   587,   582,   581,   580,   609,   606,   665,   666,   603,
+     600,   664,   645,   661,   662,   646,   647,   648,   649,   656,
+     650,   659,   663,   652,   657,   653,   658,   651,   655,   654,
+     660,     0,   644,   605,   622,   638,   639,   623,   624,   625,
+     626,   633,   627,   636,   640,   629,   634,   630,   635,   628,
+     632,   631,   637,     0,   621,   598,   601,   615,   572,   610,
+     573,   602,   591,   596,   597,   594,   595,   592,   593,   585,
+     584,    35,    35,    35,    37,    36,   668,   617,   604,   613,
+     571,   590,     0,     0,     0,     0,     0,     0,   671,     0,
+       0,     0,     0,   322,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   291,     0,     0,     0,   465,
+       0,     0,     0,   286,   282,   285,   268,   108,   114,   112,
+     111,   113,   109,   110,   107,   115,   121,   116,   120,   118,
+     119,   117,   106,   105,   122,    47,    48,   152,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   127,     0,     0,     0,   345,   753,   748,   752,
+     750,   754,   749,   751,    70,    74,    78,    68,    72,    71,
+      67,    66,    73,    69,    77,    75,    76,     0,     0,     0,
+     356,     0,     0,   382,     0,     0,   225,    30,    31,    32,
+      33,    34,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   234,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   446,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   405,   486,   487,   507,
+     508,   500,     0,   499,   642,     0,   619,     0,    38,    39,
+      40,   696,   695,     0,   694,   682,   681,   688,   687,     0,
+     686,   690,   689,   337,   314,   315,   336,   320,     0,   319,
+       0,   339,   335,   334,   343,   338,   312,   342,   341,   340,
+     313,   311,   478,   470,     0,   469,   477,   274,   273,     0,
+     272,   289,   288,     0,     0,     0,     0,     0,     0,     0,
+     205,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   124,
+     353,   354,   352,   363,   369,   375,   380,   378,   377,   374,
+     370,   373,   376,   371,   379,   372,     0,   368,   364,   388,
+     393,   399,   403,   402,   401,   398,   394,   397,   400,   395,
+     396,     0,   392,   231,   232,   264,   265,   258,   260,   262,
+     261,   259,   253,   266,   257,   255,   256,   263,   435,   437,
+     438,   458,   463,   462,   457,   456,   455,   439,   444,     0,
+     443,     0,   432,   460,   461,   430,   436,   454,   434,   459,
+     433,   497,     0,   643,   620,   692,     0,   684,     0,     0,
+     317,   322,   328,   329,   325,   331,   327,   326,   333,   330,
+     332,   324,   323,   467,     0,   270,     0,   287,   284,   283,
+     194,   159,   192,   157,   203,     0,   202,     0,   190,   184,
+     195,   196,   187,   153,   191,   156,   193,   185,   186,   158,
+     198,   197,   183,   164,   180,   181,   165,   166,   167,   168,
+     175,   169,   178,   182,   171,   176,   172,   177,   170,   174,
+     173,   179,     0,   163,   189,   155,   188,   366,     0,   390,
+       0,     0,   441,   446,   451,   452,   449,   450,   448,   453,
+     447,   498,   693,   685,   321,   318,   468,   271,     0,   200,
+     205,   215,   213,   222,   212,   207,   216,   220,   209,   217,
+     219,   214,   208,   221,   223,   218,   210,   211,   206,   161,
+       0,   367,   391,   445,   442,   204,   201,   162
 };
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 516
-#if YYDEBUG
-const char * const yyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,"','",0,0,0,0,0,0,0,0,0,0,0,0,0,0,"';'",0,"'='",0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'{'",0,"'}'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"ACCEPT_PASSWORD","ACTION","ADMIN","AFTYPE","T_ALLOW","ANTI_NICK_FLOOD",
-"ANTI_SPAM_EXIT_MESSAGE_TIME","AUTOCONN","T_BLOCK","BURST_AWAY",
-"BURST_TOPICWHO","BYTES","KBYTES","MBYTES","GBYTES","TBYTES","CALLER_ID_WAIT",
-"CAN_FLOOD","CAN_IDLE","CHANNEL","CIDR_BITLEN_IPV4","CIDR_BITLEN_IPV6",
-"CIPHER_PREFERENCE","CLASS","COMPRESSED","COMPRESSION_LEVEL","CONNECT",
-"CONNECTFREQ","CRYPTLINK","DEFAULT_CIPHER_PREFERENCE","DEFAULT_FLOODCOUNT",
-"DEFAULT_SPLIT_SERVER_COUNT","DEFAULT_SPLIT_USER_COUNT","DENY","DESCRIPTION",
-"DIE","DISABLE_AUTH","DISABLE_FAKE_CHANNELS","DISABLE_HIDDEN",
-"DISABLE_LOCAL_CHANNELS","DISABLE_REMOTE_COMMANDS","DOT_IN_IP6_ADDR",
-"DOTS_IN_IDENT","DURATION","EGDPOOL_PATH","EMAIL","ENABLE","ENCRYPTED",
-"EXCEED_LIMIT","EXEMPT","FAILED_OPER_NOTICE","FAKENAME","IRCD_FLAGS",
-"FLATTEN_LINKS","FFAILED_OPERLOG","FKILLLOG","FKLINELOG","FGLINELOG",
-"FIOERRLOG","FOPERLOG","FOPERSPYLOG","FUSERLOG","GECOS","GENERAL","GLINE",
-"GLINES","GLINE_EXEMPT","GLINE_LOG","GLINE_TIME","GLINE_MIN_CIDR",
-"GLINE_MIN_CIDR6","GLOBAL_KILL","IRCD_AUTH","NEED_IDENT","HAVENT_READ_CONF",
-"HELP_CHANNEL","HIDDEN","HIDDEN_ADMIN","HIDDEN_NAME","HIDDEN_OPER",
-"HIDE_SERVER_IPS","HIDE_SERVERS","HIDE_SPOOF_IPS","HOST","HUB","HUB_MASK",
-"IDLETIME","IGNORE_BOGUS_TS","INVISIBLE_ON_CONNECT","IP","KILL",
-"KILL_CHASE_TIME_LIMIT","KLINE","KLINE_EXEMPT","KLINE_REASON",
-"KLINE_WITH_REASON","KNOCK_DELAY","KNOCK_DELAY_CHANNEL","LAZYLINK","LEAF_MASK",
-"LINKS_DELAY","LISTEN","T_LOG","LOGGING","LOG_LEVEL","MAX_ACCEPT","MAX_BANS",
-"MAX_CHANS_PER_USER","MAX_GLOBAL","MAX_IDENT","MAX_LOCAL","MAX_NICK_CHANGES",
-"MAX_NICK_TIME","MAX_NUMBER","MAX_TARGETS","MESSAGE_LOCALE","MIN_NONWILDCARD",
-"MIN_NONWILDCARD_SIMPLE","MODULE","MODULES","NAME","NEED_PASSWORD",
-"NETWORK_DESC","NETWORK_NAME","NICK","NICK_CHANGES","NO_CREATE_ON_SPLIT",
-"NO_JOIN_ON_SPLIT","NO_OPER_FLOOD","NO_TILDE","NOT","NUMBER","NUMBER_PER_IDENT",
-"NUMBER_PER_CIDR","NUMBER_PER_IP","NUMBER_PER_IP_GLOBAL","OPERATOR",
-"OPERS_BYPASS_CALLERID","OPER_LOG","OPER_ONLY_UMODES","OPER_PASS_RESV",
-"OPER_SPY_T","OPER_UMODES","JOIN_FLOOD_COUNT","JOIN_FLOOD_TIME","PACE_WAIT",
-"PACE_WAIT_SIMPLE","PASSWORD","PATH","PING_COOKIE","PING_TIME","PING_WARNING",
-"PORT","QSTRING","QUIET_ON_BAN","REASON","REDIRPORT","REDIRSERV","REGEX_T",
-"REHASH","TREJECT_HOLD_TIME","REMOTE","REMOTEBAN","RESTRICT_CHANNELS",
-"RESTRICTED","RSA_PRIVATE_KEY_FILE","RSA_PUBLIC_KEY_FILE",
-"SSL_CERTIFICATE_FILE","RESV","RESV_EXEMPT","SECONDS","MINUTES","HOURS","DAYS",
-"WEEKS","SENDQ","SEND_PASSWORD","SERVERHIDE","SERVERINFO","SERVLINK_PATH",
-"SERVICES_NAME","IRCD_SID","TKLINE_EXPIRE_NOTICES","T_SHARED","T_CLUSTER",
-"T_SNOOP","TYPE","SHORT_MOTD","SILENT","SPOOF","SPOOF_NOTICE",
-"STATS_E_DISABLED","STATS_I_OPER_ONLY","STATS_K_OPER_ONLY","STATS_O_OPER_ONLY",
-"STATS_P_OPER_ONLY","TBOOL","TMASKED","T_REJECT","TS_MAX_DELTA","TS_WARN_DELTA",
-"TWODOTS","T_ALL","T_BOTS","T_SOFTCALLERID","T_CALLERID","T_CCONN",
-"T_CCONN_FULL","T_CLIENT_FLOOD","T_DEAF","T_DEBUG","T_DRONE","T_EXTERNAL",
-"T_FULL","T_INVISIBLE","T_IPV4","T_IPV6","T_LOCOPS","T_LOGPATH","T_L_CRIT",
-"T_L_DEBUG","T_L_ERROR","T_L_INFO","T_L_NOTICE","T_L_TRACE","T_L_WARN",
-"T_MAX_CLIENTS","T_NCHANGE","T_OPERWALL","T_REJ","T_SERVNOTICE","T_SKILL",
-"T_SPY","T_SSL","T_UMODES","T_UNAUTH","T_UNRESV","T_UNXLINE","T_WALLOP",
-"THROTTLE_TIME","TOPICBURST","TRUE_NO_OPER_FLOOD","TKLINE","TXLINE","TRESV",
-"UNKLINE","USER","T_USERMODE","USE_EGD","USE_EXCEPT","USE_INVEX","USE_KNOCK",
-"USE_LOGGING","USE_WHOIS_ACTUALLY","VHOST","VHOST6","XLINE","WARN",
-"WARN_NO_NLINE","WEBIRC",
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     1,    25,   918,   919,  1074,  1075,    26,   278,   279,
+     280,   281,    27,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,    28,    74,
+      75,    76,    77,    78,    29,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,    30,
+      63,   283,   836,   837,   838,   284,   839,   840,   841,   842,
+     843,   844,  1157,  1462,  1463,   845,   846,   847,   848,   849,
+     850,   851,   852,   853,   854,   855,   856,   857,   858,   859,
+     860,  1142,  1425,  1426,  1488,  1427,  1508,    31,    69,   583,
+     584,   585,   586,    32,    51,   119,   625,   626,   627,   120,
+     628,   629,   630,   631,   632,   633,   634,   635,   636,   637,
+     638,   639,    33,    60,   503,   784,  1289,  1290,   504,   505,
+     506,  1295,  1114,  1115,   507,   508,    34,    58,   471,   472,
+     473,   474,   475,   476,   477,   478,   764,  1268,  1269,  1399,
+    1270,  1412,   479,   480,   481,   482,   483,   484,   485,   486,
+     487,   488,    35,    64,   534,   535,   536,   537,   538,    36,
+      67,   568,   569,   570,   571,   572,   891,  1336,  1337,    37,
+      68,   576,   577,   578,   579,   897,  1351,  1352,    38,    52,
+     122,   660,   661,   662,   123,   663,   664,   665,   666,   667,
+     668,   669,   670,   959,  1379,  1380,  1471,  1381,  1480,   671,
+     672,   673,   674,   675,   676,   677,   678,   679,   680,    39,
+      59,   493,   779,  1284,  1285,   494,   495,   496,   497,    40,
+      53,   366,   367,   368,   369,    41,   127,   128,   129,    42,
+      55,   377,   689,  1242,  1243,   378,   379,   380,   381,    43,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   416,  1053,  1054,   238,   414,  1031,  1032,   239,   240,
+     241,   242,   243,    44,    57,   446,   447,   448,   449,   450,
+     754,  1259,  1260,   451,   452,   453,   751,  1253,  1254,    45,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+      46,   294,   295,   296,   297,   298,   299,   300,   301,   302
 };
-const char * const yyrule[] = {
-"$accept : conf",
-"conf :",
-"conf : conf conf_item",
-"conf_item : admin_entry",
-"conf_item : logging_entry",
-"conf_item : oper_entry",
-"conf_item : channel_entry",
-"conf_item : class_entry",
-"conf_item : listen_entry",
-"conf_item : auth_entry",
-"conf_item : serverinfo_entry",
-"conf_item : serverhide_entry",
-"conf_item : resv_entry",
-"conf_item : shared_entry",
-"conf_item : cluster_entry",
-"conf_item : connect_entry",
-"conf_item : kill_entry",
-"conf_item : deny_entry",
-"conf_item : exempt_entry",
-"conf_item : general_entry",
-"conf_item : gline_entry",
-"conf_item : gecos_entry",
-"conf_item : modules_entry",
-"conf_item : webirc_entry",
-"conf_item : error ';'",
-"conf_item : error '}'",
-"timespec_ :",
-"timespec_ : timespec",
-"timespec : NUMBER timespec_",
-"timespec : NUMBER SECONDS timespec_",
-"timespec : NUMBER MINUTES timespec_",
-"timespec : NUMBER HOURS timespec_",
-"timespec : NUMBER DAYS timespec_",
-"timespec : NUMBER WEEKS timespec_",
-"sizespec_ :",
-"sizespec_ : sizespec",
-"sizespec : NUMBER sizespec_",
-"sizespec : NUMBER BYTES sizespec_",
-"sizespec : NUMBER KBYTES sizespec_",
-"sizespec : NUMBER MBYTES sizespec_",
-"modules_entry : MODULES '{' modules_items '}' ';'",
-"modules_items : modules_items modules_item",
-"modules_items : modules_item",
-"modules_item : modules_module",
-"modules_item : modules_path",
-"modules_item : error ';'",
-"modules_module : MODULE '=' QSTRING ';'",
-"modules_path : PATH '=' QSTRING ';'",
-"serverinfo_entry : SERVERINFO '{' serverinfo_items '}' ';'",
-"serverinfo_items : serverinfo_items serverinfo_item",
-"serverinfo_items : serverinfo_item",
-"serverinfo_item : serverinfo_name",
-"serverinfo_item : serverinfo_vhost",
-"serverinfo_item : serverinfo_hub",
-"serverinfo_item : serverinfo_description",
-"serverinfo_item : serverinfo_network_name",
-"serverinfo_item : serverinfo_network_desc",
-"serverinfo_item : serverinfo_services_name",
-"serverinfo_item : serverinfo_help_channel",
-"serverinfo_item : serverinfo_max_clients",
-"serverinfo_item : serverinfo_rsa_private_key_file",
-"serverinfo_item : serverinfo_vhost6",
-"serverinfo_item : serverinfo_sid",
-"serverinfo_item : serverinfo_ssl_certificate_file",
-"serverinfo_item : error ';'",
-"serverinfo_ssl_certificate_file : SSL_CERTIFICATE_FILE '=' QSTRING ';'",
-"serverinfo_rsa_private_key_file : RSA_PRIVATE_KEY_FILE '=' QSTRING ';'",
-"serverinfo_name : NAME '=' QSTRING ';'",
-"serverinfo_sid : IRCD_SID '=' QSTRING ';'",
-"serverinfo_description : DESCRIPTION '=' QSTRING ';'",
-"serverinfo_network_name : NETWORK_NAME '=' QSTRING ';'",
-"serverinfo_network_desc : NETWORK_DESC '=' QSTRING ';'",
-"serverinfo_services_name : SERVICES_NAME '=' QSTRING ';'",
-"serverinfo_help_channel : HELP_CHANNEL '=' QSTRING ';'",
-"serverinfo_vhost : VHOST '=' QSTRING ';'",
-"serverinfo_vhost6 : VHOST6 '=' QSTRING ';'",
-"serverinfo_max_clients : T_MAX_CLIENTS '=' NUMBER ';'",
-"serverinfo_hub : HUB '=' TBOOL ';'",
-"admin_entry : ADMIN '{' admin_items '}' ';'",
-"admin_items : admin_items admin_item",
-"admin_items : admin_item",
-"admin_item : admin_name",
-"admin_item : admin_description",
-"admin_item : admin_email",
-"admin_item : error ';'",
-"admin_name : NAME '=' QSTRING ';'",
-"admin_email : EMAIL '=' QSTRING ';'",
-"admin_description : DESCRIPTION '=' QSTRING ';'",
-"logging_entry : LOGGING '{' logging_items '}' ';'",
-"logging_items : logging_items logging_item",
-"logging_items : logging_item",
-"logging_item : logging_path",
-"logging_item : logging_oper_log",
-"logging_item : logging_log_level",
-"logging_item : logging_use_logging",
-"logging_item : logging_fuserlog",
-"logging_item : logging_foperlog",
-"logging_item : logging_fglinelog",
-"logging_item : logging_fklinelog",
-"logging_item : logging_killlog",
-"logging_item : logging_foperspylog",
-"logging_item : logging_ioerrlog",
-"logging_item : logging_ffailed_operlog",
-"logging_item : error ';'",
-"logging_path : T_LOGPATH '=' QSTRING ';'",
-"logging_oper_log : OPER_LOG '=' QSTRING ';'",
-"logging_fuserlog : FUSERLOG '=' QSTRING ';'",
-"logging_ffailed_operlog : FFAILED_OPERLOG '=' QSTRING ';'",
-"logging_foperlog : FOPERLOG '=' QSTRING ';'",
-"logging_foperspylog : FOPERSPYLOG '=' QSTRING ';'",
-"logging_fglinelog : FGLINELOG '=' QSTRING ';'",
-"logging_fklinelog : FKLINELOG '=' QSTRING ';'",
-"logging_ioerrlog : FIOERRLOG '=' QSTRING ';'",
-"logging_killlog : FKILLLOG '=' QSTRING ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_CRIT ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_ERROR ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_WARN ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_NOTICE ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_TRACE ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_INFO ';'",
-"logging_log_level : LOG_LEVEL '=' T_L_DEBUG ';'",
-"logging_use_logging : USE_LOGGING '=' TBOOL ';'",
-"$$1 :",
-"oper_entry : OPERATOR $$1 oper_name_b '{' oper_items '}' ';'",
-"oper_name_b :",
-"oper_name_b : oper_name_t",
-"oper_items : oper_items oper_item",
-"oper_items : oper_item",
-"oper_item : oper_name",
-"oper_item : oper_user",
-"oper_item : oper_password",
-"oper_item : oper_hidden_admin",
-"oper_item : oper_hidden_oper",
-"oper_item : oper_umodes",
-"oper_item : oper_class",
-"oper_item : oper_global_kill",
-"oper_item : oper_remote",
-"oper_item : oper_kline",
-"oper_item : oper_xline",
-"oper_item : oper_unkline",
-"oper_item : oper_gline",
-"oper_item : oper_nick_changes",
-"oper_item : oper_remoteban",
-"oper_item : oper_die",
-"oper_item : oper_rehash",
-"oper_item : oper_admin",
-"oper_item : oper_operwall",
-"oper_item : oper_snoop",
-"oper_item : oper_encrypted",
-"oper_item : oper_rsa_public_key_file",
-"oper_item : oper_flags",
-"oper_item : error ';'",
-"oper_name : NAME '=' QSTRING ';'",
-"oper_name_t : QSTRING",
-"oper_user : USER '=' QSTRING ';'",
-"oper_password : PASSWORD '=' QSTRING ';'",
-"oper_encrypted : ENCRYPTED '=' TBOOL ';'",
-"oper_rsa_public_key_file : RSA_PUBLIC_KEY_FILE '=' QSTRING ';'",
-"oper_class : CLASS '=' QSTRING ';'",
-"$$2 :",
-"oper_umodes : T_UMODES $$2 '=' oper_umodes_items ';'",
-"oper_umodes_items : oper_umodes_items ',' oper_umodes_item",
-"oper_umodes_items : oper_umodes_item",
-"oper_umodes_item : T_BOTS",
-"oper_umodes_item : T_CCONN",
-"oper_umodes_item : T_CCONN_FULL",
-"oper_umodes_item : T_DEAF",
-"oper_umodes_item : T_DEBUG",
-"oper_umodes_item : T_FULL",
-"oper_umodes_item : T_SKILL",
-"oper_umodes_item : T_NCHANGE",
-"oper_umodes_item : T_REJ",
-"oper_umodes_item : T_UNAUTH",
-"oper_umodes_item : T_SPY",
-"oper_umodes_item : T_EXTERNAL",
-"oper_umodes_item : T_OPERWALL",
-"oper_umodes_item : T_SERVNOTICE",
-"oper_umodes_item : T_INVISIBLE",
-"oper_umodes_item : T_WALLOP",
-"oper_umodes_item : T_SOFTCALLERID",
-"oper_umodes_item : T_CALLERID",
-"oper_umodes_item : T_LOCOPS",
-"oper_global_kill : GLOBAL_KILL '=' TBOOL ';'",
-"oper_remote : REMOTE '=' TBOOL ';'",
-"oper_remoteban : REMOTEBAN '=' TBOOL ';'",
-"oper_kline : KLINE '=' TBOOL ';'",
-"oper_xline : XLINE '=' TBOOL ';'",
-"oper_unkline : UNKLINE '=' TBOOL ';'",
-"oper_gline : GLINE '=' TBOOL ';'",
-"oper_nick_changes : NICK_CHANGES '=' TBOOL ';'",
-"oper_die : DIE '=' TBOOL ';'",
-"oper_rehash : REHASH '=' TBOOL ';'",
-"oper_admin : ADMIN '=' TBOOL ';'",
-"oper_hidden_admin : HIDDEN_ADMIN '=' TBOOL ';'",
-"oper_hidden_oper : HIDDEN_OPER '=' TBOOL ';'",
-"oper_operwall : T_OPERWALL '=' TBOOL ';'",
-"oper_snoop : T_SNOOP '=' TBOOL ';'",
-"$$3 :",
-"oper_flags : IRCD_FLAGS $$3 '=' oper_flags_items ';'",
-"oper_flags_items : oper_flags_items ',' oper_flags_item",
-"oper_flags_items : oper_flags_item",
-"$$4 :",
-"oper_flags_item : NOT $$4 oper_flags_item_atom",
-"$$5 :",
-"oper_flags_item : $$5 oper_flags_item_atom",
-"oper_flags_item_atom : GLOBAL_KILL",
-"oper_flags_item_atom : REMOTE",
-"oper_flags_item_atom : KLINE",
-"oper_flags_item_atom : UNKLINE",
-"oper_flags_item_atom : XLINE",
-"oper_flags_item_atom : GLINE",
-"oper_flags_item_atom : DIE",
-"oper_flags_item_atom : REHASH",
-"oper_flags_item_atom : ADMIN",
-"oper_flags_item_atom : HIDDEN_ADMIN",
-"oper_flags_item_atom : NICK_CHANGES",
-"oper_flags_item_atom : T_OPERWALL",
-"oper_flags_item_atom : OPER_SPY_T",
-"oper_flags_item_atom : HIDDEN_OPER",
-"oper_flags_item_atom : REMOTEBAN",
-"oper_flags_item_atom : ENCRYPTED",
-"oper_flags_item_atom : T_SNOOP",
-"$$6 :",
-"webirc_entry : WEBIRC $$6 '{' webirc_items '}' ';'",
-"webirc_items : webirc_items webirc_item",
-"webirc_items : webirc_item",
-"webirc_item : webirc_host",
-"webirc_item : webirc_passwd",
-"webirc_item : error ';'",
-"webirc_host : HOST '=' QSTRING ';'",
-"webirc_passwd : PASSWORD '=' QSTRING ';'",
-"$$7 :",
-"class_entry : CLASS $$7 class_name_b '{' class_items '}' ';'",
-"class_name_b :",
-"class_name_b : class_name_t",
-"class_items : class_items class_item",
-"class_items : class_item",
-"class_item : class_name",
-"class_item : class_cidr_bitlen_ipv4",
-"class_item : class_cidr_bitlen_ipv6",
-"class_item : class_ping_time",
-"class_item : class_ping_warning",
-"class_item : class_number_per_cidr",
-"class_item : class_number_per_ip",
-"class_item : class_connectfreq",
-"class_item : class_max_number",
-"class_item : class_max_global",
-"class_item : class_max_local",
-"class_item : class_max_ident",
-"class_item : class_sendq",
-"class_item : error ';'",
-"class_name : NAME '=' QSTRING ';'",
-"class_name_t : QSTRING",
-"class_ping_time : PING_TIME '=' timespec ';'",
-"class_ping_warning : PING_WARNING '=' timespec ';'",
-"class_number_per_ip : NUMBER_PER_IP '=' NUMBER ';'",
-"class_connectfreq : CONNECTFREQ '=' timespec ';'",
-"class_max_number : MAX_NUMBER '=' NUMBER ';'",
-"class_max_global : MAX_GLOBAL '=' NUMBER ';'",
-"class_max_local : MAX_LOCAL '=' NUMBER ';'",
-"class_max_ident : MAX_IDENT '=' NUMBER ';'",
-"class_sendq : SENDQ '=' sizespec ';'",
-"class_cidr_bitlen_ipv4 : CIDR_BITLEN_IPV4 '=' NUMBER ';'",
-"class_cidr_bitlen_ipv6 : CIDR_BITLEN_IPV6 '=' NUMBER ';'",
-"class_number_per_cidr : NUMBER_PER_CIDR '=' NUMBER ';'",
-"$$8 :",
-"listen_entry : LISTEN $$8 '{' listen_items '}' ';'",
-"$$9 :",
-"listen_flags : IRCD_FLAGS $$9 '=' listen_flags_items ';'",
-"listen_flags_items : listen_flags_items ',' listen_flags_item",
-"listen_flags_items : listen_flags_item",
-"listen_flags_item : T_SSL",
-"listen_flags_item : HIDDEN",
-"listen_items : listen_items listen_item",
-"listen_items : listen_item",
-"listen_item : listen_port",
-"listen_item : listen_flags",
-"listen_item : listen_address",
-"listen_item : listen_host",
-"listen_item : error ';'",
-"$$10 :",
-"listen_port : PORT '=' port_items $$10 ';'",
-"port_items : port_items ',' port_item",
-"port_items : port_item",
-"port_item : NUMBER",
-"port_item : NUMBER TWODOTS NUMBER",
-"listen_address : IP '=' QSTRING ';'",
-"listen_host : HOST '=' QSTRING ';'",
-"$$11 :",
-"auth_entry : IRCD_AUTH $$11 '{' auth_items '}' ';'",
-"auth_items : auth_items auth_item",
-"auth_items : auth_item",
-"auth_item : auth_user",
-"auth_item : auth_passwd",
-"auth_item : auth_class",
-"auth_item : auth_flags",
-"auth_item : auth_kline_exempt",
-"auth_item : auth_need_ident",
-"auth_item : auth_exceed_limit",
-"auth_item : auth_no_tilde",
-"auth_item : auth_gline_exempt",
-"auth_item : auth_spoof",
-"auth_item : auth_spoof_notice",
-"auth_item : auth_redir_serv",
-"auth_item : auth_redir_port",
-"auth_item : auth_can_flood",
-"auth_item : auth_need_password",
-"auth_item : auth_encrypted",
-"auth_item : error ';'",
-"auth_user : USER '=' QSTRING ';'",
-"auth_passwd : PASSWORD '=' QSTRING ';'",
-"auth_spoof_notice : SPOOF_NOTICE '=' TBOOL ';'",
-"auth_class : CLASS '=' QSTRING ';'",
-"auth_encrypted : ENCRYPTED '=' TBOOL ';'",
-"$$12 :",
-"auth_flags : IRCD_FLAGS $$12 '=' auth_flags_items ';'",
-"auth_flags_items : auth_flags_items ',' auth_flags_item",
-"auth_flags_items : auth_flags_item",
-"$$13 :",
-"auth_flags_item : NOT $$13 auth_flags_item_atom",
-"$$14 :",
-"auth_flags_item : $$14 auth_flags_item_atom",
-"auth_flags_item_atom : SPOOF_NOTICE",
-"auth_flags_item_atom : EXCEED_LIMIT",
-"auth_flags_item_atom : KLINE_EXEMPT",
-"auth_flags_item_atom : NEED_IDENT",
-"auth_flags_item_atom : CAN_FLOOD",
-"auth_flags_item_atom : CAN_IDLE",
-"auth_flags_item_atom : NO_TILDE",
-"auth_flags_item_atom : GLINE_EXEMPT",
-"auth_flags_item_atom : RESV_EXEMPT",
-"auth_flags_item_atom : NEED_PASSWORD",
-"auth_kline_exempt : KLINE_EXEMPT '=' TBOOL ';'",
-"auth_need_ident : NEED_IDENT '=' TBOOL ';'",
-"auth_exceed_limit : EXCEED_LIMIT '=' TBOOL ';'",
-"auth_can_flood : CAN_FLOOD '=' TBOOL ';'",
-"auth_no_tilde : NO_TILDE '=' TBOOL ';'",
-"auth_gline_exempt : GLINE_EXEMPT '=' TBOOL ';'",
-"auth_spoof : SPOOF '=' QSTRING ';'",
-"auth_redir_serv : REDIRSERV '=' QSTRING ';'",
-"auth_redir_port : REDIRPORT '=' NUMBER ';'",
-"auth_need_password : NEED_PASSWORD '=' TBOOL ';'",
-"$$15 :",
-"resv_entry : RESV $$15 '{' resv_items '}' ';'",
-"resv_items : resv_items resv_item",
-"resv_items : resv_item",
-"resv_item : resv_creason",
-"resv_item : resv_channel",
-"resv_item : resv_nick",
-"resv_item : error ';'",
-"resv_creason : REASON '=' QSTRING ';'",
-"resv_channel : CHANNEL '=' QSTRING ';'",
-"resv_nick : NICK '=' QSTRING ';'",
-"$$16 :",
-"shared_entry : T_SHARED $$16 '{' shared_items '}' ';'",
-"shared_items : shared_items shared_item",
-"shared_items : shared_item",
-"shared_item : shared_name",
-"shared_item : shared_user",
-"shared_item : shared_type",
-"shared_item : error ';'",
-"shared_name : NAME '=' QSTRING ';'",
-"shared_user : USER '=' QSTRING ';'",
-"$$17 :",
-"shared_type : TYPE $$17 '=' shared_types ';'",
-"shared_types : shared_types ',' shared_type_item",
-"shared_types : shared_type_item",
-"shared_type_item : KLINE",
-"shared_type_item : TKLINE",
-"shared_type_item : UNKLINE",
-"shared_type_item : XLINE",
-"shared_type_item : TXLINE",
-"shared_type_item : T_UNXLINE",
-"shared_type_item : RESV",
-"shared_type_item : TRESV",
-"shared_type_item : T_UNRESV",
-"shared_type_item : T_LOCOPS",
-"shared_type_item : T_USERMODE",
-"shared_type_item : T_ALL",
-"$$18 :",
-"cluster_entry : T_CLUSTER $$18 '{' cluster_items '}' ';'",
-"cluster_items : cluster_items cluster_item",
-"cluster_items : cluster_item",
-"cluster_item : cluster_name",
-"cluster_item : cluster_type",
-"cluster_item : error ';'",
-"cluster_name : NAME '=' QSTRING ';'",
-"$$19 :",
-"cluster_type : TYPE $$19 '=' cluster_types ';'",
-"cluster_types : cluster_types ',' cluster_type_item",
-"cluster_types : cluster_type_item",
-"cluster_type_item : KLINE",
-"cluster_type_item : TKLINE",
-"cluster_type_item : UNKLINE",
-"cluster_type_item : XLINE",
-"cluster_type_item : TXLINE",
-"cluster_type_item : T_UNXLINE",
-"cluster_type_item : RESV",
-"cluster_type_item : TRESV",
-"cluster_type_item : T_UNRESV",
-"cluster_type_item : T_LOCOPS",
-"cluster_type_item : T_ALL",
-"$$20 :",
-"connect_entry : CONNECT $$20 connect_name_b '{' connect_items '}' ';'",
-"connect_name_b :",
-"connect_name_b : connect_name_t",
-"connect_items : connect_items connect_item",
-"connect_items : connect_item",
-"connect_item : connect_name",
-"connect_item : connect_host",
-"connect_item : connect_vhost",
-"connect_item : connect_send_password",
-"connect_item : connect_accept_password",
-"connect_item : connect_aftype",
-"connect_item : connect_port",
-"connect_item : connect_fakename",
-"connect_item : connect_flags",
-"connect_item : connect_hub_mask",
-"connect_item : connect_leaf_mask",
-"connect_item : connect_class",
-"connect_item : connect_auto",
-"connect_item : connect_encrypted",
-"connect_item : connect_compressed",
-"connect_item : connect_cryptlink",
-"connect_item : connect_rsa_public_key_file",
-"connect_item : connect_cipher_preference",
-"connect_item : connect_topicburst",
-"connect_item : error ';'",
-"connect_name : NAME '=' QSTRING ';'",
-"connect_name_t : QSTRING",
-"connect_host : HOST '=' QSTRING ';'",
-"connect_vhost : VHOST '=' QSTRING ';'",
-"connect_send_password : SEND_PASSWORD '=' QSTRING ';'",
-"connect_accept_password : ACCEPT_PASSWORD '=' QSTRING ';'",
-"connect_port : PORT '=' NUMBER ';'",
-"connect_aftype : AFTYPE '=' T_IPV4 ';'",
-"connect_aftype : AFTYPE '=' T_IPV6 ';'",
-"connect_fakename : FAKENAME '=' QSTRING ';'",
-"$$21 :",
-"connect_flags : IRCD_FLAGS $$21 '=' connect_flags_items ';'",
-"connect_flags_items : connect_flags_items ',' connect_flags_item",
-"connect_flags_items : connect_flags_item",
-"$$22 :",
-"connect_flags_item : NOT $$22 connect_flags_item_atom",
-"$$23 :",
-"connect_flags_item : $$23 connect_flags_item_atom",
-"connect_flags_item_atom : LAZYLINK",
-"connect_flags_item_atom : COMPRESSED",
-"connect_flags_item_atom : CRYPTLINK",
-"connect_flags_item_atom : AUTOCONN",
-"connect_flags_item_atom : BURST_AWAY",
-"connect_flags_item_atom : TOPICBURST",
-"connect_rsa_public_key_file : RSA_PUBLIC_KEY_FILE '=' QSTRING ';'",
-"connect_encrypted : ENCRYPTED '=' TBOOL ';'",
-"connect_cryptlink : CRYPTLINK '=' TBOOL ';'",
-"connect_compressed : COMPRESSED '=' TBOOL ';'",
-"connect_auto : AUTOCONN '=' TBOOL ';'",
-"connect_topicburst : TOPICBURST '=' TBOOL ';'",
-"connect_hub_mask : HUB_MASK '=' QSTRING ';'",
-"connect_leaf_mask : LEAF_MASK '=' QSTRING ';'",
-"connect_class : CLASS '=' QSTRING ';'",
-"connect_cipher_preference : CIPHER_PREFERENCE '=' QSTRING ';'",
-"$$24 :",
-"kill_entry : KILL $$24 '{' kill_items '}' ';'",
-"$$25 :",
-"kill_type : TYPE $$25 '=' kill_type_items ';'",
-"kill_type_items : kill_type_items ',' kill_type_item",
-"kill_type_items : kill_type_item",
-"kill_type_item : REGEX_T",
-"kill_items : kill_items kill_item",
-"kill_items : kill_item",
-"kill_item : kill_user",
-"kill_item : kill_reason",
-"kill_item : kill_type",
-"kill_item : error",
-"kill_user : USER '=' QSTRING ';'",
-"kill_reason : REASON '=' QSTRING ';'",
-"$$26 :",
-"deny_entry : DENY $$26 '{' deny_items '}' ';'",
-"deny_items : deny_items deny_item",
-"deny_items : deny_item",
-"deny_item : deny_ip",
-"deny_item : deny_reason",
-"deny_item : error",
-"deny_ip : IP '=' QSTRING ';'",
-"deny_reason : REASON '=' QSTRING ';'",
-"exempt_entry : EXEMPT '{' exempt_items '}' ';'",
-"exempt_items : exempt_items exempt_item",
-"exempt_items : exempt_item",
-"exempt_item : exempt_ip",
-"exempt_item : error",
-"exempt_ip : IP '=' QSTRING ';'",
-"$$27 :",
-"gecos_entry : GECOS $$27 '{' gecos_items '}' ';'",
-"$$28 :",
-"gecos_flags : TYPE $$28 '=' gecos_flags_items ';'",
-"gecos_flags_items : gecos_flags_items ',' gecos_flags_item",
-"gecos_flags_items : gecos_flags_item",
-"gecos_flags_item : REGEX_T",
-"gecos_items : gecos_items gecos_item",
-"gecos_items : gecos_item",
-"gecos_item : gecos_name",
-"gecos_item : gecos_reason",
-"gecos_item : gecos_flags",
-"gecos_item : error",
-"gecos_name : NAME '=' QSTRING ';'",
-"gecos_reason : REASON '=' QSTRING ';'",
-"general_entry : GENERAL '{' general_items '}' ';'",
-"general_items : general_items general_item",
-"general_items : general_item",
-"general_item : general_hide_spoof_ips",
-"general_item : general_ignore_bogus_ts",
-"general_item : general_failed_oper_notice",
-"general_item : general_anti_nick_flood",
-"general_item : general_max_nick_time",
-"general_item : general_max_nick_changes",
-"general_item : general_max_accept",
-"general_item : general_anti_spam_exit_message_time",
-"general_item : general_ts_warn_delta",
-"general_item : general_ts_max_delta",
-"general_item : general_kill_chase_time_limit",
-"general_item : general_kline_with_reason",
-"general_item : general_kline_reason",
-"general_item : general_invisible_on_connect",
-"general_item : general_warn_no_nline",
-"general_item : general_dots_in_ident",
-"general_item : general_stats_o_oper_only",
-"general_item : general_stats_k_oper_only",
-"general_item : general_pace_wait",
-"general_item : general_stats_i_oper_only",
-"general_item : general_pace_wait_simple",
-"general_item : general_stats_P_oper_only",
-"general_item : general_short_motd",
-"general_item : general_no_oper_flood",
-"general_item : general_true_no_oper_flood",
-"general_item : general_oper_pass_resv",
-"general_item : general_idletime",
-"general_item : general_message_locale",
-"general_item : general_oper_only_umodes",
-"general_item : general_max_targets",
-"general_item : general_use_egd",
-"general_item : general_egdpool_path",
-"general_item : general_oper_umodes",
-"general_item : general_caller_id_wait",
-"general_item : general_opers_bypass_callerid",
-"general_item : general_default_floodcount",
-"general_item : general_min_nonwildcard",
-"general_item : general_min_nonwildcard_simple",
-"general_item : general_servlink_path",
-"general_item : general_disable_remote_commands",
-"general_item : general_default_cipher_preference",
-"general_item : general_compression_level",
-"general_item : general_client_flood",
-"general_item : general_throttle_time",
-"general_item : general_havent_read_conf",
-"general_item : general_dot_in_ip6_addr",
-"general_item : general_ping_cookie",
-"general_item : general_disable_auth",
-"general_item : general_burst_away",
-"general_item : general_tkline_expire_notices",
-"general_item : general_gline_min_cidr",
-"general_item : general_gline_min_cidr6",
-"general_item : general_use_whois_actually",
-"general_item : general_reject_hold_time",
-"general_item : general_stats_e_disabled",
-"general_item : error",
-"general_gline_min_cidr : GLINE_MIN_CIDR '=' NUMBER ';'",
-"general_gline_min_cidr6 : GLINE_MIN_CIDR6 '=' NUMBER ';'",
-"general_burst_away : BURST_AWAY '=' TBOOL ';'",
-"general_use_whois_actually : USE_WHOIS_ACTUALLY '=' TBOOL ';'",
-"general_reject_hold_time : TREJECT_HOLD_TIME '=' timespec ';'",
-"general_tkline_expire_notices : TKLINE_EXPIRE_NOTICES '=' TBOOL ';'",
-"general_kill_chase_time_limit : KILL_CHASE_TIME_LIMIT '=' NUMBER ';'",
-"general_hide_spoof_ips : HIDE_SPOOF_IPS '=' TBOOL ';'",
-"general_ignore_bogus_ts : IGNORE_BOGUS_TS '=' TBOOL ';'",
-"general_disable_remote_commands : DISABLE_REMOTE_COMMANDS '=' TBOOL ';'",
-"general_failed_oper_notice : FAILED_OPER_NOTICE '=' TBOOL ';'",
-"general_anti_nick_flood : ANTI_NICK_FLOOD '=' TBOOL ';'",
-"general_max_nick_time : MAX_NICK_TIME '=' timespec ';'",
-"general_max_nick_changes : MAX_NICK_CHANGES '=' NUMBER ';'",
-"general_max_accept : MAX_ACCEPT '=' NUMBER ';'",
-"general_anti_spam_exit_message_time : ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'",
-"general_ts_warn_delta : TS_WARN_DELTA '=' timespec ';'",
-"general_ts_max_delta : TS_MAX_DELTA '=' timespec ';'",
-"general_havent_read_conf : HAVENT_READ_CONF '=' NUMBER ';'",
-"general_kline_with_reason : KLINE_WITH_REASON '=' TBOOL ';'",
-"general_kline_reason : KLINE_REASON '=' QSTRING ';'",
-"general_invisible_on_connect : INVISIBLE_ON_CONNECT '=' TBOOL ';'",
-"general_warn_no_nline : WARN_NO_NLINE '=' TBOOL ';'",
-"general_stats_e_disabled : STATS_E_DISABLED '=' TBOOL ';'",
-"general_stats_o_oper_only : STATS_O_OPER_ONLY '=' TBOOL ';'",
-"general_stats_P_oper_only : STATS_P_OPER_ONLY '=' TBOOL ';'",
-"general_stats_k_oper_only : STATS_K_OPER_ONLY '=' TBOOL ';'",
-"general_stats_k_oper_only : STATS_K_OPER_ONLY '=' TMASKED ';'",
-"general_stats_i_oper_only : STATS_I_OPER_ONLY '=' TBOOL ';'",
-"general_stats_i_oper_only : STATS_I_OPER_ONLY '=' TMASKED ';'",
-"general_pace_wait : PACE_WAIT '=' timespec ';'",
-"general_caller_id_wait : CALLER_ID_WAIT '=' timespec ';'",
-"general_opers_bypass_callerid : OPERS_BYPASS_CALLERID '=' TBOOL ';'",
-"general_pace_wait_simple : PACE_WAIT_SIMPLE '=' timespec ';'",
-"general_short_motd : SHORT_MOTD '=' TBOOL ';'",
-"general_no_oper_flood : NO_OPER_FLOOD '=' TBOOL ';'",
-"general_true_no_oper_flood : TRUE_NO_OPER_FLOOD '=' TBOOL ';'",
-"general_oper_pass_resv : OPER_PASS_RESV '=' TBOOL ';'",
-"general_message_locale : MESSAGE_LOCALE '=' QSTRING ';'",
-"general_idletime : IDLETIME '=' timespec ';'",
-"general_dots_in_ident : DOTS_IN_IDENT '=' NUMBER ';'",
-"general_max_targets : MAX_TARGETS '=' NUMBER ';'",
-"general_servlink_path : SERVLINK_PATH '=' QSTRING ';'",
-"general_default_cipher_preference : DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'",
-"general_compression_level : COMPRESSION_LEVEL '=' NUMBER ';'",
-"general_use_egd : USE_EGD '=' TBOOL ';'",
-"general_egdpool_path : EGDPOOL_PATH '=' QSTRING ';'",
-"general_ping_cookie : PING_COOKIE '=' TBOOL ';'",
-"general_disable_auth : DISABLE_AUTH '=' TBOOL ';'",
-"general_throttle_time : THROTTLE_TIME '=' timespec ';'",
-"$$29 :",
-"general_oper_umodes : OPER_UMODES $$29 '=' umode_oitems ';'",
-"umode_oitems : umode_oitems ',' umode_oitem",
-"umode_oitems : umode_oitem",
-"umode_oitem : T_BOTS",
-"umode_oitem : T_CCONN",
-"umode_oitem : T_CCONN_FULL",
-"umode_oitem : T_DEAF",
-"umode_oitem : T_DEBUG",
-"umode_oitem : T_FULL",
-"umode_oitem : T_SKILL",
-"umode_oitem : T_NCHANGE",
-"umode_oitem : T_REJ",
-"umode_oitem : T_UNAUTH",
-"umode_oitem : T_SPY",
-"umode_oitem : T_EXTERNAL",
-"umode_oitem : T_OPERWALL",
-"umode_oitem : T_SERVNOTICE",
-"umode_oitem : T_INVISIBLE",
-"umode_oitem : T_WALLOP",
-"umode_oitem : T_SOFTCALLERID",
-"umode_oitem : T_CALLERID",
-"umode_oitem : T_LOCOPS",
-"$$30 :",
-"general_oper_only_umodes : OPER_ONLY_UMODES $$30 '=' umode_items ';'",
-"umode_items : umode_items ',' umode_item",
-"umode_items : umode_item",
-"umode_item : T_BOTS",
-"umode_item : T_CCONN",
-"umode_item : T_CCONN_FULL",
-"umode_item : T_DEAF",
-"umode_item : T_DEBUG",
-"umode_item : T_FULL",
-"umode_item : T_SKILL",
-"umode_item : T_NCHANGE",
-"umode_item : T_REJ",
-"umode_item : T_UNAUTH",
-"umode_item : T_SPY",
-"umode_item : T_EXTERNAL",
-"umode_item : T_OPERWALL",
-"umode_item : T_SERVNOTICE",
-"umode_item : T_INVISIBLE",
-"umode_item : T_WALLOP",
-"umode_item : T_SOFTCALLERID",
-"umode_item : T_CALLERID",
-"umode_item : T_LOCOPS",
-"general_min_nonwildcard : MIN_NONWILDCARD '=' NUMBER ';'",
-"general_min_nonwildcard_simple : MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'",
-"general_default_floodcount : DEFAULT_FLOODCOUNT '=' NUMBER ';'",
-"general_client_flood : T_CLIENT_FLOOD '=' sizespec ';'",
-"general_dot_in_ip6_addr : DOT_IN_IP6_ADDR '=' TBOOL ';'",
-"$$31 :",
-"gline_entry : GLINES $$31 '{' gline_items '}' ';'",
-"gline_items : gline_items gline_item",
-"gline_items : gline_item",
-"gline_item : gline_enable",
-"gline_item : gline_duration",
-"gline_item : gline_logging",
-"gline_item : gline_user",
-"gline_item : gline_server",
-"gline_item : gline_action",
-"gline_item : error",
-"gline_enable : ENABLE '=' TBOOL ';'",
-"gline_duration : DURATION '=' timespec ';'",
-"$$32 :",
-"gline_logging : LOGGING $$32 '=' gline_logging_types ';'",
-"gline_logging_types : gline_logging_types ',' gline_logging_type_item",
-"gline_logging_types : gline_logging_type_item",
-"gline_logging_type_item : T_REJECT",
-"gline_logging_type_item : T_BLOCK",
-"gline_user : USER '=' QSTRING ';'",
-"gline_server : NAME '=' QSTRING ';'",
-"$$33 :",
-"gline_action : ACTION $$33 '=' gdeny_types ';'",
-"gdeny_types : gdeny_types ',' gdeny_type_item",
-"gdeny_types : gdeny_type_item",
-"gdeny_type_item : T_REJECT",
-"gdeny_type_item : T_BLOCK",
-"channel_entry : CHANNEL '{' channel_items '}' ';'",
-"channel_items : channel_items channel_item",
-"channel_items : channel_item",
-"channel_item : channel_disable_local_channels",
-"channel_item : channel_use_except",
-"channel_item : channel_use_invex",
-"channel_item : channel_use_knock",
-"channel_item : channel_max_bans",
-"channel_item : channel_knock_delay",
-"channel_item : channel_knock_delay_channel",
-"channel_item : channel_max_chans_per_user",
-"channel_item : channel_quiet_on_ban",
-"channel_item : channel_default_split_user_count",
-"channel_item : channel_default_split_server_count",
-"channel_item : channel_no_create_on_split",
-"channel_item : channel_restrict_channels",
-"channel_item : channel_no_join_on_split",
-"channel_item : channel_burst_topicwho",
-"channel_item : channel_jflood_count",
-"channel_item : channel_jflood_time",
-"channel_item : channel_disable_fake_channels",
-"channel_item : error",
-"channel_disable_fake_channels : DISABLE_FAKE_CHANNELS '=' TBOOL ';'",
-"channel_restrict_channels : RESTRICT_CHANNELS '=' TBOOL ';'",
-"channel_disable_local_channels : DISABLE_LOCAL_CHANNELS '=' TBOOL ';'",
-"channel_use_except : USE_EXCEPT '=' TBOOL ';'",
-"channel_use_invex : USE_INVEX '=' TBOOL ';'",
-"channel_use_knock : USE_KNOCK '=' TBOOL ';'",
-"channel_knock_delay : KNOCK_DELAY '=' timespec ';'",
-"channel_knock_delay_channel : KNOCK_DELAY_CHANNEL '=' timespec ';'",
-"channel_max_chans_per_user : MAX_CHANS_PER_USER '=' NUMBER ';'",
-"channel_quiet_on_ban : QUIET_ON_BAN '=' TBOOL ';'",
-"channel_max_bans : MAX_BANS '=' NUMBER ';'",
-"channel_default_split_user_count : DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'",
-"channel_default_split_server_count : DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'",
-"channel_no_create_on_split : NO_CREATE_ON_SPLIT '=' TBOOL ';'",
-"channel_no_join_on_split : NO_JOIN_ON_SPLIT '=' TBOOL ';'",
-"channel_burst_topicwho : BURST_TOPICWHO '=' TBOOL ';'",
-"channel_jflood_count : JOIN_FLOOD_COUNT '=' NUMBER ';'",
-"channel_jflood_time : JOIN_FLOOD_TIME '=' timespec ';'",
-"serverhide_entry : SERVERHIDE '{' serverhide_items '}' ';'",
-"serverhide_items : serverhide_items serverhide_item",
-"serverhide_items : serverhide_item",
-"serverhide_item : serverhide_flatten_links",
-"serverhide_item : serverhide_hide_servers",
-"serverhide_item : serverhide_links_delay",
-"serverhide_item : serverhide_disable_hidden",
-"serverhide_item : serverhide_hidden",
-"serverhide_item : serverhide_hidden_name",
-"serverhide_item : serverhide_hide_server_ips",
-"serverhide_item : error",
-"serverhide_flatten_links : FLATTEN_LINKS '=' TBOOL ';'",
-"serverhide_hide_servers : HIDE_SERVERS '=' TBOOL ';'",
-"serverhide_hidden_name : HIDDEN_NAME '=' QSTRING ';'",
-"serverhide_links_delay : LINKS_DELAY '=' timespec ';'",
-"serverhide_hidden : HIDDEN '=' TBOOL ';'",
-"serverhide_disable_hidden : DISABLE_HIDDEN '=' TBOOL ';'",
-"serverhide_hide_server_ips : HIDE_SERVER_IPS '=' TBOOL ';'",
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -958
+static const yytype_int16 yypact[] =
+{
+    -958,   464,  -958,  -243,  -250,  -236,  -958,  -958,  -958,  -223,
+    -958,  -221,  -958,  -958,  -958,  -958,  -208,  -201,  -958,  -958,
+    -198,  -192,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,     8,
+     842,   -74,   -63,  -167,     9,  -158,   614,  -140,  -126,  -121,
+    -113,   514,    35,   -15,  -111,   613,   680,  -106,  -103,   -81,
+     -62,   -44,   -43,   -35,     4,  -958,  -958,  -958,  -958,  -958,
+     -33,   -30,   -25,   -13,    -2,    14,    21,    25,    34,    40,
+      41,    42,    44,    50,    52,    55,    65,    78,   195,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,   -61,
+    -958,  -958,    36,  -958,   245,  -958,    79,    45,  -958,  -958,
+     249,  -958,    80,    83,    85,    92,    98,   102,   105,   109,
+     110,   111,   118,   127,   128,   129,   132,   133,   138,   139,
+     153,   154,   155,   156,   157,   161,   173,   175,   176,   177,
+     178,   180,   185,   187,  -958,   190,  -958,   191,   194,   196,
+     204,   208,   209,   210,   213,   216,   217,   218,   219,   222,
+     228,   229,   231,   232,   233,   235,   236,    15,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,   179,   910,    94,   262,    51,   237,
+     238,   240,   241,   244,   246,   247,   254,   256,   257,   258,
+     261,   373,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,    72,   265,   268,    68,  -958,
+    -958,  -958,  -958,    38,  -958,   239,  -958,   269,   270,   271,
+     272,   274,   275,   277,   186,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,    99,   278,   281,   282,   283,   284,   289,
+     292,   293,   294,   295,   296,   297,   298,   197,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,     5,   174,    24,  -958,   203,   307,   333,   189,
+    -958,   329,   371,   432,   368,   370,   445,   445,   446,   447,
+     383,   384,   450,   445,   386,   388,   389,   390,   392,   330,
+    -958,   495,   841,  -958,   326,   331,    48,  -958,  -958,  -958,
+     439,   337,  -958,  -958,   335,   336,  -958,  -958,    13,  -958,
+    -958,  -958,   397,   445,   405,   445,   471,   453,   476,   413,
+     414,   417,   483,   468,   421,   491,   493,   500,   430,   445,
+     437,   440,   504,   484,   442,   509,   518,   445,   522,   506,
+     526,   529,   465,   466,   400,   469,   406,   445,   445,   472,
+     445,   519,   477,   478,   479,  -124,  -109,   480,   481,   445,
+     445,   548,   445,   485,   486,   489,   490,   420,  -958,  -958,
+    -958,   424,   427,  -958,   434,   435,    62,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,   451,   436,   443,   444,   449,  -958,
+     452,   454,   455,   457,   459,   461,   473,   475,   482,   487,
+     494,   223,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+     499,  -958,   502,  -958,    32,  -958,  -958,  -958,   467,  -958,
+     505,   507,   510,  -958,    96,  -958,  -958,  -958,  -958,  -958,
+     542,   557,   581,   582,   586,   588,   590,   591,   164,   594,
+     596,   562,   515,  -958,  -958,   616,   623,   521,  -958,   669,
+     523,   524,   525,   527,    18,  -958,  -958,  -958,  -958,   571,
+     589,   599,   629,   601,   602,   445,   532,  -958,  -958,   631,
+     633,   603,   651,   657,   658,   659,   662,   664,   665,   688,
+     667,   668,   563,  -958,   564,   566,  -958,   569,    49,  -958,
+    -958,  -958,  -958,   565,   570,  -958,    69,  -958,  -958,  -958,
+     567,   573,   574,    64,  -958,  -958,  -958,   578,   583,   597,
+    -958,   598,   606,   608,   610,   611,   -96,   617,   618,   620,
+     622,   624,   625,   626,   630,   634,   635,   636,   638,   639,
+    -958,   640,   587,   593,   628,   642,   644,   646,   647,   649,
+     650,   653,   655,   660,   666,   355,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+     641,   673,   674,   678,   679,   681,   682,   683,   684,   687,
+    -958,   689,   690,   691,   692,   693,   696,   697,   700,   701,
+      93,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,   698,   706,   661,  -958,   670,  -958,   723,   730,   703,
+     671,  -958,   707,   710,   711,   712,   713,   714,   715,   717,
+     718,   719,   720,   722,   724,   727,   728,   729,   732,   734,
+     735,   737,   738,   740,   744,   746,   748,   754,   761,   762,
+     764,   766,   767,   768,   806,   769,   934,   770,   772,   780,
+     782,   783,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,   794,   795,   324,   796,   798,   799,   800,   801,   802,
+    -958,   807,   445,   726,   808,   736,   749,   803,  -958,  -958,
+     747,   775,   755,   868,   809,   869,   873,   877,   878,   879,
+     837,   695,   923,   924,   882,   926,   820,  -958,   929,   821,
+     933,   827,  -958,  -958,   825,   936,   937,   963,   838,  -958,
+     846,   849,   853,   854,   856,   857,   858,   859,   860,   861,
+     862,   863,   864,   871,   872,   874,   875,   885,  -958,   889,
+     890,  -958,   892,   834,   891,   894,   895,  -958,   896,   897,
+     904,   905,   907,   908,   911,   912,   913,   914,   915,   916,
+     917,   918,  -958,   919,   920,   921,   165,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,   989,  1000,  1002,   925,  -958,   927,   928,   930,
+     931,   932,   935,   938,  -958,   939,   940,   941,   942,   943,
+     944,   945,   946,   947,   948,   949,   950,   951,  -958,  -958,
+    1020,   952,  1033,   953,  -958,  -958,  1036,   954,   956,  -958,
+    -958,  1040,  1041,   958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,   445,   445,   445,   445,   445,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  1065,  1066,   445,  1081,  1083,  1088,
+    1089,  1068,  1091,  1092,   445,   445,   548,   964,  -958,  -958,
+    1072,    37,  1030,  1074,  1075,  1034,  1035,  1037,  1076,   969,
+    1082,  1084,  1085,  1086,  1103,  1087,  1090,  1045,  1093,   976,
+    -958,   982,   984,  -958,  -958,   985,   987,   279,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -255,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -245,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,   548,   548,   548,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,    -8,   988,   990,     6,   991,   992,  -958,   993,
+     994,   995,   996,   704,   997,   998,   999,  1001,  1003,  1004,
+    1005,  1006,  1007,  1008,  1009,  -958,  1010,  1102,  1011,  -958,
+     -75,  1012,  1013,   645,   585,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  1053,  1109,
+    1078,  1079,  1014,  1080,  1094,  1095,  1096,  1097,  1125,  1098,
+    1126,  1099,  1100,  1101,  1127,  1104,  1105,  1018,  1106,  1129,
+    1107,  1023,  -958,  1024,  1025,  1026,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  1027,   306,  1028,
+    -958,  1029,   535,  -958,  1038,  1039,  -958,  -958,  -958,  -958,
+    -958,  -958,  1044,  1046,  1047,  1048,  1049,  1050,  1051,  1052,
+    1054,  1055,  1056,  1057,  1058,  -958,  1059,  1060,  1061,  1062,
+    1063,  1064,  1067,  1069,  1070,  1071,  1175,  1073,  1077,  1108,
+    1110,  1111,  1112,  1113,  1114,  1115,  -958,  -958,  -958,  -958,
+    -958,  -958,  -237,  -958,  -958,   806,  -958,   934,  -958,  -958,
+    -958,  -958,  -958,  -232,  -958,  -958,  -958,  -958,  -958,  -212,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -178,  -958,
+     349,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -146,  -958,  -958,  -958,  -958,  -141,
+    -958,  -958,  -958,  1182,   963,  1116,  1117,  1118,  1119,  1120,
+    1195,  1121,  1122,  1123,  1124,  1128,  1130,  1131,  1132,  1133,
+    1134,  1135,  1136,  1137,  1138,   898,  1139,  1140,  1141,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -125,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -114,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,   -98,
+    -958,     1,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,   279,  -958,  -958,  -958,    -8,  -958,     6,   349,
+    -958,   704,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  1102,  -958,   -75,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,   -90,  -958,   840,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,    23,  -958,  -958,  -958,  -958,  -958,   306,  -958,
+     535,     1,  -958,  1175,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,   840,  -958,
+    1195,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+     898,  -958,  -958,  -958,  -958,  -958,  -958,  -958
 };
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -958,  -958,  -958,  -505,  -346,  -957,  -429,  -958,  -958,  1142,
+    -958,  -958,  -958,  -958,  1021,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    1255,  -958,  -958,  -958,  -958,  -958,  1144,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,    87,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -179,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -155,  -958,  -958,  -151,  -958,  -958,  -958,
+     756,  -958,  -958,  -958,  -958,  -958,  -958,   716,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,   -73,  -958,   843,
+    -958,  -958,  -958,    54,  -958,  -958,  -958,  -958,  -958,   880,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,   -59,  -958,
+    -958,   -55,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,   811,  -958,  -958,  -958,  -958,
+    -958,  -958,   778,  -958,  -958,  -958,  -958,  -958,  -119,  -958,
+    -958,  -958,   774,  -958,  -958,  -958,  -958,  -118,  -958,  -958,
+    -958,  -958,   694,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -120,  -958,  -958,  -116,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,   -58,  -958,   865,  -958,  -958,  -958,
+    -958,  -958,  1022,  -958,  -958,  -958,  -958,  1230,  -958,  -958,
+    -958,  -958,  -958,  -958,   -34,  -958,   983,  -958,  -958,  -958,
+    -958,  1173,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,   115,  -958,  -958,  -958,   119,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,   922,  -958,  -958,  -958,
+    -958,  -958,   -32,  -958,  -958,  -958,  -958,  -958,   -31,  -958,
+    -958,  1265,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,  -958,
+    -958,  -958,  1143,  -958,  -958,  -958,  -958,  -958,  -958,  -958
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint16 yytable[] =
+{
+     597,   598,   744,  1251,  1287,    70,   564,   604,  1244,    70,
+     125,  1474,  1245,  1475,   373,    49,   131,  1257,  1246,   530,
+      47,    48,  1247,   132,   133,   580,  1391,   134,  1476,    50,
+    1392,  1395,  1477,   489,   135,  1396,   275,   693,   596,   695,
+     531,    71,    54,   136,    56,    71,   125,   137,   138,   363,
+     564,  1397,    72,   709,   139,  1398,    72,    61,   140,   141,
+     142,   717,   143,   439,    62,   580,   440,    65,   144,   275,
+     573,   727,   728,    66,   730,   735,   736,   913,   914,   915,
+     916,   917,   118,   741,   742,  1400,   745,   145,   146,  1401,
+     737,   738,   147,   121,   640,   489,   641,   498,   124,   642,
+     148,   126,  1478,   643,   149,   150,   151,   130,   441,   152,
+     581,   442,   153,   154,  1248,  1249,  1250,  1413,   644,   645,
+     646,  1414,  1415,   155,   647,   244,  1416,    73,   565,   156,
+     157,    73,   158,   159,   160,   161,   374,   126,  1467,   245,
+     364,   282,  1468,   648,   246,   532,   162,   649,   650,  1469,
+     581,   499,   247,  1470,   285,   163,   276,   164,   165,   332,
+     166,  1288,   333,   167,   168,  1472,   812,   169,   443,  1473,
+     813,   375,   565,  1489,   582,   573,   533,  1490,   170,   651,
+     439,   652,   500,   440,   334,   444,   277,   286,   501,   276,
+     490,   814,   574,  1252,   566,   653,    79,   171,   303,   873,
+     172,   335,   376,   815,   361,   173,   365,  1258,    80,   174,
+     175,   176,   177,   178,   582,   816,   654,   179,   180,   277,
+     817,   491,   336,   337,   454,   441,   181,   287,   442,    81,
+      82,   338,   818,   341,   304,    83,   342,    84,   566,   819,
+     530,   343,   288,   455,  1479,   820,   363,   821,   655,   456,
+     373,   502,   490,   344,   567,  1217,  1218,   182,   575,   183,
+     822,   531,   656,   498,   345,   289,   184,   290,   339,   291,
+     292,   185,   657,   457,   458,   305,   186,   690,   459,   437,
+     346,   492,   865,   491,   306,   443,  1509,   347,   823,   293,
+    1510,   348,   460,   824,    85,    86,   781,   574,   567,   461,
+     349,   362,   444,   529,    87,    88,   350,   351,   352,   371,
+     353,   445,   683,   893,   509,   825,   354,   499,   355,   462,
+     307,   356,   308,   309,    89,    90,   757,   826,   903,   827,
+     828,   357,   527,   898,   829,   524,   658,   364,  1071,  1072,
+    1073,    91,    92,   492,   358,   370,   382,   463,   500,   383,
+     659,   384,    93,   830,   501,   464,   611,   969,   385,   587,
+     788,    94,   548,   575,   386,   310,   532,   311,   387,  1402,
+    1403,   388,   374,   465,   248,   389,   390,   391,   612,   613,
+     312,   313,   466,   467,   392,   614,   798,   799,   800,   801,
+     802,   803,   804,   393,   394,   395,   831,   533,   396,   397,
+    1404,  1324,   832,   365,   398,   399,  1083,   375,  1197,  1198,
+    1199,  1200,  1201,   833,   834,   468,   469,   502,  1405,   400,
+     401,   402,   403,   404,   835,  1406,   314,   405,   445,  1161,
+     249,   250,   251,   252,   253,   254,   255,   256,   376,   406,
+    1241,   407,   408,   409,   410,  1407,   411,    95,    96,    97,
+     546,   412,   590,   413,   315,   316,   415,   417,   743,   359,
+     418,   562,   419,   588,     2,     3,   615,   616,   617,     4,
+     420,   618,   470,  1408,   421,   422,   423,  1325,   619,   424,
+     257,  1409,   425,   426,   427,   428,     5,   776,   429,   589,
+       6,   620,   621,     7,   430,   431,   611,   432,   433,   434,
+       8,   435,   436,   510,   511,   592,   512,   513,   622,   623,
+     514,  1326,   515,   516,   258,   248,     9,  1214,   612,   613,
+     517,  1410,   518,   519,   520,   614,  1327,   521,   591,    10,
+      11,   525,    12,   624,   526,   539,   540,   541,   542,    13,
+     543,   544,  1411,   545,   549,  1328,  1329,   550,   551,   552,
+     553,  1330,  1331,  1332,  1333,   554,  1334,    14,   555,   556,
+     557,   558,   559,   560,   561,  1335,   593,   594,    15,   595,
+      16,   249,   250,   251,   252,   253,   254,   255,   256,   596,
+     599,   600,   601,   602,   603,   605,    17,   606,   607,   608,
+    1204,   609,   681,   610,   259,   685,   692,   682,  1212,  1213,
+     686,   687,   688,    18,   694,   696,   615,   616,   617,   697,
+     698,   618,   699,   700,   286,   131,   701,   702,   619,   947,
+     704,   257,   132,   133,   703,   705,   134,   706,   260,   708,
+    1340,   620,   621,   135,   707,    19,   710,   522,   712,   711,
+     713,   714,   136,   715,    20,    21,   137,   138,   622,   623,
+      22,    23,   716,   139,   287,   258,   718,   140,   141,   142,
+     720,   143,   719,   721,   722,   723,   724,   144,   725,   288,
+     812,   729,   726,   624,   813,   731,   732,   733,   734,   739,
+     740,   303,   743,   750,   746,   747,   145,   146,   748,   749,
+     752,   147,   289,   753,   290,   814,   291,   292,   790,   148,
+     755,   756,   760,   149,   150,   151,  1341,   815,   152,   761,
+     762,   153,   154,   791,   759,   763,   293,   304,   765,   816,
+     766,   767,   155,   768,   817,   769,    24,   770,   156,   157,
+     783,   158,   159,   160,   161,   259,   818,   792,   793,   771,
+    1342,   772,   794,   819,   795,   162,   796,   797,   773,   820,
+     805,   821,   806,   774,   163,  1343,   164,   165,   305,   166,
+     775,   807,   167,   168,   822,   778,   169,   306,   780,   260,
+     867,   785,   809,   786,  1344,  1345,   787,   170,   808,   810,
+    1346,  1347,  1348,  1349,   811,   870,   861,   875,   868,   876,
+     862,   863,   823,   864,  1350,   874,   171,   824,   869,   172,
+     871,   872,   877,   307,   173,   308,   309,   878,   174,   175,
+     176,   177,   178,   879,   880,   881,   179,   180,   882,   825,
+     883,   884,   885,   886,   887,   181,   888,   889,   895,  1100,
+     900,   826,   890,   827,   828,   892,   896,  1267,   829,   901,
+     902,   905,   640,    79,   641,  1491,   906,   642,   310,  1293,
+     311,   643,  1294,   934,   971,    80,   182,   830,   183,   935,
+     907,   908,   972,   312,   313,   184,   644,   645,   646,   909,
+     185,   910,   647,   911,   912,   186,    81,    82,  1492,   975,
+     920,   921,    83,   922,    84,   923,   976,   924,   925,   926,
+    1493,   648,  1086,   927,   936,   649,   650,   928,   929,   930,
+     831,   931,   932,   933,   949,  1087,   832,  1494,   937,   314,
+     938,   454,   939,   940,  1495,   941,   942,   833,   834,   943,
+    1496,   944,  1497,  1162,   973,  1084,   945,   651,   835,   652,
+     455,  1090,   946,   974,   978,  1498,   456,   315,   316,   950,
+     951,    85,    86,   653,   952,   953,  1089,   954,   955,   956,
+     957,    87,    88,   958,  1091,   960,   961,   962,   963,   964,
+     457,   458,   965,   966,   654,   459,   967,   968,  1499,   977,
+     979,    89,    90,   980,   981,   982,   983,   984,   985,   460,
+     986,   987,   988,   989,  1500,   990,   461,   991,    91,    92,
+     992,   993,   994,  1099,  1011,   995,   655,   996,   997,    93,
+     998,   999,  1501,  1000,  1502,  1503,   462,  1001,    94,  1002,
+     656,  1003,  1012,  1013,  1014,  1015,  1016,  1004,  1017,  1018,
+     657,  1019,  1020,  1021,  1005,  1006,  1022,  1007,  1504,  1008,
+    1009,  1010,  1033,  1055,   463,  1056,  1023,  1024,  1025,  1026,
+    1027,  1028,   464,  1057,  1029,  1058,  1059,  1030,  1060,  1061,
+    1062,  1063,  1064,  1065,  1066,  1067,  1068,  1069,  1070,  1076,
+     465,  1077,  1078,  1079,  1080,  1081,  1088,  1092,  1094,   466,
+     467,  1505,  1095,  1082,  1085,  1093,  1096,  1097,  1098,  1101,
+    1102,  1103,  1104,  1105,   658,  1106,  1442,  1107,  1506,  1108,
+    1109,  1110,  1111,  1112,    95,    96,    97,  1113,   659,  1507,
+    1138,  1116,   468,   469,  1443,  1444,  1445,  1446,  1447,  1117,
+    1448,  1449,  1118,  1450,  1451,  1452,  1119,  1120,  1453,  1121,
+    1122,  1123,  1124,  1125,  1126,  1127,  1128,  1129,  1454,  1455,
+    1456,  1457,  1458,  1459,  1130,  1131,  1460,  1132,  1133,  1461,
+    1034,  1035,  1036,  1037,  1038,  1163,  1039,  1040,  1134,  1041,
+    1042,  1043,  1135,  1136,  1044,  1137,  1164,  1139,  1165,   470,
+    1140,  1141,  1143,  1144,  1045,  1046,  1047,  1048,  1049,  1050,
+    1145,  1146,  1051,  1147,  1148,  1052,  1187,  1149,  1150,  1151,
+    1152,  1153,  1154,  1155,  1156,  1158,  1159,  1160,  1166,  1189,
+    1167,  1168,  1191,  1169,  1170,  1171,  1194,  1195,  1172,  1202,
+    1203,  1173,  1174,  1175,  1176,  1177,  1178,  1179,  1180,  1181,
+    1182,  1183,  1184,  1185,  1186,  1205,  1190,  1206,  1188,  1193,
+    1192,  1196,  1207,  1208,  1209,  1210,  1211,  1215,  1216,  1219,
+    1220,  1221,  1225,  1222,  1223,  1226,  1224,  1231,  1227,  1236,
+    1228,  1229,  1230,  1232,  1234,  1237,  1233,  1238,  1239,  1235,
+    1240,  1255,  1296,  1256,  1261,  1262,  1263,  1264,  1265,  1266,
+    1271,  1272,  1273,  1283,  1274,  1297,  1275,  1276,  1277,  1278,
+    1279,  1280,  1281,  1282,  1286,  1291,  1292,  1298,  1299,  1301,
+    1300,  1306,  1308,  1312,  1315,  1317,  1319,  1320,  1321,  1322,
+    1323,  1338,  1339,  1302,  1303,  1304,  1305,  1307,  1309,  1310,
+    1311,  1353,  1354,  1313,  1314,  1316,  1318,  1355,  1378,  1356,
+    1357,  1358,  1359,  1360,  1361,  1362,  1417,  1363,  1364,  1365,
+    1366,  1367,  1368,  1369,  1370,  1371,  1372,  1373,  1424,   340,
+    1374,  1517,  1375,  1376,  1377,  1516,  1382,  1515,   563,   904,
+    1383,   948,  1485,  1487,  1484,   866,   894,   789,  1418,  1511,
+     899,   777,  1512,  1514,   970,  1513,  1486,   372,  1481,   782,
+     438,   691,  1394,   360,  1393,  1482,  1483,     0,   758,     0,
+       0,  1384,     0,  1385,  1386,  1387,  1388,  1389,  1390,  1419,
+    1420,  1421,  1422,  1423,  1428,  1429,  1430,  1431,   684,     0,
+       0,  1432,     0,  1433,  1434,  1435,  1436,  1437,  1438,  1439,
+    1440,  1441,  1464,  1465,  1466,   523,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     528,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   547
+};
+
+static const yytype_int16 yycheck[] =
+{
+     346,   347,   431,    11,    79,     1,     1,   353,   263,     1,
+       1,    10,   267,    12,     1,   265,     1,    11,   263,     1,
+     263,   264,   267,     8,     9,     1,   263,    12,    27,   265,
+     267,   263,    31,     1,    19,   267,     1,   383,   134,   385,
+      22,    37,   265,    28,   265,    37,     1,    32,    33,     1,
+       1,   263,    48,   399,    39,   267,    48,   265,    43,    44,
+      45,   407,    47,     1,   265,     1,     4,   265,    53,     1,
+       1,   417,   418,   265,   420,   199,   200,   173,   174,   175,
+     176,   177,   156,   429,   430,   263,   432,    72,    73,   267,
+     199,   200,    77,   156,     1,     1,     3,     1,   265,     6,
+      85,    92,   101,    10,    89,    90,    91,   265,    46,    94,
+      86,    49,    97,    98,  1071,  1072,  1073,   263,    25,    26,
+      27,   267,   263,   108,    31,   265,   267,   123,   123,   114,
+     115,   123,   117,   118,   119,   120,   123,    92,   263,   265,
+      92,   156,   267,    50,   265,   127,   131,    54,    55,   263,
+      86,    55,   265,   267,   265,   140,   121,   142,   143,   265,
+     145,   236,   265,   148,   149,   263,     1,   152,   106,   267,
+       5,   158,   123,   263,   150,     1,   158,   267,   163,    86,
+       1,    88,    86,     4,   265,   123,   151,     1,    92,   121,
+     158,    26,   123,   201,   189,   102,     1,   182,     1,   545,
+     185,   263,   189,    38,   265,   190,   158,   201,    13,   194,
+     195,   196,   197,   198,   150,    50,   123,   202,   203,   151,
+      55,   189,   266,   266,     1,    46,   211,    41,    49,    34,
+      35,   266,    67,   266,    37,    40,   266,    42,   189,    74,
+       1,   266,    56,    20,   243,    80,     1,    82,   155,    26,
+       1,   155,   158,   266,   249,   218,   219,   242,   189,   244,
+      95,    22,   169,     1,   266,    79,   251,    81,   264,    83,
+      84,   256,   179,    50,    51,    78,   261,   264,    55,   264,
+     266,   249,   264,   189,    87,   106,   263,   266,   123,   103,
+     267,   266,    69,   128,    99,   100,   264,   123,   249,    76,
+     266,   265,   123,   265,   109,   110,   266,   266,   266,   264,
+     266,   249,   264,   264,   263,   150,   266,    55,   266,    96,
+     123,   266,   125,   126,   129,   130,   264,   162,   264,   164,
+     165,   266,   264,   264,   169,   263,   243,    92,    14,    15,
+      16,   146,   147,   249,   266,   266,   266,   124,    86,   266,
+     257,   266,   157,   188,    92,   132,     1,   264,   266,   156,
+     264,   166,   263,   189,   266,   168,   127,   170,   266,    20,
+      21,   266,   123,   150,     1,   266,   266,   266,    23,    24,
+     183,   184,   159,   160,   266,    30,   222,   223,   224,   225,
+     226,   227,   228,   266,   266,   266,   231,   158,   266,   266,
+      51,    95,   237,   158,   266,   266,   752,   158,   913,   914,
+     915,   916,   917,   248,   249,   192,   193,   155,    69,   266,
+     266,   266,   266,   266,   259,    76,   229,   266,   249,   264,
+      57,    58,    59,    60,    61,    62,    63,    64,   189,   266,
+     161,   266,   266,   266,   266,    96,   266,   252,   253,   254,
+     264,   266,   263,   266,   257,   258,   266,   266,   134,   264,
+     266,   264,   266,   156,     0,     1,   111,   112,   113,     5,
+     266,   116,   249,   124,   266,   266,   266,   171,   123,   266,
+     107,   132,   266,   266,   266,   266,    22,   264,   266,   156,
+      26,   136,   137,    29,   266,   266,     1,   266,   266,   266,
+      36,   266,   266,   266,   266,   134,   266,   266,   153,   154,
+     266,   205,   266,   266,   141,     1,    52,   946,    23,    24,
+     266,   172,   266,   266,   266,    30,   220,   266,   199,    65,
+      66,   266,    68,   178,   266,   266,   266,   266,   266,    75,
+     266,   266,   193,   266,   266,   239,   240,   266,   266,   266,
+     266,   245,   246,   247,   248,   266,   250,    93,   266,   266,
+     266,   266,   266,   266,   266,   259,   134,   199,   104,   199,
+     106,    57,    58,    59,    60,    61,    62,    63,    64,   134,
+     134,   134,   199,   199,   134,   199,   122,   199,   199,   199,
+     936,   199,   266,   263,   221,   156,   199,   266,   944,   945,
+     263,   266,   266,   139,   199,   134,   111,   112,   113,   156,
+     134,   116,   199,   199,     1,     1,   199,   134,   123,   264,
+     199,   107,     8,     9,   156,   134,    12,   134,   255,   199,
+      95,   136,   137,    19,   134,   171,   199,   264,   134,   199,
+     156,   199,    28,   134,   180,   181,    32,    33,   153,   154,
+     186,   187,   134,    39,    41,   141,   134,    43,    44,    45,
+     134,    47,   156,   134,   199,   199,   266,    53,   199,    56,
+       1,   199,   266,   178,     5,   156,   199,   199,   199,   199,
+     199,     1,   134,   263,   199,   199,    72,    73,   199,   199,
+     266,    77,    79,   266,    81,    26,    83,    84,   156,    85,
+     266,   266,   266,    89,    90,    91,   171,    38,    94,   266,
+     266,    97,    98,   156,   263,   266,   103,    37,   266,    50,
+     266,   266,   108,   266,    55,   266,   262,   266,   114,   115,
+     263,   117,   118,   119,   120,   221,    67,   156,   156,   266,
+     205,   266,   156,    74,   156,   131,   156,   156,   266,    80,
+     156,    82,   156,   266,   140,   220,   142,   143,    78,   145,
+     266,   199,   148,   149,    95,   266,   152,    87,   266,   255,
+     199,   266,   156,   266,   239,   240,   266,   163,   263,   156,
+     245,   246,   247,   248,   263,   156,   263,   156,   199,   156,
+     266,   266,   123,   266,   259,   263,   182,   128,   199,   185,
+     199,   199,   199,   123,   190,   125,   126,   156,   194,   195,
+     196,   197,   198,   156,   156,   156,   202,   203,   156,   150,
+     156,   156,   134,   156,   156,   211,   263,   263,   263,   134,
+     263,   162,   266,   164,   165,   266,   266,   133,   169,   266,
+     266,   263,     1,     1,     3,     5,   263,     6,   168,   204,
+     170,    10,   267,   266,   156,    13,   242,   188,   244,   266,
+     263,   263,   156,   183,   184,   251,    25,    26,    27,   263,
+     256,   263,    31,   263,   263,   261,    34,    35,    38,   156,
+     263,   263,    40,   263,    42,   263,   156,   263,   263,   263,
+      50,    50,   156,   263,   266,    54,    55,   263,   263,   263,
+     231,   263,   263,   263,   263,   156,   237,    67,   266,   229,
+     266,     1,   266,   266,    74,   266,   266,   248,   249,   266,
+      80,   266,    82,   836,   263,   199,   266,    86,   259,    88,
+      20,   156,   266,   263,   263,    95,    26,   257,   258,   266,
+     266,    99,   100,   102,   266,   266,   199,   266,   266,   266,
+     266,   109,   110,   266,   199,   266,   266,   266,   266,   266,
+      50,    51,   266,   266,   123,    55,   266,   266,   128,   266,
+     263,   129,   130,   263,   263,   263,   263,   263,   263,    69,
+     263,   263,   263,   263,   144,   263,    76,   263,   146,   147,
+     263,   263,   263,   156,   188,   263,   155,   263,   263,   157,
+     263,   263,   162,   263,   164,   165,    96,   263,   166,   263,
+     169,   263,   206,   207,   208,   209,   210,   263,   212,   213,
+     179,   215,   216,   217,   263,   263,   220,   263,   188,   263,
+     263,   263,   263,   263,   124,   263,   230,   231,   232,   233,
+     234,   235,   132,   263,   238,   263,   263,   241,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     150,   263,   263,   263,   263,   263,   263,   199,   199,   159,
+     160,   231,   199,   266,   266,   266,   199,   199,   199,   156,
+     156,   199,   156,   263,   243,   156,   188,   266,   248,   156,
+     263,   266,   156,   156,   252,   253,   254,   134,   257,   259,
+     266,   263,   192,   193,   206,   207,   208,   209,   210,   263,
+     212,   213,   263,   215,   216,   217,   263,   263,   220,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   230,   231,
+     232,   233,   234,   235,   263,   263,   238,   263,   263,   241,
+     206,   207,   208,   209,   210,   156,   212,   213,   263,   215,
+     216,   217,   263,   263,   220,   263,   156,   266,   156,   249,
+     266,   266,   266,   266,   230,   231,   232,   233,   234,   235,
+     266,   266,   238,   266,   266,   241,   156,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   263,   156,
+     263,   263,   156,   263,   263,   263,   156,   156,   263,   134,
+     134,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   134,   263,   134,   266,   263,
+     266,   263,   134,   134,   156,   134,   134,   263,   156,   199,
+     156,   156,   156,   199,   199,   266,   199,   134,   156,   263,
+     156,   156,   156,   156,   199,   263,   156,   263,   263,   156,
+     263,   263,   199,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   161,   263,   156,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   199,   199,   199,
+     266,   156,   156,   156,   266,   156,   263,   263,   263,   263,
+     263,   263,   263,   199,   199,   199,   199,   199,   199,   199,
+     199,   263,   263,   199,   199,   199,   199,   263,   133,   263,
+     263,   263,   263,   263,   263,   263,   134,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   133,    74,
+     263,  1510,   263,   263,   263,  1490,   263,  1488,   317,   583,
+     263,   625,  1401,  1416,  1399,   534,   568,   504,  1294,  1468,
+     576,   471,  1470,  1473,   660,  1471,  1414,   127,  1392,   494,
+     187,   378,  1247,    98,  1245,  1396,  1398,    -1,   446,    -1,
+      -1,   263,    -1,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   366,    -1,
+      -1,   263,    -1,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   261,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     278,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   294
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint16 yystos[] =
+{
+       0,   269,     0,     1,     5,    22,    26,    29,    36,    52,
+      65,    66,    68,    75,    93,   104,   106,   122,   139,   171,
+     180,   181,   186,   187,   262,   270,   275,   280,   296,   302,
+     317,   355,   361,   380,   394,   420,   427,   437,   446,   477,
+     487,   493,   497,   507,   571,   587,   608,   263,   264,   265,
+     265,   362,   447,   488,   265,   498,   265,   572,   395,   478,
+     381,   265,   265,   318,   421,   265,   265,   428,   438,   356,
+       1,    37,    48,   123,   297,   298,   299,   300,   301,     1,
+      13,    34,    35,    40,    42,    99,   100,   109,   110,   129,
+     130,   146,   147,   157,   166,   252,   253,   254,   588,   589,
+     590,   591,   592,   593,   594,   595,   596,   597,   598,   599,
+     600,   601,   602,   603,   604,   605,   606,   607,   156,   363,
+     367,   156,   448,   452,   265,     1,    92,   494,   495,   496,
+     265,     1,     8,     9,    12,    19,    28,    32,    33,    39,
+      43,    44,    45,    47,    53,    72,    73,    77,    85,    89,
+      90,    91,    94,    97,    98,   108,   114,   115,   117,   118,
+     119,   120,   131,   140,   142,   143,   145,   148,   149,   152,
+     163,   182,   185,   190,   194,   195,   196,   197,   198,   202,
+     203,   211,   242,   244,   251,   256,   261,   508,   509,   510,
+     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
+     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
+     531,   532,   533,   534,   535,   536,   537,   538,   539,   540,
+     541,   542,   543,   544,   545,   546,   547,   548,   549,   550,
+     551,   552,   553,   554,   555,   556,   557,   558,   562,   566,
+     567,   568,   569,   570,   265,   265,   265,   265,     1,    57,
+      58,    59,    60,    61,    62,    63,    64,   107,   141,   221,
+     255,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,     1,   121,   151,   276,   277,
+     278,   279,   156,   319,   323,   265,     1,    41,    56,    79,
+      81,    83,    84,   103,   609,   610,   611,   612,   613,   614,
+     615,   616,   617,     1,    37,    78,    87,   123,   125,   126,
+     168,   170,   183,   184,   229,   257,   258,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   265,   265,   265,   263,   266,   266,   266,   264,
+     298,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   264,
+     589,   265,   265,     1,    92,   158,   489,   490,   491,   492,
+     266,   264,   495,     1,   123,   158,   189,   499,   503,   504,
+     505,   506,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   563,   266,   559,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   264,   509,     1,
+       4,    46,    49,   106,   123,   249,   573,   574,   575,   576,
+     577,   581,   582,   583,     1,    20,    26,    50,    51,    55,
+      69,    76,    96,   124,   132,   150,   159,   160,   192,   193,
+     249,   396,   397,   398,   399,   400,   401,   402,   403,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,     1,
+     158,   189,   249,   479,   483,   484,   485,   486,     1,    55,
+      86,    92,   155,   382,   386,   387,   388,   392,   393,   263,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   264,   304,   263,   266,   266,   264,   277,   265,
+       1,    22,   127,   158,   422,   423,   424,   425,   426,   266,
+     266,   266,   266,   266,   266,   266,   264,   610,   263,   266,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   264,   282,     1,   123,   189,   249,   429,   430,
+     431,   432,   433,     1,   123,   189,   439,   440,   441,   442,
+       1,    86,   150,   357,   358,   359,   360,   156,   156,   156,
+     263,   199,   134,   134,   199,   199,   134,   272,   272,   134,
+     134,   199,   199,   134,   272,   199,   199,   199,   199,   199,
+     263,     1,    23,    24,    30,   111,   112,   113,   116,   123,
+     136,   137,   153,   154,   178,   364,   365,   366,   368,   369,
+     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
+       1,     3,     6,    10,    25,    26,    27,    31,    50,    54,
+      55,    86,    88,   102,   123,   155,   169,   179,   243,   257,
+     449,   450,   451,   453,   454,   455,   456,   457,   458,   459,
+     460,   467,   468,   469,   470,   471,   472,   473,   474,   475,
+     476,   266,   266,   264,   490,   156,   263,   266,   266,   500,
+     264,   504,   199,   272,   199,   272,   134,   156,   134,   199,
+     199,   199,   134,   156,   199,   134,   134,   134,   199,   272,
+     199,   199,   134,   156,   199,   134,   134,   272,   134,   156,
+     134,   134,   199,   199,   266,   199,   266,   272,   272,   199,
+     272,   156,   199,   199,   199,   199,   200,   199,   200,   199,
+     199,   272,   272,   134,   274,   272,   199,   199,   199,   199,
+     263,   584,   266,   266,   578,   266,   266,   264,   574,   263,
+     266,   266,   266,   266,   404,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   264,   397,   266,   480,
+     266,   264,   484,   263,   383,   266,   266,   266,   264,   387,
+     156,   156,   156,   156,   156,   156,   156,   156,   222,   223,
+     224,   225,   226,   227,   228,   156,   156,   199,   263,   156,
+     156,   263,     1,     5,    26,    38,    50,    55,    67,    74,
+      80,    82,    95,   123,   128,   150,   162,   164,   165,   169,
+     188,   231,   237,   248,   249,   259,   320,   321,   322,   324,
+     325,   326,   327,   328,   329,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
+     348,   263,   266,   266,   266,   264,   423,   199,   199,   199,
+     156,   199,   199,   272,   263,   156,   156,   199,   156,   156,
+     156,   156,   156,   156,   156,   134,   156,   156,   263,   263,
+     266,   434,   266,   264,   430,   263,   266,   443,   264,   440,
+     263,   266,   266,   264,   358,   263,   263,   263,   263,   263,
+     263,   263,   263,   173,   174,   175,   176,   177,   271,   272,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   264,   365,   263,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   461,
+     266,   266,   266,   266,   266,   266,   266,   266,   266,   264,
+     450,   156,   156,   263,   263,   156,   156,   266,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   188,   206,   207,   208,   209,   210,   212,   213,   215,
+     216,   217,   220,   230,   231,   232,   233,   234,   235,   238,
+     241,   564,   565,   263,   206,   207,   208,   209,   210,   212,
+     213,   215,   216,   217,   220,   230,   231,   232,   233,   234,
+     235,   238,   241,   560,   561,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,    14,    15,    16,   273,   274,   263,   263,   263,   263,
+     263,   263,   266,   272,   199,   266,   156,   156,   263,   199,
+     156,   199,   199,   266,   199,   199,   199,   199,   199,   156,
+     134,   156,   156,   199,   156,   263,   156,   266,   156,   263,
+     266,   156,   156,   134,   390,   391,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   266,   266,
+     266,   266,   349,   266,   266,   266,   266,   266,   266,   266,
+     266,   266,   266,   266,   266,   266,   266,   330,   266,   266,
+     266,   264,   321,   156,   156,   156,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   156,   266,   156,
+     263,   156,   266,   263,   156,   156,   263,   271,   271,   271,
+     271,   271,   134,   134,   272,   134,   134,   134,   134,   156,
+     134,   134,   272,   272,   274,   263,   156,   218,   219,   199,
+     156,   156,   199,   199,   199,   156,   266,   156,   156,   156,
+     156,   134,   156,   156,   199,   156,   263,   263,   263,   263,
+     263,   161,   501,   502,   263,   267,   263,   267,   273,   273,
+     273,    11,   201,   585,   586,   263,   263,    11,   201,   579,
+     580,   263,   263,   263,   263,   263,   263,   133,   405,   406,
+     408,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   161,   481,   482,   263,    79,   236,   384,
+     385,   263,   263,   204,   267,   389,   199,   156,   199,   199,
+     266,   199,   199,   199,   199,   199,   156,   199,   156,   199,
+     199,   199,   156,   199,   199,   266,   199,   156,   199,   263,
+     263,   263,   263,   263,    95,   171,   205,   220,   239,   240,
+     245,   246,   247,   248,   250,   259,   435,   436,   263,   263,
+      95,   171,   205,   220,   239,   240,   245,   246,   247,   248,
+     259,   444,   445,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   133,   462,
+     463,   465,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   267,   565,   561,   263,   267,   263,   267,   407,
+     263,   267,    20,    21,    51,    69,    76,    96,   124,   132,
+     172,   193,   409,   263,   267,   263,   267,   134,   391,   263,
+     263,   263,   263,   263,   133,   350,   351,   353,   263,   263,
+     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
+     263,   263,   188,   206,   207,   208,   209,   210,   212,   213,
+     215,   216,   217,   220,   230,   231,   232,   233,   234,   235,
+     238,   241,   331,   332,   263,   263,   263,   263,   267,   263,
+     267,   464,   263,   267,    10,    12,    27,    31,   101,   243,
+     466,   502,   586,   580,   409,   406,   482,   385,   352,   263,
+     267,     5,    38,    50,    67,    74,    80,    82,    95,   128,
+     144,   162,   164,   165,   188,   231,   248,   259,   354,   263,
+     267,   436,   445,   466,   463,   354,   351,   332
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
-#if YYDEBUG
-#include <stdio.h>
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 #else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH 10000
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
-#define YYINITSTACKSIZE 200
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short *yyss;
-short *yysslim;
-YYSTYPE *yyvs;
-int yystacksize;
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack()
 {
-    int newsize, i;
-    short *newss;
-    YYSTYPE *newvs;
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-    i = yyssp - yyss;
-    newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) :
-      (short *)malloc(newsize * sizeof *newss);
-    if (newss == NULL)
-        return -1;
-    yyss = newss;
-    yyssp = newss + i;
-    newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) :
-      (YYSTYPE *)malloc(newsize * sizeof *newvs);
-    if (newvs == NULL)
-        return -1;
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
 }
 
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
 
-#ifndef YYPARSE_PARAM
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG void
-#define YYPARSE_PARAM_DECL
-#else	/* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif	/* ANSI-C/C++ */
-#else	/* YYPARSE_PARAM */
-#ifndef YYPARSE_PARAM_TYPE
-#define YYPARSE_PARAM_TYPE void *
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else	/* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;
-#endif	/* ANSI-C/C++ */
-#endif	/* ! YYPARSE_PARAM */
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
 
-int
-yyparse (YYPARSE_PARAM_ARG)
-    YYPARSE_PARAM_DECL
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")))
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
     {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
     }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
 #endif
 
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
 
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
-yyloop:
-    if ((yyn = yydefred[yystate])) goto yyreduce;
-    if (yychar < 0)
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
     {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
     }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
     {
-        yyn = yytable[yyn];
-        goto yyreduce;
+
+      default:
+	break;
     }
-    if (yyerrflag) goto yyinrecovery;
-#if defined(lint) || defined(__GNUC__)
-    goto yynewerror;
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
 #endif
-yynewerror:
-    yyerror("syntax error");
-#if defined(lint) || defined(__GNUC__)
-    goto yyerrlab;
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
 #endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
 #endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
 #endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
     }
-    else
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
     {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
     }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-case 26:
+        case 27:
 #line 430 "ircd_parser.y"
-{ yyval.number = 0; }
-break;
-case 28:
+    { (yyval.number) = 0; ;}
+    break;
+
+  case 29:
 #line 432 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-1].number + yyvsp[0].number;
-		}
-break;
-case 29:
+    {
+			(yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
+		;}
+    break;
+
+  case 30:
 #line 436 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-2].number + yyvsp[0].number;
-		}
-break;
-case 30:
+    {
+			(yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
+		;}
+    break;
+
+  case 31:
 #line 440 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-2].number * 60 + yyvsp[0].number;
-		}
-break;
-case 31:
+    {
+			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
+		;}
+    break;
+
+  case 32:
 #line 444 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-2].number * 60 * 60 + yyvsp[0].number;
-		}
-break;
-case 32:
+    {
+			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
+		;}
+    break;
+
+  case 33:
 #line 448 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-2].number * 60 * 60 * 24 + yyvsp[0].number;
-		}
-break;
-case 33:
+    {
+			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
+		;}
+    break;
+
+  case 34:
 #line 452 "ircd_parser.y"
-{
-			yyval.number = yyvsp[-2].number * 60 * 60 * 24 * 7 + yyvsp[0].number;
-		}
-break;
-case 34:
+    {
+			(yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
+		;}
+    break;
+
+  case 35:
 #line 457 "ircd_parser.y"
-{ yyval.number = 0; }
-break;
-case 36:
+    { (yyval.number) = 0; ;}
+    break;
+
+  case 37:
 #line 458 "ircd_parser.y"
-{ yyval.number = yyvsp[-1].number + yyvsp[0].number; }
-break;
-case 37:
+    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); ;}
+    break;
+
+  case 38:
 #line 459 "ircd_parser.y"
-{ yyval.number = yyvsp[-2].number + yyvsp[0].number; }
-break;
-case 38:
+    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); ;}
+    break;
+
+  case 39:
 #line 460 "ircd_parser.y"
-{ yyval.number = yyvsp[-2].number * 1024 + yyvsp[0].number; }
-break;
-case 39:
+    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); ;}
+    break;
+
+  case 40:
 #line 461 "ircd_parser.y"
-{ yyval.number = yyvsp[-2].number * 1024 * 1024 + yyvsp[0].number; }
-break;
-case 46:
+    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); ;}
+    break;
+
+  case 47:
 #line 475 "ircd_parser.y"
-{
+    {
 #ifndef STATIC_MODULES /* NOOP in the static case */
   if (ypass == 2)
   {
@@ -2499,20 +3557,22 @@
     add_conf_module(yylval.string);
   }
 #endif
-}
-break;
-case 47:
+;}
+    break;
+
+  case 48:
 #line 492 "ircd_parser.y"
-{
+    {
 #ifndef STATIC_MODULES
   if (ypass == 2)
     mod_add_path(yylval.string);
 #endif
-}
-break;
-case 65:
+;}
+    break;
+
+  case 66:
 #line 517 "ircd_parser.y"
-{
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 2 && ServerInfo.ctx) 
   {
@@ -2543,11 +3603,12 @@
     }
   }
 #endif
-}
-break;
-case 66:
+;}
+    break;
+
+  case 67:
 #line 551 "ircd_parser.y"
-{
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 1)
   {
@@ -2604,11 +3665,12 @@
     }
   }
 #endif
-}
-break;
-case 67:
+;}
+    break;
+
+  case 68:
 #line 611 "ircd_parser.y"
-{
+    {
   /* this isn't rehashable */
   if (ypass == 2)
   {
@@ -2619,11 +3681,12 @@
         DupString(ServerInfo.name, yylval.string);
     }
   }
-}
-break;
-case 68:
+;}
+    break;
+
+  case 69:
 #line 625 "ircd_parser.y"
-{
+    {
   /* this isn't rehashable */
   if (ypass == 2 && !ServerInfo.sid)
   {
@@ -2635,21 +3698,23 @@
       exit(0);
     }
   }
-}
-break;
-case 69:
+;}
+    break;
+
+  case 70:
 #line 640 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(ServerInfo.description);
     DupString(ServerInfo.description,yylval.string);
   }
-}
-break;
-case 70:
+;}
+    break;
+
+  case 71:
 #line 649 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     char *p;
@@ -2660,41 +3725,45 @@
     MyFree(ServerInfo.network_name);
     DupString(ServerInfo.network_name, yylval.string);
   }
-}
-break;
-case 71:
+;}
+    break;
+
+  case 72:
 #line 663 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(ServerInfo.network_desc);
     DupString(ServerInfo.network_desc, yylval.string);
   }
-}
-break;
-case 72:
+;}
+    break;
+
+  case 73:
 #line 672 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(ServerInfo.services_name);
     DupString(ServerInfo.services_name, yylval.string);
   }
-}
-break;
-case 73:
+;}
+    break;
+
+  case 74:
 #line 681 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(ServerInfo.help_channel);
     DupString(ServerInfo.help_channel, yylval.string);
   }
-}
-break;
-case 74:
+;}
+    break;
+
+  case 75:
 #line 690 "ircd_parser.y"
-{
+    {
   if (ypass == 2 && *yylval.string != '*')
   {
     struct addrinfo hints, *res;
@@ -2719,11 +3788,12 @@
       ServerInfo.specific_ipv4_vhost = 1;
     }
   }
-}
-break;
-case 75:
+;}
+    break;
+
+  case 76:
 #line 718 "ircd_parser.y"
-{
+    {
 #ifdef IPV6
   if (ypass == 2 && *yylval.string != '*')
   {
@@ -2750,35 +3820,37 @@
     }
   }
 #endif
-}
-break;
-case 76:
+;}
+    break;
+
+  case 77:
 #line 748 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     recalc_fdlimit(NULL);
 
-    if (yyvsp[-1].number < MAXCLIENTS_MIN)
+    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
     {
       char buf[IRCD_BUFSIZE];
       ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
       yyerror(buf);
     }
-    else if (yyvsp[-1].number > MAXCLIENTS_MAX)
+    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
     {
       char buf[IRCD_BUFSIZE];
       ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
       yyerror(buf);
     }
     else
-      ServerInfo.max_clients = yyvsp[-1].number;
+      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
   }
-}
-break;
-case 77:
+;}
+    break;
+
+  case 78:
 #line 771 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -2822,171 +3894,193 @@
       }
     }
   }
-}
-break;
-case 85:
+;}
+    break;
+
+  case 86:
 #line 827 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(AdminInfo.name);
     DupString(AdminInfo.name, yylval.string);
   }
-}
-break;
-case 86:
+;}
+    break;
+
+  case 87:
 #line 836 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(AdminInfo.email);
     DupString(AdminInfo.email, yylval.string);
   }
-}
-break;
-case 87:
+;}
+    break;
+
+  case 88:
 #line 845 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(AdminInfo.description);
     DupString(AdminInfo.description, yylval.string);
   }
-}
-break;
-case 104:
+;}
+    break;
+
+  case 105:
 #line 872 "ircd_parser.y"
-{
-                        }
-break;
-case 105:
+    {
+                        ;}
+    break;
+
+  case 106:
 #line 876 "ircd_parser.y"
-{
-                        }
-break;
-case 106:
+    {
+                        ;}
+    break;
+
+  case 107:
 #line 880 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.userlog, yylval.string,
             sizeof(ConfigLoggingEntry.userlog));
-}
-break;
-case 107:
+;}
+    break;
+
+  case 108:
 #line 887 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
             sizeof(ConfigLoggingEntry.failed_operlog));
-}
-break;
-case 108:
+;}
+    break;
+
+  case 109:
 #line 894 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.operlog, yylval.string,
             sizeof(ConfigLoggingEntry.operlog));
-}
-break;
-case 109:
+;}
+    break;
+
+  case 110:
 #line 901 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
             sizeof(ConfigLoggingEntry.operspylog));
-}
-break;
-case 110:
+;}
+    break;
+
+  case 111:
 #line 908 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
             sizeof(ConfigLoggingEntry.glinelog));
-}
-break;
-case 111:
+;}
+    break;
+
+  case 112:
 #line 915 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
             sizeof(ConfigLoggingEntry.klinelog));
-}
-break;
-case 112:
+;}
+    break;
+
+  case 113:
 #line 922 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
             sizeof(ConfigLoggingEntry.ioerrlog));
-}
-break;
-case 113:
+;}
+    break;
+
+  case 114:
 #line 929 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     strlcpy(ConfigLoggingEntry.killlog, yylval.string,
             sizeof(ConfigLoggingEntry.killlog));
-}
-break;
-case 114:
+;}
+    break;
+
+  case 115:
 #line 936 "ircd_parser.y"
-{ 
+    { 
   if (ypass == 2)
     set_log_level(L_CRIT);
-}
-break;
-case 115:
+;}
+    break;
+
+  case 116:
 #line 940 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_ERROR);
-}
-break;
-case 116:
+;}
+    break;
+
+  case 117:
 #line 944 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_WARN);
-}
-break;
-case 117:
+;}
+    break;
+
+  case 118:
 #line 948 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_NOTICE);
-}
-break;
-case 118:
+;}
+    break;
+
+  case 119:
 #line 952 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_TRACE);
-}
-break;
-case 119:
+;}
+    break;
+
+  case 120:
 #line 956 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_INFO);
-}
-break;
-case 120:
+;}
+    break;
+
+  case 121:
 #line 960 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     set_log_level(L_DEBUG);
-}
-break;
-case 121:
+;}
+    break;
+
+  case 122:
 #line 966 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     ConfigLoggingEntry.use_logging = yylval.number;
-}
-break;
-case 122:
+;}
+    break;
+
+  case 123:
 #line 975 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(OPER_TYPE);
@@ -2998,11 +4092,12 @@
     MyFree(class_name);
     class_name = NULL;
   }
-}
-break;
-case 123:
+;}
+    break;
+
+  case 124:
 #line 988 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp;
@@ -3080,11 +4175,12 @@
     MyFree(class_name);
     class_name = NULL;
   }
-}
-break;
-case 152:
+;}
+    break;
+
+  case 153:
 #line 1080 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     if (strlen(yylval.string) > OPERNICKLEN)
@@ -3093,11 +4189,12 @@
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 153:
+;}
+    break;
+
+  case 154:
 #line 1092 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     if (strlen(yylval.string) > OPERNICKLEN)
@@ -3106,11 +4203,12 @@
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 154:
+;}
+    break;
+
+  case 155:
 #line 1104 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     struct split_nuh_item nuh;
@@ -3141,11 +4239,12 @@
       dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
     }
   }
-}
-break;
-case 155:
+;}
+    break;
+
+  case 156:
 #line 1138 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     if (yy_aconf->passwd != NULL)
@@ -3154,11 +4253,12 @@
     MyFree(yy_aconf->passwd);
     DupString(yy_aconf->passwd, yylval.string);
   }
-}
-break;
-case 156:
+;}
+    break;
+
+  case 157:
 #line 1150 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3166,11 +4266,12 @@
     else
       ClearConfEncrypted(yy_aconf);
   }
-}
-break;
-case 157:
+;}
+    break;
+
+  case 158:
 #line 1161 "ircd_parser.y"
-{
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 2)
   {
@@ -3209,173 +4310,204 @@
     BIO_free(file);
   }
 #endif /* HAVE_LIBCRYPTO */
-}
-break;
-case 158:
+;}
+    break;
+
+  case 159:
 #line 1203 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
   {
     MyFree(class_name);
     DupString(class_name, yylval.string);
   }
-}
-break;
-case 159:
+;}
+    break;
+
+  case 160:
 #line 1212 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes = 0;
-}
-break;
-case 163:
+;}
+    break;
+
+  case 164:
 #line 1219 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_BOTS;
-}
-break;
-case 164:
+;}
+    break;
+
+  case 165:
 #line 1223 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_CCONN;
-}
-break;
-case 165:
+;}
+    break;
+
+  case 166:
 #line 1227 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_CCONN_FULL;
-}
-break;
-case 166:
+;}
+    break;
+
+  case 167:
 #line 1231 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_DEAF;
-}
-break;
-case 167:
+;}
+    break;
+
+  case 168:
 #line 1235 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_DEBUG;
-}
-break;
-case 168:
+;}
+    break;
+
+  case 169:
 #line 1239 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_FULL;
-}
-break;
-case 169:
+;}
+    break;
+
+  case 170:
 #line 1243 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_SKILL;
-}
-break;
-case 170:
+;}
+    break;
+
+  case 171:
 #line 1247 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_NCHANGE;
-}
-break;
-case 171:
+;}
+    break;
+
+  case 172:
 #line 1251 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_REJ;
-}
-break;
-case 172:
+;}
+    break;
+
+  case 173:
 #line 1255 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_UNAUTH;
-}
-break;
-case 173:
+;}
+    break;
+
+  case 174:
 #line 1259 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_SPY;
-}
-break;
-case 174:
+;}
+    break;
+
+  case 175:
 #line 1263 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_EXTERNAL;
-}
-break;
-case 175:
+;}
+    break;
+
+  case 176:
 #line 1267 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_OPERWALL;
-}
-break;
-case 176:
+;}
+    break;
+
+  case 177:
 #line 1271 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_SERVNOTICE;
-}
-break;
-case 177:
+;}
+    break;
+
+  case 178:
 #line 1275 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_INVISIBLE;
-}
-break;
-case 178:
+;}
+    break;
+
+  case 179:
 #line 1279 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_WALLOP;
-}
-break;
-case 179:
+;}
+    break;
+
+  case 180:
 #line 1283 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_SOFTCALLERID;
-}
-break;
-case 180:
+;}
+    break;
+
+  case 181:
 #line 1287 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_CALLERID;
-}
-break;
-case 181:
+;}
+    break;
+
+  case 182:
 #line 1291 "ircd_parser.y"
-{
+    {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_LOCOPS;
-}
-break;
-case 182:
-#line 1297 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 183:
+#line 1295 "ircd_parser.y"
+    {
   if (ypass == 2)
+    yy_aconf->modes |= UMODE_SNOOP;
+;}
+    break;
+
+  case 184:
+#line 1301 "ircd_parser.y"
+    {
+  if (ypass == 2)
   {
     if (yylval.number)
       yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
     else
       yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
   }
-}
-break;
-case 183:
-#line 1308 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 185:
+#line 1312 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3383,11 +4515,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_REMOTE; 
   }
-}
-break;
-case 184:
-#line 1319 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 186:
+#line 1323 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3395,11 +4528,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
   }
-}
-break;
-case 185:
-#line 1330 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 187:
+#line 1334 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3407,11 +4541,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_K;
   }
-}
-break;
-case 186:
-#line 1341 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 188:
+#line 1345 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3419,11 +4554,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_X;
   }
-}
-break;
-case 187:
-#line 1352 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 189:
+#line 1356 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3431,11 +4567,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_UNKLINE; 
   }
-}
-break;
-case 188:
-#line 1363 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 190:
+#line 1367 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3443,11 +4580,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_GLINE;
   }
-}
-break;
-case 189:
-#line 1374 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 191:
+#line 1378 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3455,11 +4593,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_N;
   }
-}
-break;
-case 190:
-#line 1385 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 192:
+#line 1389 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3467,11 +4606,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_DIE;
   }
-}
-break;
-case 191:
-#line 1396 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 193:
+#line 1400 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3479,11 +4619,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_REHASH;
   }
-}
-break;
-case 192:
-#line 1407 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 194:
+#line 1411 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3491,11 +4632,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_ADMIN;
   }
-}
-break;
-case 193:
-#line 1418 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 195:
+#line 1422 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3503,11 +4645,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
   }
-}
-break;
-case 194:
-#line 1429 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 196:
+#line 1433 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3515,11 +4658,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
   }
-}
-break;
-case 195:
-#line 1440 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 197:
+#line 1444 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3527,11 +4671,12 @@
     else
       yy_aconf->port &= ~OPER_FLAG_OPERWALL;
   }
-}
-break;
-case 196:
-#line 1451 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 198:
+#line 1455 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -3539,224 +4684,248 @@
     else
       yy_aconf->port &= ~OPER_FLAG_SNOOP;
   }
-}
-break;
-case 197:
-#line 1462 "ircd_parser.y"
-{
-}
-break;
-case 201:
+;}
+    break;
+
+  case 199:
 #line 1466 "ircd_parser.y"
-{ not_atom = 1; }
-break;
-case 203:
-#line 1467 "ircd_parser.y"
-{ not_atom = 0; }
-break;
-case 205:
+    {
+;}
+    break;
+
+  case 203:
 #line 1470 "ircd_parser.y"
-{
+    { not_atom = 1; ;}
+    break;
+
+  case 205:
+#line 1471 "ircd_parser.y"
+    { not_atom = 0; ;}
+    break;
+
+  case 207:
+#line 1474 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
     else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
   }
-}
-break;
-case 206:
-#line 1477 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 208:
+#line 1481 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
     else yy_aconf->port |= OPER_FLAG_REMOTE;
   }
-}
-break;
-case 207:
-#line 1484 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 209:
+#line 1488 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
     else yy_aconf->port |= OPER_FLAG_K;
   }
-}
-break;
-case 208:
-#line 1491 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 210:
+#line 1495 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
     else yy_aconf->port |= OPER_FLAG_UNKLINE;
   } 
-}
-break;
-case 209:
-#line 1498 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 211:
+#line 1502 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
     else yy_aconf->port |= OPER_FLAG_X;
   }
-}
-break;
-case 210:
-#line 1505 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 212:
+#line 1509 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
     else yy_aconf->port |= OPER_FLAG_GLINE;
   }
-}
-break;
-case 211:
-#line 1512 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 213:
+#line 1516 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
     else yy_aconf->port |= OPER_FLAG_DIE;
   }
-}
-break;
-case 212:
-#line 1519 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 214:
+#line 1523 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
     else yy_aconf->port |= OPER_FLAG_REHASH;
   }
-}
-break;
-case 213:
-#line 1526 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 215:
+#line 1530 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
     else yy_aconf->port |= OPER_FLAG_ADMIN;
   }
-}
-break;
-case 214:
-#line 1533 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 216:
+#line 1537 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
     else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
   }
-}
-break;
-case 215:
-#line 1540 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 217:
+#line 1544 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
     else yy_aconf->port |= OPER_FLAG_N;
   }
-}
-break;
-case 216:
-#line 1547 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 218:
+#line 1551 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
     else yy_aconf->port |= OPER_FLAG_OPERWALL;
   }
-}
-break;
-case 217:
-#line 1554 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 219:
+#line 1558 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
     else yy_aconf->port |= OPER_FLAG_OPER_SPY;
   }
-}
-break;
-case 218:
-#line 1561 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 220:
+#line 1565 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
     else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
   }
-}
-break;
-case 219:
-#line 1568 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 221:
+#line 1572 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
     else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
   }
-}
-break;
-case 220:
-#line 1575 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 222:
+#line 1579 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) ClearConfEncrypted(yy_aconf);
     else SetConfEncrypted(yy_aconf);
   }
-}
-break;
-case 221:
-#line 1582 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 223:
+#line 1586 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->port &= ~OPER_FLAG_SNOOP;
     else yy_aconf->port |= OPER_FLAG_SNOOP;
   }
-}
-break;
-case 222:
-#line 1594 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 224:
+#line 1598 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(WEBIRC_TYPE);
     yy_aconf = map_to_conf(yy_conf);
   }
-}
-break;
-case 223:
-#line 1601 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 225:
+#line 1605 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = NULL;
     yy_aconf = NULL;
   }
-}
-break;
-case 229:
-#line 1613 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 231:
+#line 1617 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_aconf->host);
     DupString(yy_aconf->host, yylval.string);
   }
-}
-break;
-case 230:
-#line 1622 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 232:
+#line 1626 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yy_aconf->passwd != NULL)
@@ -3765,21 +4934,23 @@
     MyFree(yy_aconf->passwd);
     DupString(yy_aconf->passwd, yylval.string);
   }
-}
-break;
-case 231:
-#line 1637 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 233:
+#line 1641 "ircd_parser.y"
+    {
   if (ypass == 1)
   {
     yy_conf = make_conf_item(CLASS_TYPE);
     yy_class = map_to_conf(yy_conf);
   }
-}
-break;
-case 232:
-#line 1644 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 234:
+#line 1648 "ircd_parser.y"
+    {
   if (ypass == 1)
   {
     struct ConfItem *cconf = NULL;
@@ -3819,159 +4990,180 @@
 
     yy_class_name = NULL;
   }
-}
-break;
-case 251:
-#line 1704 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 253:
+#line 1708 "ircd_parser.y"
+    {
   if (ypass == 1)
   {
     MyFree(yy_class_name);
     DupString(yy_class_name, yylval.string);
   }
-}
-break;
-case 252:
-#line 1713 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 254:
+#line 1717 "ircd_parser.y"
+    {
   if (ypass == 1)
   {
     MyFree(yy_class_name);
     DupString(yy_class_name, yylval.string);
   }
-}
-break;
-case 253:
-#line 1722 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 255:
+#line 1726 "ircd_parser.y"
+    {
   if (ypass == 1)
-    PingFreq(yy_class) = yyvsp[-1].number;
-}
-break;
-case 254:
-#line 1728 "ircd_parser.y"
-{
+    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 256:
+#line 1732 "ircd_parser.y"
+    {
   if (ypass == 1)
-    PingWarning(yy_class) = yyvsp[-1].number;
-}
-break;
-case 255:
-#line 1734 "ircd_parser.y"
-{
+    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 257:
+#line 1738 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxPerIp(yy_class) = yyvsp[-1].number;
-}
-break;
-case 256:
-#line 1740 "ircd_parser.y"
-{
+    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 258:
+#line 1744 "ircd_parser.y"
+    {
   if (ypass == 1)
-    ConFreq(yy_class) = yyvsp[-1].number;
-}
-break;
-case 257:
-#line 1746 "ircd_parser.y"
-{
+    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 259:
+#line 1750 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxTotal(yy_class) = yyvsp[-1].number;
-}
-break;
-case 258:
-#line 1752 "ircd_parser.y"
-{
+    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 260:
+#line 1756 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxGlobal(yy_class) = yyvsp[-1].number;
-}
-break;
-case 259:
-#line 1758 "ircd_parser.y"
-{
+    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 261:
+#line 1762 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxLocal(yy_class) = yyvsp[-1].number;
-}
-break;
-case 260:
-#line 1764 "ircd_parser.y"
-{
+    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 262:
+#line 1768 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxIdent(yy_class) = yyvsp[-1].number;
-}
-break;
-case 261:
-#line 1770 "ircd_parser.y"
-{
+    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 263:
+#line 1774 "ircd_parser.y"
+    {
   if (ypass == 1)
-    MaxSendq(yy_class) = yyvsp[-1].number;
-}
-break;
-case 262:
-#line 1776 "ircd_parser.y"
-{
+    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 264:
+#line 1780 "ircd_parser.y"
+    {
   if (ypass == 1)
-    CidrBitlenIPV4(yy_class) = yyvsp[-1].number;
-}
-break;
-case 263:
-#line 1782 "ircd_parser.y"
-{
+    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 265:
+#line 1786 "ircd_parser.y"
+    {
   if (ypass == 1)
-    CidrBitlenIPV6(yy_class) = yyvsp[-1].number;
-}
-break;
-case 264:
-#line 1788 "ircd_parser.y"
-{
+    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 266:
+#line 1792 "ircd_parser.y"
+    {
   if (ypass == 1)
-    NumberPerCidr(yy_class) = yyvsp[-1].number;
-}
-break;
-case 265:
-#line 1797 "ircd_parser.y"
-{
+    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 267:
+#line 1801 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     listener_address = NULL;
     listener_flags = 0;
   }
-}
-break;
-case 266:
-#line 1804 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 268:
+#line 1808 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(listener_address);
     listener_address = NULL;
   }
-}
-break;
-case 267:
-#line 1813 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 269:
+#line 1817 "ircd_parser.y"
+    {
   listener_flags = 0;
-}
-break;
-case 271:
-#line 1819 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 273:
+#line 1823 "ircd_parser.y"
+    {
   if (ypass == 2)
     listener_flags |= LISTENER_SSL;
-}
-break;
-case 272:
-#line 1823 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 274:
+#line 1827 "ircd_parser.y"
+    {
   if (ypass == 2)
     listener_flags |= LISTENER_HIDDEN;
-}
-break;
-case 280:
-#line 1831 "ircd_parser.y"
-{ listener_flags = 0; }
-break;
-case 284:
-#line 1836 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 282:
+#line 1835 "ircd_parser.y"
+    { listener_flags = 0; ;}
+    break;
+
+  case 286:
+#line 1840 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if ((listener_flags & LISTENER_SSL))
@@ -3982,13 +5174,14 @@
         yyerror("SSL not available - port closed");
 	break;
       }
-    add_listener(yyvsp[0].number, listener_address, listener_flags);
+    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
   }
-}
-break;
-case 285:
-#line 1850 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 287:
+#line 1854 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     int i;
@@ -4002,34 +5195,37 @@
 	break;
       }
 
-    for (i = yyvsp[-2].number; i <= yyvsp[0].number; ++i)
+    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
       add_listener(i, listener_address, listener_flags);
   }
-}
-break;
-case 286:
-#line 1870 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 288:
+#line 1874 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(listener_address);
     DupString(listener_address, yylval.string);
   }
-}
-break;
-case 287:
-#line 1879 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 289:
+#line 1883 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(listener_address);
     DupString(listener_address, yylval.string);
   }
-}
-break;
-case 288:
-#line 1891 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 290:
+#line 1895 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(CLIENT_TYPE);
@@ -4040,11 +5236,12 @@
     MyFree(class_name);
     class_name = NULL;
   }
-}
-break;
-case 289:
-#line 1903 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 291:
+#line 1907 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp = NULL;
@@ -4098,11 +5295,12 @@
     yy_conf = NULL;
     yy_aconf = NULL;
   }
-}
-break;
-case 309:
-#line 1968 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 311:
+#line 1972 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp = NULL;
@@ -4134,11 +5332,12 @@
       dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
     }
   }
-}
-break;
-case 310:
-#line 2005 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 312:
+#line 2009 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     /* be paranoid */
@@ -4148,11 +5347,12 @@
     MyFree(yy_aconf->passwd);
     DupString(yy_aconf->passwd, yylval.string);
   }
-}
-break;
-case 311:
-#line 2018 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 313:
+#line 2022 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4160,21 +5360,23 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
   }
-}
-break;
-case 312:
-#line 2029 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 314:
+#line 2033 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(class_name);
     DupString(class_name, yylval.string);
   }
-}
-break;
-case 313:
-#line 2038 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 315:
+#line 2042 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4182,125 +5384,139 @@
     else
       ClearConfEncrypted(yy_aconf);
   }
-}
-break;
-case 314:
-#line 2049 "ircd_parser.y"
-{
-}
-break;
-case 318:
+;}
+    break;
+
+  case 316:
 #line 2053 "ircd_parser.y"
-{ not_atom = 1; }
-break;
-case 320:
-#line 2054 "ircd_parser.y"
-{ not_atom = 0; }
-break;
-case 322:
+    {
+;}
+    break;
+
+  case 320:
 #line 2057 "ircd_parser.y"
-{
+    { not_atom = 1; ;}
+    break;
+
+  case 322:
+#line 2058 "ircd_parser.y"
+    { not_atom = 0; ;}
+    break;
+
+  case 324:
+#line 2061 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
     else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
   }
 
-}
-break;
-case 323:
-#line 2065 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 325:
+#line 2069 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
     else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
   }
-}
-break;
-case 324:
-#line 2072 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 326:
+#line 2076 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
     else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
   } 
-}
-break;
-case 325:
-#line 2079 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 327:
+#line 2083 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
     else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
   }
-}
-break;
-case 326:
-#line 2086 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 328:
+#line 2090 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
     else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
   }
-}
-break;
-case 327:
-#line 2093 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 329:
+#line 2097 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
     else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
   }
-}
-break;
-case 328:
-#line 2100 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 330:
+#line 2104 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
     else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
   } 
-}
-break;
-case 329:
-#line 2107 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 331:
+#line 2111 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
     else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
   } 
-}
-break;
-case 330:
-#line 2114 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 332:
+#line 2118 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
     else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
   }
-}
-break;
-case 331:
-#line 2121 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 333:
+#line 2125 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
     else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
   }
-}
-break;
-case 332:
-#line 2130 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 334:
+#line 2134 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4308,11 +5524,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
   }
-}
-break;
-case 333:
-#line 2141 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 335:
+#line 2145 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4320,11 +5537,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
   }
-}
-break;
-case 334:
-#line 2152 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 336:
+#line 2156 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4332,11 +5550,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
   }
-}
-break;
-case 335:
-#line 2163 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 337:
+#line 2167 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4344,11 +5563,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
   }
-}
-break;
-case 336:
-#line 2174 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 338:
+#line 2178 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4356,11 +5576,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
   }
-}
-break;
-case 337:
-#line 2185 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 339:
+#line 2189 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4368,11 +5589,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
   }
-}
-break;
-case 338:
-#line 2197 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 340:
+#line 2201 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_conf->name);
@@ -4388,32 +5610,35 @@
       yy_conf->name = NULL;
     }
   }
-}
-break;
-case 339:
-#line 2216 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 341:
+#line 2220 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_aconf->flags |= CONF_FLAGS_REDIR;
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 340:
-#line 2226 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 342:
+#line 2230 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_aconf->flags |= CONF_FLAGS_REDIR;
-    yy_aconf->port = yyvsp[-1].number;
+    yy_aconf->port = (yyvsp[(3) - (4)].number);
   }
-}
-break;
-case 341:
-#line 2235 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 343:
+#line 2239 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -4421,41 +5646,45 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
   }
-}
-break;
-case 342:
-#line 2250 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 344:
+#line 2254 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(resv_reason);
     resv_reason = NULL;
   }
-}
-break;
-case 343:
-#line 2257 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 345:
+#line 2261 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(resv_reason);
     resv_reason = NULL;
   }
-}
-break;
-case 350:
-#line 2269 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 352:
+#line 2273 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(resv_reason);
     DupString(resv_reason, yylval.string);
   }
-}
-break;
-case 351:
-#line 2278 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 353:
+#line 2282 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (IsChanPrefix(*yylval.string))
@@ -4467,52 +5696,57 @@
   }
   /* ignore it for now.. but we really should make a warning if
    * its an erroneous name --fl_ */
-}
-break;
-case 352:
-#line 2293 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 354:
+#line 2297 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     char def_reason[] = "No reason";
 
     create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
   }
-}
-break;
-case 353:
-#line 2306 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 355:
+#line 2310 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(ULINE_TYPE);
     yy_match_item = map_to_conf(yy_conf);
     yy_match_item->action = SHARED_ALL;
   }
-}
-break;
-case 354:
-#line 2314 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 356:
+#line 2318 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = NULL;
   }
-}
-break;
-case 361:
-#line 2325 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 363:
+#line 2329 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 362:
-#line 2334 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 364:
+#line 2338 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct split_nuh_item nuh;
@@ -4531,214 +5765,243 @@
     DupString(yy_match_item->user, userbuf);
     DupString(yy_match_item->host, hostbuf);
   }
-}
-break;
-case 363:
-#line 2356 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 365:
+#line 2360 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action = 0;
-}
-break;
-case 367:
-#line 2363 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 369:
+#line 2367 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_KLINE;
-}
-break;
-case 368:
-#line 2367 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 370:
+#line 2371 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_TKLINE;
-}
-break;
-case 369:
-#line 2371 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 371:
+#line 2375 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_UNKLINE;
-}
-break;
-case 370:
-#line 2375 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 372:
+#line 2379 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_XLINE;
-}
-break;
-case 371:
-#line 2379 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 373:
+#line 2383 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_TXLINE;
-}
-break;
-case 372:
-#line 2383 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 374:
+#line 2387 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_UNXLINE;
-}
-break;
-case 373:
-#line 2387 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 375:
+#line 2391 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_RESV;
-}
-break;
-case 374:
-#line 2391 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 376:
+#line 2395 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_TRESV;
-}
-break;
-case 375:
-#line 2395 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 377:
+#line 2399 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_UNRESV;
-}
-break;
-case 376:
-#line 2399 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 378:
+#line 2403 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_LOCOPS;
-}
-break;
-case 377:
-#line 2403 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 379:
+#line 2407 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action |= SHARED_USERMODE;
-}
-break;
-case 378:
-#line 2407 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 380:
+#line 2411 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_match_item->action = SHARED_ALL;
-}
-break;
-case 379:
-#line 2416 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 381:
+#line 2420 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(CLUSTER_TYPE);
     yy_conf->flags = SHARED_ALL;
   }
-}
-break;
-case 380:
-#line 2423 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 382:
+#line 2427 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yy_conf->name == NULL)
       DupString(yy_conf->name, "*");
     yy_conf = NULL;
   }
-}
-break;
-case 386:
-#line 2436 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 388:
+#line 2440 "ircd_parser.y"
+    {
   if (ypass == 2)
     DupString(yy_conf->name, yylval.string);
-}
-break;
-case 387:
-#line 2442 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 389:
+#line 2446 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags = 0;
-}
-break;
-case 391:
-#line 2449 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 393:
+#line 2453 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_KLINE;
-}
-break;
-case 392:
-#line 2453 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 394:
+#line 2457 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_TKLINE;
-}
-break;
-case 393:
-#line 2457 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 395:
+#line 2461 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_UNKLINE;
-}
-break;
-case 394:
-#line 2461 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 396:
+#line 2465 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_XLINE;
-}
-break;
-case 395:
-#line 2465 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 397:
+#line 2469 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_TXLINE;
-}
-break;
-case 396:
-#line 2469 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 398:
+#line 2473 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_UNXLINE;
-}
-break;
-case 397:
-#line 2473 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 399:
+#line 2477 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_RESV;
-}
-break;
-case 398:
-#line 2477 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 400:
+#line 2481 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_TRESV;
-}
-break;
-case 399:
-#line 2481 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 401:
+#line 2485 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_UNRESV;
-}
-break;
-case 400:
-#line 2485 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 402:
+#line 2489 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags |= SHARED_LOCOPS;
-}
-break;
-case 401:
-#line 2489 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 403:
+#line 2493 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_conf->flags = SHARED_ALL;
-}
-break;
-case 402:
-#line 2498 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 404:
+#line 2502 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(SERVER_TYPE);
@@ -4755,11 +6018,12 @@
     MyFree(class_name);
     class_name = NULL;
   }
-}
-break;
-case 403:
-#line 2516 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 405:
+#line 2520 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_hconf=NULL;
@@ -4884,11 +6148,12 @@
       yy_conf = NULL;
       yy_aconf = NULL;
   }
-}
-break;
-case 428:
-#line 2655 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 430:
+#line 2659 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yy_conf->name != NULL)
@@ -4897,11 +6162,12 @@
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 429:
-#line 2667 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 431:
+#line 2671 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yy_conf->name != NULL)
@@ -4910,21 +6176,23 @@
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 430:
-#line 2679 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 432:
+#line 2683 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_aconf->host);
     DupString(yy_aconf->host, yylval.string);
   }
-}
-break;
-case 431:
-#line 2688 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 433:
+#line 2692 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct addrinfo hints, *res;
@@ -4947,16 +6215,17 @@
       irc_freeaddrinfo(res);
     }
   }
-}
-break;
-case 432:
-#line 2714 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 434:
+#line 2718 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
-    if (yyvsp[-1].string[0] == ':')
+    if ((yyvsp[(3) - (4)].string)[0] == ':')
       yyerror("Server passwords cannot begin with a colon");
-    else if (strchr(yyvsp[-1].string, ' ') != NULL)
+    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
       yyerror("Server passwords cannot contain spaces");
     else {
       if (yy_aconf->spasswd != NULL)
@@ -4966,16 +6235,17 @@
       DupString(yy_aconf->spasswd, yylval.string);
     }
   }
-}
-break;
-case 433:
-#line 2732 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 435:
+#line 2736 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
-    if (yyvsp[-1].string[0] == ':')
+    if ((yyvsp[(3) - (4)].string)[0] == ':')
       yyerror("Server passwords cannot begin with a colon");
-    else if (strchr(yyvsp[-1].string, ' ') != NULL)
+    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
       yyerror("Server passwords cannot contain spaces");
     else {
       if (yy_aconf->passwd != NULL)
@@ -4985,67 +6255,76 @@
       DupString(yy_aconf->passwd, yylval.string);
     }
   }
-}
-break;
-case 434:
-#line 2750 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 436:
+#line 2754 "ircd_parser.y"
+    {
   if (ypass == 2)
-    yy_aconf->port = yyvsp[-1].number;
-}
-break;
-case 435:
-#line 2756 "ircd_parser.y"
-{
+    yy_aconf->port = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 437:
+#line 2760 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_aconf->aftype = AF_INET;
-}
-break;
-case 436:
-#line 2760 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 438:
+#line 2764 "ircd_parser.y"
+    {
 #ifdef IPV6
   if (ypass == 2)
     yy_aconf->aftype = AF_INET6;
 #endif
-}
-break;
-case 437:
-#line 2768 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 439:
+#line 2772 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_aconf->fakename);
     DupString(yy_aconf->fakename, yylval.string);
   }
-}
-break;
-case 438:
-#line 2777 "ircd_parser.y"
-{
-}
-break;
-case 442:
+;}
+    break;
+
+  case 440:
 #line 2781 "ircd_parser.y"
-{ not_atom = 1; }
-break;
-case 444:
-#line 2782 "ircd_parser.y"
-{ not_atom = 0; }
-break;
-case 446:
+    {
+;}
+    break;
+
+  case 444:
 #line 2785 "ircd_parser.y"
-{
+    { not_atom = 1; ;}
+    break;
+
+  case 446:
+#line 2786 "ircd_parser.y"
+    { not_atom = 0; ;}
+    break;
+
+  case 448:
+#line 2789 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)ClearConfLazyLink(yy_aconf);
     else SetConfLazyLink(yy_aconf);
   }
-}
-break;
-case 447:
-#line 2792 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 449:
+#line 2796 "ircd_parser.y"
+    {
   if (ypass == 2)
 #ifndef HAVE_LIBZ
     yyerror("Ignoring flags = compressed; -- no zlib support");
@@ -5055,51 +6334,56 @@
    else SetConfCompressed(yy_aconf);
  }
 #endif
-}
-break;
-case 448:
-#line 2803 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 450:
+#line 2807 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)ClearConfCryptLink(yy_aconf);
     else SetConfCryptLink(yy_aconf);
   }
-}
-break;
-case 449:
-#line 2810 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 451:
+#line 2814 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)ClearConfAllowAutoConn(yy_aconf);
     else SetConfAllowAutoConn(yy_aconf);
   }
-}
-break;
-case 450:
-#line 2817 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 452:
+#line 2821 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)ClearConfAwayBurst(yy_aconf);
     else SetConfAwayBurst(yy_aconf);
   }
-}
-break;
-case 451:
-#line 2824 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 453:
+#line 2828 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (not_atom)ClearConfTopicBurst(yy_aconf);
     else SetConfTopicBurst(yy_aconf);
   }
-}
-break;
-case 452:
-#line 2834 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 454:
+#line 2838 "ircd_parser.y"
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 2)
   {
@@ -5137,11 +6421,12 @@
     BIO_free(file);
   }
 #endif /* HAVE_LIBCRYPTO */
-}
-break;
-case 453:
-#line 2875 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 455:
+#line 2879 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -5149,11 +6434,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
   }
-}
-break;
-case 454:
-#line 2886 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 456:
+#line 2890 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -5161,11 +6447,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
   }
-}
-break;
-case 455:
-#line 2897 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 457:
+#line 2901 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -5177,11 +6464,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
   }
-}
-break;
-case 456:
-#line 2912 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 458:
+#line 2916 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -5189,11 +6477,12 @@
     else
       yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
   }
-}
-break;
-case 457:
-#line 2923 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 459:
+#line 2927 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.number)
@@ -5201,11 +6490,12 @@
     else
       ClearConfTopicBurst(yy_aconf);
   }
-}
-break;
-case 458:
-#line 2934 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 460:
+#line 2938 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp;
@@ -5215,11 +6505,12 @@
     DupString(yy_tmp->user, "*");
     dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
   }
-}
-break;
-case 459:
-#line 2947 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 461:
+#line 2951 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp;
@@ -5229,21 +6520,23 @@
     DupString(yy_tmp->user, "*");
     dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
   }
-}
-break;
-case 460:
-#line 2960 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 462:
+#line 2964 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(class_name);
     DupString(class_name, yylval.string);
   }
-}
-break;
-case 461:
-#line 2969 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 463:
+#line 2973 "ircd_parser.y"
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 2)
   {
@@ -5272,21 +6565,23 @@
   if (ypass == 2)
     yyerror("Ignoring cipher_preference -- no OpenSSL support");
 #endif
-}
-break;
-case 462:
-#line 3004 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 464:
+#line 3008 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
     regex_ban = 0;
   }
-}
-break;
-case 463:
-#line 3011 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 465:
+#line 3015 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (userbuf[0] && hostbuf[0])
@@ -5340,23 +6635,26 @@
     yy_conf = NULL;
     yy_aconf = NULL;
   }
-}
-break;
-case 464:
-#line 3068 "ircd_parser.y"
-{
-}
-break;
-case 468:
-#line 3073 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 466:
+#line 3072 "ircd_parser.y"
+    {
+;}
+    break;
+
+  case 470:
+#line 3077 "ircd_parser.y"
+    {
   if (ypass == 2)
     regex_ban = 1;
-}
-break;
-case 475:
-#line 3082 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 477:
+#line 3086 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct split_nuh_item nuh;
@@ -5372,18 +6670,20 @@
 
     split_nuh(&nuh);
   }
-}
-break;
-case 476:
-#line 3101 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 478:
+#line 3105 "ircd_parser.y"
+    {
   if (ypass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
-}
-break;
-case 477:
-#line 3110 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 479:
+#line 3114 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(DLINE_TYPE);
@@ -5391,11 +6691,12 @@
     /* default reason */
     DupString(yy_aconf->reason, "No reason");
   }
-}
-break;
-case 478:
-#line 3119 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 480:
+#line 3123 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
@@ -5405,31 +6706,34 @@
     yy_conf = NULL;
     yy_aconf = NULL;
   }
-}
-break;
-case 484:
-#line 3135 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 486:
+#line 3139 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_aconf->host);
     DupString(yy_aconf->host, yylval.string);
   }
-}
-break;
-case 485:
-#line 3144 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 487:
+#line 3148 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(yy_aconf->reason);
     DupString(yy_aconf->reason, yylval.string);
   }
-}
-break;
-case 491:
-#line 3161 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 493:
+#line 3165 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
@@ -5444,21 +6748,23 @@
       yy_aconf = NULL;
     }
   }
-}
-break;
-case 492:
-#line 3182 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 494:
+#line 3186 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     regex_ban = 0;
     reasonbuf[0] = gecos_name[0] = '\0';
   }
-}
-break;
-case 493:
-#line 3189 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 495:
+#line 3193 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (gecos_name[0])
@@ -5490,276 +6796,319 @@
         DupString(yy_match_item->reason, "No reason");
     }
   }
-}
-break;
-case 494:
-#line 3224 "ircd_parser.y"
-{
-}
-break;
-case 498:
-#line 3229 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 496:
+#line 3228 "ircd_parser.y"
+    {
+;}
+    break;
+
+  case 500:
+#line 3233 "ircd_parser.y"
+    {
   if (ypass == 2)
     regex_ban = 1;
-}
-break;
-case 505:
-#line 3238 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 507:
+#line 3242 "ircd_parser.y"
+    {
   if (ypass == 2)
     strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
-}
-break;
-case 506:
-#line 3244 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 508:
+#line 3248 "ircd_parser.y"
+    {
   if (ypass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
-}
-break;
-case 566:
-#line 3289 "ircd_parser.y"
-{
-  ConfigFileEntry.gline_min_cidr = yyvsp[-1].number;
-}
-break;
-case 567:
-#line 3294 "ircd_parser.y"
-{
-  ConfigFileEntry.gline_min_cidr6 = yyvsp[-1].number;
-}
-break;
-case 568:
-#line 3299 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 568:
+#line 3293 "ircd_parser.y"
+    {
+  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 569:
+#line 3298 "ircd_parser.y"
+    {
+  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 570:
+#line 3303 "ircd_parser.y"
+    {
   ConfigFileEntry.burst_away = yylval.number;
-}
-break;
-case 569:
-#line 3304 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 571:
+#line 3308 "ircd_parser.y"
+    {
   ConfigFileEntry.use_whois_actually = yylval.number;
-}
-break;
-case 570:
-#line 3309 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 572:
+#line 3313 "ircd_parser.y"
+    {
   GlobalSetOptions.rejecttime = yylval.number;
-}
-break;
-case 571:
-#line 3314 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 573:
+#line 3318 "ircd_parser.y"
+    {
   ConfigFileEntry.tkline_expire_notices = yylval.number;
-}
-break;
-case 572:
-#line 3319 "ircd_parser.y"
-{
-  ConfigFileEntry.kill_chase_time_limit = yyvsp[-1].number;
-}
-break;
-case 573:
-#line 3324 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 574:
+#line 3323 "ircd_parser.y"
+    {
+  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 575:
+#line 3328 "ircd_parser.y"
+    {
   ConfigFileEntry.hide_spoof_ips = yylval.number;
-}
-break;
-case 574:
-#line 3329 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 576:
+#line 3333 "ircd_parser.y"
+    {
   ConfigFileEntry.ignore_bogus_ts = yylval.number;
-}
-break;
-case 575:
-#line 3334 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 577:
+#line 3338 "ircd_parser.y"
+    {
   ConfigFileEntry.disable_remote = yylval.number;
-}
-break;
-case 576:
-#line 3339 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 578:
+#line 3343 "ircd_parser.y"
+    {
   ConfigFileEntry.failed_oper_notice = yylval.number;
-}
-break;
-case 577:
-#line 3344 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 579:
+#line 3348 "ircd_parser.y"
+    {
   ConfigFileEntry.anti_nick_flood = yylval.number;
-}
-break;
-case 578:
-#line 3349 "ircd_parser.y"
-{
-  ConfigFileEntry.max_nick_time = yyvsp[-1].number; 
-}
-break;
-case 579:
-#line 3354 "ircd_parser.y"
-{
-  ConfigFileEntry.max_nick_changes = yyvsp[-1].number;
-}
-break;
-case 580:
-#line 3359 "ircd_parser.y"
-{
-  ConfigFileEntry.max_accept = yyvsp[-1].number;
-}
-break;
-case 581:
-#line 3364 "ircd_parser.y"
-{
-  ConfigFileEntry.anti_spam_exit_message_time = yyvsp[-1].number;
-}
-break;
-case 582:
-#line 3369 "ircd_parser.y"
-{
-  ConfigFileEntry.ts_warn_delta = yyvsp[-1].number;
-}
-break;
-case 583:
-#line 3374 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 580:
+#line 3353 "ircd_parser.y"
+    {
+  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); 
+;}
+    break;
+
+  case 581:
+#line 3358 "ircd_parser.y"
+    {
+  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 582:
+#line 3363 "ircd_parser.y"
+    {
+  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 583:
+#line 3368 "ircd_parser.y"
+    {
+  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 584:
+#line 3373 "ircd_parser.y"
+    {
+  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 585:
+#line 3378 "ircd_parser.y"
+    {
   if (ypass == 2)
-    ConfigFileEntry.ts_max_delta = yyvsp[-1].number;
-}
-break;
-case 584:
-#line 3380 "ircd_parser.y"
-{
-  if ((yyvsp[-1].number > 0) && ypass == 1)
+    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 586:
+#line 3384 "ircd_parser.y"
+    {
+  if (((yyvsp[(3) - (4)].number) > 0) && ypass == 1)
   {
     ilog(L_CRIT, "You haven't read your config file properly.");
     ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
     ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
     exit(0);
   }
-}
-break;
-case 585:
-#line 3391 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 587:
+#line 3395 "ircd_parser.y"
+    {
   ConfigFileEntry.kline_with_reason = yylval.number;
-}
-break;
-case 586:
-#line 3396 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 588:
+#line 3400 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(ConfigFileEntry.kline_reason);
     DupString(ConfigFileEntry.kline_reason, yylval.string);
   }
-}
-break;
-case 587:
-#line 3405 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 589:
+#line 3409 "ircd_parser.y"
+    {
   ConfigFileEntry.invisible_on_connect = yylval.number;
-}
-break;
-case 588:
-#line 3410 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 590:
+#line 3414 "ircd_parser.y"
+    {
   ConfigFileEntry.warn_no_nline = yylval.number;
-}
-break;
-case 589:
-#line 3415 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 591:
+#line 3419 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_e_disabled = yylval.number;
-}
-break;
-case 590:
-#line 3420 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 592:
+#line 3424 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_o_oper_only = yylval.number;
-}
-break;
-case 591:
-#line 3425 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 593:
+#line 3429 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_P_oper_only = yylval.number;
-}
-break;
-case 592:
-#line 3430 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 594:
+#line 3434 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
-}
-break;
-case 593:
-#line 3433 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 595:
+#line 3437 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_k_oper_only = 1;
-}
-break;
-case 594:
-#line 3438 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 596:
+#line 3442 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
-}
-break;
-case 595:
-#line 3441 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 597:
+#line 3445 "ircd_parser.y"
+    {
   ConfigFileEntry.stats_i_oper_only = 1;
-}
-break;
-case 596:
-#line 3446 "ircd_parser.y"
-{
-  ConfigFileEntry.pace_wait = yyvsp[-1].number;
-}
-break;
-case 597:
-#line 3451 "ircd_parser.y"
-{
-  ConfigFileEntry.caller_id_wait = yyvsp[-1].number;
-}
-break;
-case 598:
-#line 3456 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 598:
+#line 3450 "ircd_parser.y"
+    {
+  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 599:
+#line 3455 "ircd_parser.y"
+    {
+  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 600:
+#line 3460 "ircd_parser.y"
+    {
   ConfigFileEntry.opers_bypass_callerid = yylval.number;
-}
-break;
-case 599:
-#line 3461 "ircd_parser.y"
-{
-  ConfigFileEntry.pace_wait_simple = yyvsp[-1].number;
-}
-break;
-case 600:
-#line 3466 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 601:
+#line 3465 "ircd_parser.y"
+    {
+  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 602:
+#line 3470 "ircd_parser.y"
+    {
   ConfigFileEntry.short_motd = yylval.number;
-}
-break;
-case 601:
-#line 3471 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 603:
+#line 3475 "ircd_parser.y"
+    {
   ConfigFileEntry.no_oper_flood = yylval.number;
-}
-break;
-case 602:
-#line 3476 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 604:
+#line 3480 "ircd_parser.y"
+    {
   ConfigFileEntry.true_no_oper_flood = yylval.number;
-}
-break;
-case 603:
-#line 3481 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 605:
+#line 3485 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_pass_resv = yylval.number;
-}
-break;
-case 604:
-#line 3486 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 606:
+#line 3490 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     if (strlen(yylval.string) > LOCALE_LENGTH-2)
@@ -5767,39 +7116,44 @@
 
     set_locale(yylval.string);
   }
-}
-break;
-case 605:
-#line 3497 "ircd_parser.y"
-{
-  ConfigFileEntry.idletime = yyvsp[-1].number;
-}
-break;
-case 606:
-#line 3502 "ircd_parser.y"
-{
-  ConfigFileEntry.dots_in_ident = yyvsp[-1].number;
-}
-break;
-case 607:
-#line 3507 "ircd_parser.y"
-{
-  ConfigFileEntry.max_targets = yyvsp[-1].number;
-}
-break;
-case 608:
-#line 3512 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 607:
+#line 3501 "ircd_parser.y"
+    {
+  ConfigFileEntry.idletime = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 608:
+#line 3506 "ircd_parser.y"
+    {
+  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 609:
+#line 3511 "ircd_parser.y"
+    {
+  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 610:
+#line 3516 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(ConfigFileEntry.servlink_path);
     DupString(ConfigFileEntry.servlink_path, yylval.string);
   }
-}
-break;
-case 609:
-#line 3521 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 611:
+#line 3525 "ircd_parser.y"
+    {
 #ifdef HAVE_LIBCRYPTO
   if (ypass == 2)
   {
@@ -5828,14 +7182,15 @@
   if (ypass == 2)
     yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
 #endif
-}
-break;
-case 610:
-#line 3553 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 612:
+#line 3557 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
-    ConfigFileEntry.compression_level = yyvsp[-1].number;
+    ConfigFileEntry.compression_level = (yyvsp[(3) - (4)].number);
 #ifndef HAVE_LIBZ
     yyerror("Ignoring compression_level -- no zlib support");
 #else
@@ -5847,325 +7202,384 @@
     }
 #endif
   }
-}
-break;
-case 611:
-#line 3571 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 613:
+#line 3575 "ircd_parser.y"
+    {
   ConfigFileEntry.use_egd = yylval.number;
-}
-break;
-case 612:
-#line 3576 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 614:
+#line 3580 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(ConfigFileEntry.egdpool_path);
     DupString(ConfigFileEntry.egdpool_path, yylval.string);
   }
-}
-break;
-case 613:
-#line 3585 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 615:
+#line 3589 "ircd_parser.y"
+    {
   ConfigFileEntry.ping_cookie = yylval.number;
-}
-break;
-case 614:
-#line 3590 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 616:
+#line 3594 "ircd_parser.y"
+    {
   ConfigFileEntry.disable_auth = yylval.number;
-}
-break;
-case 615:
-#line 3595 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 617:
+#line 3599 "ircd_parser.y"
+    {
   ConfigFileEntry.throttle_time = yylval.number;
-}
-break;
-case 616:
-#line 3600 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 618:
+#line 3604 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes = 0;
-}
-break;
-case 620:
-#line 3606 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 622:
+#line 3610 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_BOTS;
-}
-break;
-case 621:
-#line 3609 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 623:
+#line 3613 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN;
-}
-break;
-case 622:
-#line 3612 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 624:
+#line 3616 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
-}
-break;
-case 623:
-#line 3615 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 625:
+#line 3619 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_DEAF;
-}
-break;
-case 624:
-#line 3618 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 626:
+#line 3622 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
-}
-break;
-case 625:
-#line 3621 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 627:
+#line 3625 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_FULL;
-}
-break;
-case 626:
-#line 3624 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 628:
+#line 3628 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_SKILL;
-}
-break;
-case 627:
-#line 3627 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 629:
+#line 3631 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
-}
-break;
-case 628:
-#line 3630 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 630:
+#line 3634 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_REJ;
-}
-break;
-case 629:
-#line 3633 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 631:
+#line 3637 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
-}
-break;
-case 630:
-#line 3636 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 632:
+#line 3640 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_SPY;
-}
-break;
-case 631:
-#line 3639 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 633:
+#line 3643 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
-}
-break;
-case 632:
-#line 3642 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 634:
+#line 3646 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
-}
-break;
-case 633:
-#line 3645 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 635:
+#line 3649 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
-}
-break;
-case 634:
-#line 3648 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 636:
+#line 3652 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
-}
-break;
-case 635:
-#line 3651 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 637:
+#line 3655 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
-}
-break;
-case 636:
-#line 3654 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 638:
+#line 3658 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
-}
-break;
-case 637:
-#line 3657 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 639:
+#line 3661 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
-}
-break;
-case 638:
-#line 3660 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 640:
+#line 3664 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
-}
-break;
-case 639:
-#line 3665 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 641:
+#line 3669 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes = 0;
-}
-break;
-case 643:
-#line 3671 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 645:
+#line 3675 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
-}
-break;
-case 644:
-#line 3674 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 646:
+#line 3678 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
-}
-break;
-case 645:
-#line 3677 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 647:
+#line 3681 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
-}
-break;
-case 646:
-#line 3680 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 648:
+#line 3684 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
-}
-break;
-case 647:
-#line 3683 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 649:
+#line 3687 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
-}
-break;
-case 648:
-#line 3686 "ircd_parser.y"
-{ 
+;}
+    break;
+
+  case 650:
+#line 3690 "ircd_parser.y"
+    { 
   ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
-}
-break;
-case 649:
-#line 3689 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 651:
+#line 3693 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
-}
-break;
-case 650:
-#line 3692 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 652:
+#line 3696 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
-}
-break;
-case 651:
-#line 3695 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 653:
+#line 3699 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
-}
-break;
-case 652:
-#line 3698 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 654:
+#line 3702 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
-}
-break;
-case 653:
-#line 3701 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 655:
+#line 3705 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
-}
-break;
-case 654:
-#line 3704 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 656:
+#line 3708 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
-}
-break;
-case 655:
-#line 3707 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 657:
+#line 3711 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
-}
-break;
-case 656:
-#line 3710 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 658:
+#line 3714 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
-}
-break;
-case 657:
-#line 3713 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 659:
+#line 3717 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
-}
-break;
-case 658:
-#line 3716 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 660:
+#line 3720 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
-}
-break;
-case 659:
-#line 3719 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 661:
+#line 3723 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
-}
-break;
-case 660:
-#line 3722 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 662:
+#line 3726 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
-}
-break;
-case 661:
-#line 3725 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 663:
+#line 3729 "ircd_parser.y"
+    {
   ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
-}
-break;
-case 662:
-#line 3730 "ircd_parser.y"
-{
-  ConfigFileEntry.min_nonwildcard = yyvsp[-1].number;
-}
-break;
-case 663:
-#line 3735 "ircd_parser.y"
-{
-  ConfigFileEntry.min_nonwildcard_simple = yyvsp[-1].number;
-}
-break;
-case 664:
-#line 3740 "ircd_parser.y"
-{
-  ConfigFileEntry.default_floodcount = yyvsp[-1].number;
-}
-break;
-case 665:
-#line 3745 "ircd_parser.y"
-{
-  ConfigFileEntry.client_flood = yyvsp[-1].number;
-}
-break;
-case 666:
-#line 3750 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 664:
+#line 3732 "ircd_parser.y"
+    {
+  ConfigFileEntry.oper_only_umodes |= UMODE_SNOOP;
+;}
+    break;
+
+  case 665:
+#line 3737 "ircd_parser.y"
+    {
+  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 666:
+#line 3742 "ircd_parser.y"
+    {
+  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 667:
+#line 3747 "ircd_parser.y"
+    {
+  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 668:
+#line 3752 "ircd_parser.y"
+    {
+  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 669:
+#line 3757 "ircd_parser.y"
+    {
   ConfigFileEntry.dot_in_ip6_addr = yylval.number;
-}
-break;
-case 667:
-#line 3758 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 670:
+#line 3765 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     yy_conf = make_conf_item(GDENY_TYPE);
     yy_aconf = map_to_conf(yy_conf);
   }
-}
-break;
-case 668:
-#line 3765 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 671:
+#line 3772 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     /*
@@ -6179,46 +7593,52 @@
       yy_aconf = NULL;
     }
   }
-}
-break;
-case 678:
-#line 3791 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 681:
+#line 3798 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigFileEntry.glines = yylval.number;
-}
-break;
-case 679:
-#line 3797 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 682:
+#line 3804 "ircd_parser.y"
+    {
   if (ypass == 2)
-    ConfigFileEntry.gline_time = yyvsp[-1].number;
-}
-break;
-case 680:
-#line 3803 "ircd_parser.y"
-{
+    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 683:
+#line 3810 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigFileEntry.gline_logging = 0;
-}
-break;
-case 684:
-#line 3809 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 687:
+#line 3816 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigFileEntry.gline_logging |= GDENY_REJECT;
-}
-break;
-case 685:
-#line 3813 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 688:
+#line 3820 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigFileEntry.gline_logging |= GDENY_BLOCK;
-}
-break;
-case 686:
-#line 3819 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 689:
+#line 3826 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct split_nuh_item nuh;
@@ -6249,28 +7669,31 @@
       dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
     }
   }
-}
-break;
-case 687:
-#line 3853 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 690:
+#line 3860 "ircd_parser.y"
+    {
   if (ypass == 2)  
   {
     MyFree(yy_conf->name);
     DupString(yy_conf->name, yylval.string);
   }
-}
-break;
-case 688:
-#line 3862 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 691:
+#line 3869 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_aconf->flags = 0;
-}
-break;
-case 689:
-#line 3866 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 692:
+#line 3873 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     struct CollectItem *yy_tmp = NULL;
@@ -6313,244 +7736,432 @@
     yy_conf = make_conf_item(GDENY_TYPE);
     yy_aconf = map_to_conf(yy_conf);
   }
-}
-break;
-case 692:
-#line 3913 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 695:
+#line 3920 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_aconf->flags |= GDENY_REJECT;
-}
-break;
-case 693:
-#line 3917 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 696:
+#line 3924 "ircd_parser.y"
+    {
   if (ypass == 2)
     yy_aconf->flags |= GDENY_BLOCK;
-}
-break;
-case 716:
-#line 3941 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 719:
+#line 3948 "ircd_parser.y"
+    {
   ConfigChannel.disable_fake_channels = yylval.number;
-}
-break;
-case 717:
-#line 3946 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 720:
+#line 3953 "ircd_parser.y"
+    {
   ConfigChannel.restrict_channels = yylval.number;
-}
-break;
-case 718:
-#line 3951 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 721:
+#line 3958 "ircd_parser.y"
+    {
   ConfigChannel.disable_local_channels = yylval.number;
-}
-break;
-case 719:
-#line 3956 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 722:
+#line 3963 "ircd_parser.y"
+    {
   ConfigChannel.use_except = yylval.number;
-}
-break;
-case 720:
-#line 3961 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 723:
+#line 3968 "ircd_parser.y"
+    {
   ConfigChannel.use_invex = yylval.number;
-}
-break;
-case 721:
-#line 3966 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 724:
+#line 3973 "ircd_parser.y"
+    {
   ConfigChannel.use_knock = yylval.number;
-}
-break;
-case 722:
-#line 3971 "ircd_parser.y"
-{
-  ConfigChannel.knock_delay = yyvsp[-1].number;
-}
-break;
-case 723:
-#line 3976 "ircd_parser.y"
-{
-  ConfigChannel.knock_delay_channel = yyvsp[-1].number;
-}
-break;
-case 724:
-#line 3981 "ircd_parser.y"
-{
-  ConfigChannel.max_chans_per_user = yyvsp[-1].number;
-}
-break;
-case 725:
-#line 3986 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 725:
+#line 3978 "ircd_parser.y"
+    {
+  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 726:
+#line 3983 "ircd_parser.y"
+    {
+  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 727:
+#line 3988 "ircd_parser.y"
+    {
+  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 728:
+#line 3993 "ircd_parser.y"
+    {
   ConfigChannel.quiet_on_ban = yylval.number;
-}
-break;
-case 726:
-#line 3991 "ircd_parser.y"
-{
-  ConfigChannel.max_bans = yyvsp[-1].number;
-}
-break;
-case 727:
-#line 3996 "ircd_parser.y"
-{
-  ConfigChannel.default_split_user_count = yyvsp[-1].number;
-}
-break;
-case 728:
-#line 4001 "ircd_parser.y"
-{
-  ConfigChannel.default_split_server_count = yyvsp[-1].number;
-}
-break;
-case 729:
-#line 4006 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 729:
+#line 3998 "ircd_parser.y"
+    {
+  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 730:
+#line 4003 "ircd_parser.y"
+    {
+  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 731:
+#line 4008 "ircd_parser.y"
+    {
+  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
+;}
+    break;
+
+  case 732:
+#line 4013 "ircd_parser.y"
+    {
   ConfigChannel.no_create_on_split = yylval.number;
-}
-break;
-case 730:
-#line 4011 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 733:
+#line 4018 "ircd_parser.y"
+    {
   ConfigChannel.no_join_on_split = yylval.number;
-}
-break;
-case 731:
-#line 4016 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 734:
+#line 4023 "ircd_parser.y"
+    {
   ConfigChannel.burst_topicwho = yylval.number;
-}
-break;
-case 732:
-#line 4021 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 735:
+#line 4028 "ircd_parser.y"
+    {
   GlobalSetOptions.joinfloodcount = yylval.number;
-}
-break;
-case 733:
-#line 4026 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 736:
+#line 4033 "ircd_parser.y"
+    {
   GlobalSetOptions.joinfloodtime = yylval.number;
-}
-break;
-case 745:
-#line 4045 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 748:
+#line 4052 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigServerHide.flatten_links = yylval.number;
-}
-break;
-case 746:
-#line 4051 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 749:
+#line 4058 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigServerHide.hide_servers = yylval.number;
-}
-break;
-case 747:
-#line 4057 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 750:
+#line 4064 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
     MyFree(ConfigServerHide.hidden_name);
     DupString(ConfigServerHide.hidden_name, yylval.string);
   }
-}
-break;
-case 748:
-#line 4066 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 751:
+#line 4073 "ircd_parser.y"
+    {
   if (ypass == 2)
   {
-    if ((yyvsp[-1].number > 0) && ConfigServerHide.links_disabled == 1)
+    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
     {
-      eventAddIsh("write_links_file", write_links_file, NULL, yyvsp[-1].number);
+      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
       ConfigServerHide.links_disabled = 0;
     }
 
-    ConfigServerHide.links_delay = yyvsp[-1].number;
+    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
   }
-}
-break;
-case 749:
-#line 4080 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 752:
+#line 4087 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigServerHide.hidden = yylval.number;
-}
-break;
-case 750:
-#line 4086 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 753:
+#line 4093 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigServerHide.disable_hidden = yylval.number;
-}
-break;
-case 751:
-#line 4092 "ircd_parser.y"
-{
+;}
+    break;
+
+  case 754:
+#line 4099 "ircd_parser.y"
+    {
   if (ypass == 2)
     ConfigServerHide.hide_server_ips = yylval.number;
-}
-break;
-#line 6501 "y.tab.c"
+;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 7954 "y.tab.c"
+      default: break;
     }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
 #endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
     }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
-    if (yyssp >= yysslim && yygrowstack())
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
     {
-        goto yyoverflow;
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
     }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
+
+
+
Index: src/s_gline.c
===================================================================
--- src/s_gline.c	(.../1.0.1)	(revision 183)
+++ src/s_gline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_gline.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_gline.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_gline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/y.tab.h
===================================================================
--- src/y.tab.h	(.../1.0.1)	(revision 183)
+++ src/y.tab.h	(.../1.0.2)	(revision 183)
@@ -1,269 +1,585 @@
-#ifndef YYERRCODE
-#define YYERRCODE 256
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ACCEPT_PASSWORD = 258,
+     ACTION = 259,
+     ADMIN = 260,
+     AFTYPE = 261,
+     T_ALLOW = 262,
+     ANTI_NICK_FLOOD = 263,
+     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
+     AUTOCONN = 265,
+     T_BLOCK = 266,
+     BURST_AWAY = 267,
+     BURST_TOPICWHO = 268,
+     BYTES = 269,
+     KBYTES = 270,
+     MBYTES = 271,
+     GBYTES = 272,
+     TBYTES = 273,
+     CALLER_ID_WAIT = 274,
+     CAN_FLOOD = 275,
+     CAN_IDLE = 276,
+     CHANNEL = 277,
+     CIDR_BITLEN_IPV4 = 278,
+     CIDR_BITLEN_IPV6 = 279,
+     CIPHER_PREFERENCE = 280,
+     CLASS = 281,
+     COMPRESSED = 282,
+     COMPRESSION_LEVEL = 283,
+     CONNECT = 284,
+     CONNECTFREQ = 285,
+     CRYPTLINK = 286,
+     DEFAULT_CIPHER_PREFERENCE = 287,
+     DEFAULT_FLOODCOUNT = 288,
+     DEFAULT_SPLIT_SERVER_COUNT = 289,
+     DEFAULT_SPLIT_USER_COUNT = 290,
+     DENY = 291,
+     DESCRIPTION = 292,
+     DIE = 293,
+     DISABLE_AUTH = 294,
+     DISABLE_FAKE_CHANNELS = 295,
+     DISABLE_HIDDEN = 296,
+     DISABLE_LOCAL_CHANNELS = 297,
+     DISABLE_REMOTE_COMMANDS = 298,
+     DOT_IN_IP6_ADDR = 299,
+     DOTS_IN_IDENT = 300,
+     DURATION = 301,
+     EGDPOOL_PATH = 302,
+     EMAIL = 303,
+     ENABLE = 304,
+     ENCRYPTED = 305,
+     EXCEED_LIMIT = 306,
+     EXEMPT = 307,
+     FAILED_OPER_NOTICE = 308,
+     FAKENAME = 309,
+     IRCD_FLAGS = 310,
+     FLATTEN_LINKS = 311,
+     FFAILED_OPERLOG = 312,
+     FKILLLOG = 313,
+     FKLINELOG = 314,
+     FGLINELOG = 315,
+     FIOERRLOG = 316,
+     FOPERLOG = 317,
+     FOPERSPYLOG = 318,
+     FUSERLOG = 319,
+     GECOS = 320,
+     GENERAL = 321,
+     GLINE = 322,
+     GLINES = 323,
+     GLINE_EXEMPT = 324,
+     GLINE_LOG = 325,
+     GLINE_TIME = 326,
+     GLINE_MIN_CIDR = 327,
+     GLINE_MIN_CIDR6 = 328,
+     GLOBAL_KILL = 329,
+     IRCD_AUTH = 330,
+     NEED_IDENT = 331,
+     HAVENT_READ_CONF = 332,
+     HELP_CHANNEL = 333,
+     HIDDEN = 334,
+     HIDDEN_ADMIN = 335,
+     HIDDEN_NAME = 336,
+     HIDDEN_OPER = 337,
+     HIDE_SERVER_IPS = 338,
+     HIDE_SERVERS = 339,
+     HIDE_SPOOF_IPS = 340,
+     HOST = 341,
+     HUB = 342,
+     HUB_MASK = 343,
+     IDLETIME = 344,
+     IGNORE_BOGUS_TS = 345,
+     INVISIBLE_ON_CONNECT = 346,
+     IP = 347,
+     KILL = 348,
+     KILL_CHASE_TIME_LIMIT = 349,
+     KLINE = 350,
+     KLINE_EXEMPT = 351,
+     KLINE_REASON = 352,
+     KLINE_WITH_REASON = 353,
+     KNOCK_DELAY = 354,
+     KNOCK_DELAY_CHANNEL = 355,
+     LAZYLINK = 356,
+     LEAF_MASK = 357,
+     LINKS_DELAY = 358,
+     LISTEN = 359,
+     T_LOG = 360,
+     LOGGING = 361,
+     LOG_LEVEL = 362,
+     MAX_ACCEPT = 363,
+     MAX_BANS = 364,
+     MAX_CHANS_PER_USER = 365,
+     MAX_GLOBAL = 366,
+     MAX_IDENT = 367,
+     MAX_LOCAL = 368,
+     MAX_NICK_CHANGES = 369,
+     MAX_NICK_TIME = 370,
+     MAX_NUMBER = 371,
+     MAX_TARGETS = 372,
+     MESSAGE_LOCALE = 373,
+     MIN_NONWILDCARD = 374,
+     MIN_NONWILDCARD_SIMPLE = 375,
+     MODULE = 376,
+     MODULES = 377,
+     NAME = 378,
+     NEED_PASSWORD = 379,
+     NETWORK_DESC = 380,
+     NETWORK_NAME = 381,
+     NICK = 382,
+     NICK_CHANGES = 383,
+     NO_CREATE_ON_SPLIT = 384,
+     NO_JOIN_ON_SPLIT = 385,
+     NO_OPER_FLOOD = 386,
+     NO_TILDE = 387,
+     NOT = 388,
+     NUMBER = 389,
+     NUMBER_PER_IDENT = 390,
+     NUMBER_PER_CIDR = 391,
+     NUMBER_PER_IP = 392,
+     NUMBER_PER_IP_GLOBAL = 393,
+     OPERATOR = 394,
+     OPERS_BYPASS_CALLERID = 395,
+     OPER_LOG = 396,
+     OPER_ONLY_UMODES = 397,
+     OPER_PASS_RESV = 398,
+     OPER_SPY_T = 399,
+     OPER_UMODES = 400,
+     JOIN_FLOOD_COUNT = 401,
+     JOIN_FLOOD_TIME = 402,
+     PACE_WAIT = 403,
+     PACE_WAIT_SIMPLE = 404,
+     PASSWORD = 405,
+     PATH = 406,
+     PING_COOKIE = 407,
+     PING_TIME = 408,
+     PING_WARNING = 409,
+     PORT = 410,
+     QSTRING = 411,
+     QUIET_ON_BAN = 412,
+     REASON = 413,
+     REDIRPORT = 414,
+     REDIRSERV = 415,
+     REGEX_T = 416,
+     REHASH = 417,
+     TREJECT_HOLD_TIME = 418,
+     REMOTE = 419,
+     REMOTEBAN = 420,
+     RESTRICT_CHANNELS = 421,
+     RESTRICTED = 422,
+     RSA_PRIVATE_KEY_FILE = 423,
+     RSA_PUBLIC_KEY_FILE = 424,
+     SSL_CERTIFICATE_FILE = 425,
+     RESV = 426,
+     RESV_EXEMPT = 427,
+     SECONDS = 428,
+     MINUTES = 429,
+     HOURS = 430,
+     DAYS = 431,
+     WEEKS = 432,
+     SENDQ = 433,
+     SEND_PASSWORD = 434,
+     SERVERHIDE = 435,
+     SERVERINFO = 436,
+     SERVLINK_PATH = 437,
+     SERVICES_NAME = 438,
+     IRCD_SID = 439,
+     TKLINE_EXPIRE_NOTICES = 440,
+     T_SHARED = 441,
+     T_CLUSTER = 442,
+     T_SNOOP = 443,
+     TYPE = 444,
+     SHORT_MOTD = 445,
+     SILENT = 446,
+     SPOOF = 447,
+     SPOOF_NOTICE = 448,
+     STATS_E_DISABLED = 449,
+     STATS_I_OPER_ONLY = 450,
+     STATS_K_OPER_ONLY = 451,
+     STATS_O_OPER_ONLY = 452,
+     STATS_P_OPER_ONLY = 453,
+     TBOOL = 454,
+     TMASKED = 455,
+     T_REJECT = 456,
+     TS_MAX_DELTA = 457,
+     TS_WARN_DELTA = 458,
+     TWODOTS = 459,
+     T_ALL = 460,
+     T_BOTS = 461,
+     T_SOFTCALLERID = 462,
+     T_CALLERID = 463,
+     T_CCONN = 464,
+     T_CCONN_FULL = 465,
+     T_CLIENT_FLOOD = 466,
+     T_DEAF = 467,
+     T_DEBUG = 468,
+     T_DRONE = 469,
+     T_EXTERNAL = 470,
+     T_FULL = 471,
+     T_INVISIBLE = 472,
+     T_IPV4 = 473,
+     T_IPV6 = 474,
+     T_LOCOPS = 475,
+     T_LOGPATH = 476,
+     T_L_CRIT = 477,
+     T_L_DEBUG = 478,
+     T_L_ERROR = 479,
+     T_L_INFO = 480,
+     T_L_NOTICE = 481,
+     T_L_TRACE = 482,
+     T_L_WARN = 483,
+     T_MAX_CLIENTS = 484,
+     T_NCHANGE = 485,
+     T_OPERWALL = 486,
+     T_REJ = 487,
+     T_SERVNOTICE = 488,
+     T_SKILL = 489,
+     T_SPY = 490,
+     T_SSL = 491,
+     T_UMODES = 492,
+     T_UNAUTH = 493,
+     T_UNRESV = 494,
+     T_UNXLINE = 495,
+     T_WALLOP = 496,
+     THROTTLE_TIME = 497,
+     TOPICBURST = 498,
+     TRUE_NO_OPER_FLOOD = 499,
+     TKLINE = 500,
+     TXLINE = 501,
+     TRESV = 502,
+     UNKLINE = 503,
+     USER = 504,
+     T_USERMODE = 505,
+     USE_EGD = 506,
+     USE_EXCEPT = 507,
+     USE_INVEX = 508,
+     USE_KNOCK = 509,
+     USE_LOGGING = 510,
+     USE_WHOIS_ACTUALLY = 511,
+     VHOST = 512,
+     VHOST6 = 513,
+     XLINE = 514,
+     WARN = 515,
+     WARN_NO_NLINE = 516,
+     WEBIRC = 517
+   };
 #endif
+/* Tokens.  */
+#define ACCEPT_PASSWORD 258
+#define ACTION 259
+#define ADMIN 260
+#define AFTYPE 261
+#define T_ALLOW 262
+#define ANTI_NICK_FLOOD 263
+#define ANTI_SPAM_EXIT_MESSAGE_TIME 264
+#define AUTOCONN 265
+#define T_BLOCK 266
+#define BURST_AWAY 267
+#define BURST_TOPICWHO 268
+#define BYTES 269
+#define KBYTES 270
+#define MBYTES 271
+#define GBYTES 272
+#define TBYTES 273
+#define CALLER_ID_WAIT 274
+#define CAN_FLOOD 275
+#define CAN_IDLE 276
+#define CHANNEL 277
+#define CIDR_BITLEN_IPV4 278
+#define CIDR_BITLEN_IPV6 279
+#define CIPHER_PREFERENCE 280
+#define CLASS 281
+#define COMPRESSED 282
+#define COMPRESSION_LEVEL 283
+#define CONNECT 284
+#define CONNECTFREQ 285
+#define CRYPTLINK 286
+#define DEFAULT_CIPHER_PREFERENCE 287
+#define DEFAULT_FLOODCOUNT 288
+#define DEFAULT_SPLIT_SERVER_COUNT 289
+#define DEFAULT_SPLIT_USER_COUNT 290
+#define DENY 291
+#define DESCRIPTION 292
+#define DIE 293
+#define DISABLE_AUTH 294
+#define DISABLE_FAKE_CHANNELS 295
+#define DISABLE_HIDDEN 296
+#define DISABLE_LOCAL_CHANNELS 297
+#define DISABLE_REMOTE_COMMANDS 298
+#define DOT_IN_IP6_ADDR 299
+#define DOTS_IN_IDENT 300
+#define DURATION 301
+#define EGDPOOL_PATH 302
+#define EMAIL 303
+#define ENABLE 304
+#define ENCRYPTED 305
+#define EXCEED_LIMIT 306
+#define EXEMPT 307
+#define FAILED_OPER_NOTICE 308
+#define FAKENAME 309
+#define IRCD_FLAGS 310
+#define FLATTEN_LINKS 311
+#define FFAILED_OPERLOG 312
+#define FKILLLOG 313
+#define FKLINELOG 314
+#define FGLINELOG 315
+#define FIOERRLOG 316
+#define FOPERLOG 317
+#define FOPERSPYLOG 318
+#define FUSERLOG 319
+#define GECOS 320
+#define GENERAL 321
+#define GLINE 322
+#define GLINES 323
+#define GLINE_EXEMPT 324
+#define GLINE_LOG 325
+#define GLINE_TIME 326
+#define GLINE_MIN_CIDR 327
+#define GLINE_MIN_CIDR6 328
+#define GLOBAL_KILL 329
+#define IRCD_AUTH 330
+#define NEED_IDENT 331
+#define HAVENT_READ_CONF 332
+#define HELP_CHANNEL 333
+#define HIDDEN 334
+#define HIDDEN_ADMIN 335
+#define HIDDEN_NAME 336
+#define HIDDEN_OPER 337
+#define HIDE_SERVER_IPS 338
+#define HIDE_SERVERS 339
+#define HIDE_SPOOF_IPS 340
+#define HOST 341
+#define HUB 342
+#define HUB_MASK 343
+#define IDLETIME 344
+#define IGNORE_BOGUS_TS 345
+#define INVISIBLE_ON_CONNECT 346
+#define IP 347
+#define KILL 348
+#define KILL_CHASE_TIME_LIMIT 349
+#define KLINE 350
+#define KLINE_EXEMPT 351
+#define KLINE_REASON 352
+#define KLINE_WITH_REASON 353
+#define KNOCK_DELAY 354
+#define KNOCK_DELAY_CHANNEL 355
+#define LAZYLINK 356
+#define LEAF_MASK 357
+#define LINKS_DELAY 358
+#define LISTEN 359
+#define T_LOG 360
+#define LOGGING 361
+#define LOG_LEVEL 362
+#define MAX_ACCEPT 363
+#define MAX_BANS 364
+#define MAX_CHANS_PER_USER 365
+#define MAX_GLOBAL 366
+#define MAX_IDENT 367
+#define MAX_LOCAL 368
+#define MAX_NICK_CHANGES 369
+#define MAX_NICK_TIME 370
+#define MAX_NUMBER 371
+#define MAX_TARGETS 372
+#define MESSAGE_LOCALE 373
+#define MIN_NONWILDCARD 374
+#define MIN_NONWILDCARD_SIMPLE 375
+#define MODULE 376
+#define MODULES 377
+#define NAME 378
+#define NEED_PASSWORD 379
+#define NETWORK_DESC 380
+#define NETWORK_NAME 381
+#define NICK 382
+#define NICK_CHANGES 383
+#define NO_CREATE_ON_SPLIT 384
+#define NO_JOIN_ON_SPLIT 385
+#define NO_OPER_FLOOD 386
+#define NO_TILDE 387
+#define NOT 388
+#define NUMBER 389
+#define NUMBER_PER_IDENT 390
+#define NUMBER_PER_CIDR 391
+#define NUMBER_PER_IP 392
+#define NUMBER_PER_IP_GLOBAL 393
+#define OPERATOR 394
+#define OPERS_BYPASS_CALLERID 395
+#define OPER_LOG 396
+#define OPER_ONLY_UMODES 397
+#define OPER_PASS_RESV 398
+#define OPER_SPY_T 399
+#define OPER_UMODES 400
+#define JOIN_FLOOD_COUNT 401
+#define JOIN_FLOOD_TIME 402
+#define PACE_WAIT 403
+#define PACE_WAIT_SIMPLE 404
+#define PASSWORD 405
+#define PATH 406
+#define PING_COOKIE 407
+#define PING_TIME 408
+#define PING_WARNING 409
+#define PORT 410
+#define QSTRING 411
+#define QUIET_ON_BAN 412
+#define REASON 413
+#define REDIRPORT 414
+#define REDIRSERV 415
+#define REGEX_T 416
+#define REHASH 417
+#define TREJECT_HOLD_TIME 418
+#define REMOTE 419
+#define REMOTEBAN 420
+#define RESTRICT_CHANNELS 421
+#define RESTRICTED 422
+#define RSA_PRIVATE_KEY_FILE 423
+#define RSA_PUBLIC_KEY_FILE 424
+#define SSL_CERTIFICATE_FILE 425
+#define RESV 426
+#define RESV_EXEMPT 427
+#define SECONDS 428
+#define MINUTES 429
+#define HOURS 430
+#define DAYS 431
+#define WEEKS 432
+#define SENDQ 433
+#define SEND_PASSWORD 434
+#define SERVERHIDE 435
+#define SERVERINFO 436
+#define SERVLINK_PATH 437
+#define SERVICES_NAME 438
+#define IRCD_SID 439
+#define TKLINE_EXPIRE_NOTICES 440
+#define T_SHARED 441
+#define T_CLUSTER 442
+#define T_SNOOP 443
+#define TYPE 444
+#define SHORT_MOTD 445
+#define SILENT 446
+#define SPOOF 447
+#define SPOOF_NOTICE 448
+#define STATS_E_DISABLED 449
+#define STATS_I_OPER_ONLY 450
+#define STATS_K_OPER_ONLY 451
+#define STATS_O_OPER_ONLY 452
+#define STATS_P_OPER_ONLY 453
+#define TBOOL 454
+#define TMASKED 455
+#define T_REJECT 456
+#define TS_MAX_DELTA 457
+#define TS_WARN_DELTA 458
+#define TWODOTS 459
+#define T_ALL 460
+#define T_BOTS 461
+#define T_SOFTCALLERID 462
+#define T_CALLERID 463
+#define T_CCONN 464
+#define T_CCONN_FULL 465
+#define T_CLIENT_FLOOD 466
+#define T_DEAF 467
+#define T_DEBUG 468
+#define T_DRONE 469
+#define T_EXTERNAL 470
+#define T_FULL 471
+#define T_INVISIBLE 472
+#define T_IPV4 473
+#define T_IPV6 474
+#define T_LOCOPS 475
+#define T_LOGPATH 476
+#define T_L_CRIT 477
+#define T_L_DEBUG 478
+#define T_L_ERROR 479
+#define T_L_INFO 480
+#define T_L_NOTICE 481
+#define T_L_TRACE 482
+#define T_L_WARN 483
+#define T_MAX_CLIENTS 484
+#define T_NCHANGE 485
+#define T_OPERWALL 486
+#define T_REJ 487
+#define T_SERVNOTICE 488
+#define T_SKILL 489
+#define T_SPY 490
+#define T_SSL 491
+#define T_UMODES 492
+#define T_UNAUTH 493
+#define T_UNRESV 494
+#define T_UNXLINE 495
+#define T_WALLOP 496
+#define THROTTLE_TIME 497
+#define TOPICBURST 498
+#define TRUE_NO_OPER_FLOOD 499
+#define TKLINE 500
+#define TXLINE 501
+#define TRESV 502
+#define UNKLINE 503
+#define USER 504
+#define T_USERMODE 505
+#define USE_EGD 506
+#define USE_EXCEPT 507
+#define USE_INVEX 508
+#define USE_KNOCK 509
+#define USE_LOGGING 510
+#define USE_WHOIS_ACTUALLY 511
+#define VHOST 512
+#define VHOST6 513
+#define XLINE 514
+#define WARN 515
+#define WARN_NO_NLINE 516
+#define WEBIRC 517
 
-#define ACCEPT_PASSWORD 257
-#define ACTION 258
-#define ADMIN 259
-#define AFTYPE 260
-#define T_ALLOW 261
-#define ANTI_NICK_FLOOD 262
-#define ANTI_SPAM_EXIT_MESSAGE_TIME 263
-#define AUTOCONN 264
-#define T_BLOCK 265
-#define BURST_AWAY 266
-#define BURST_TOPICWHO 267
-#define BYTES 268
-#define KBYTES 269
-#define MBYTES 270
-#define GBYTES 271
-#define TBYTES 272
-#define CALLER_ID_WAIT 273
-#define CAN_FLOOD 274
-#define CAN_IDLE 275
-#define CHANNEL 276
-#define CIDR_BITLEN_IPV4 277
-#define CIDR_BITLEN_IPV6 278
-#define CIPHER_PREFERENCE 279
-#define CLASS 280
-#define COMPRESSED 281
-#define COMPRESSION_LEVEL 282
-#define CONNECT 283
-#define CONNECTFREQ 284
-#define CRYPTLINK 285
-#define DEFAULT_CIPHER_PREFERENCE 286
-#define DEFAULT_FLOODCOUNT 287
-#define DEFAULT_SPLIT_SERVER_COUNT 288
-#define DEFAULT_SPLIT_USER_COUNT 289
-#define DENY 290
-#define DESCRIPTION 291
-#define DIE 292
-#define DISABLE_AUTH 293
-#define DISABLE_FAKE_CHANNELS 294
-#define DISABLE_HIDDEN 295
-#define DISABLE_LOCAL_CHANNELS 296
-#define DISABLE_REMOTE_COMMANDS 297
-#define DOT_IN_IP6_ADDR 298
-#define DOTS_IN_IDENT 299
-#define DURATION 300
-#define EGDPOOL_PATH 301
-#define EMAIL 302
-#define ENABLE 303
-#define ENCRYPTED 304
-#define EXCEED_LIMIT 305
-#define EXEMPT 306
-#define FAILED_OPER_NOTICE 307
-#define FAKENAME 308
-#define IRCD_FLAGS 309
-#define FLATTEN_LINKS 310
-#define FFAILED_OPERLOG 311
-#define FKILLLOG 312
-#define FKLINELOG 313
-#define FGLINELOG 314
-#define FIOERRLOG 315
-#define FOPERLOG 316
-#define FOPERSPYLOG 317
-#define FUSERLOG 318
-#define GECOS 319
-#define GENERAL 320
-#define GLINE 321
-#define GLINES 322
-#define GLINE_EXEMPT 323
-#define GLINE_LOG 324
-#define GLINE_TIME 325
-#define GLINE_MIN_CIDR 326
-#define GLINE_MIN_CIDR6 327
-#define GLOBAL_KILL 328
-#define IRCD_AUTH 329
-#define NEED_IDENT 330
-#define HAVENT_READ_CONF 331
-#define HELP_CHANNEL 332
-#define HIDDEN 333
-#define HIDDEN_ADMIN 334
-#define HIDDEN_NAME 335
-#define HIDDEN_OPER 336
-#define HIDE_SERVER_IPS 337
-#define HIDE_SERVERS 338
-#define HIDE_SPOOF_IPS 339
-#define HOST 340
-#define HUB 341
-#define HUB_MASK 342
-#define IDLETIME 343
-#define IGNORE_BOGUS_TS 344
-#define INVISIBLE_ON_CONNECT 345
-#define IP 346
-#define KILL 347
-#define KILL_CHASE_TIME_LIMIT 348
-#define KLINE 349
-#define KLINE_EXEMPT 350
-#define KLINE_REASON 351
-#define KLINE_WITH_REASON 352
-#define KNOCK_DELAY 353
-#define KNOCK_DELAY_CHANNEL 354
-#define LAZYLINK 355
-#define LEAF_MASK 356
-#define LINKS_DELAY 357
-#define LISTEN 358
-#define T_LOG 359
-#define LOGGING 360
-#define LOG_LEVEL 361
-#define MAX_ACCEPT 362
-#define MAX_BANS 363
-#define MAX_CHANS_PER_USER 364
-#define MAX_GLOBAL 365
-#define MAX_IDENT 366
-#define MAX_LOCAL 367
-#define MAX_NICK_CHANGES 368
-#define MAX_NICK_TIME 369
-#define MAX_NUMBER 370
-#define MAX_TARGETS 371
-#define MESSAGE_LOCALE 372
-#define MIN_NONWILDCARD 373
-#define MIN_NONWILDCARD_SIMPLE 374
-#define MODULE 375
-#define MODULES 376
-#define NAME 377
-#define NEED_PASSWORD 378
-#define NETWORK_DESC 379
-#define NETWORK_NAME 380
-#define NICK 381
-#define NICK_CHANGES 382
-#define NO_CREATE_ON_SPLIT 383
-#define NO_JOIN_ON_SPLIT 384
-#define NO_OPER_FLOOD 385
-#define NO_TILDE 386
-#define NOT 387
-#define NUMBER 388
-#define NUMBER_PER_IDENT 389
-#define NUMBER_PER_CIDR 390
-#define NUMBER_PER_IP 391
-#define NUMBER_PER_IP_GLOBAL 392
-#define OPERATOR 393
-#define OPERS_BYPASS_CALLERID 394
-#define OPER_LOG 395
-#define OPER_ONLY_UMODES 396
-#define OPER_PASS_RESV 397
-#define OPER_SPY_T 398
-#define OPER_UMODES 399
-#define JOIN_FLOOD_COUNT 400
-#define JOIN_FLOOD_TIME 401
-#define PACE_WAIT 402
-#define PACE_WAIT_SIMPLE 403
-#define PASSWORD 404
-#define PATH 405
-#define PING_COOKIE 406
-#define PING_TIME 407
-#define PING_WARNING 408
-#define PORT 409
-#define QSTRING 410
-#define QUIET_ON_BAN 411
-#define REASON 412
-#define REDIRPORT 413
-#define REDIRSERV 414
-#define REGEX_T 415
-#define REHASH 416
-#define TREJECT_HOLD_TIME 417
-#define REMOTE 418
-#define REMOTEBAN 419
-#define RESTRICT_CHANNELS 420
-#define RESTRICTED 421
-#define RSA_PRIVATE_KEY_FILE 422
-#define RSA_PUBLIC_KEY_FILE 423
-#define SSL_CERTIFICATE_FILE 424
-#define RESV 425
-#define RESV_EXEMPT 426
-#define SECONDS 427
-#define MINUTES 428
-#define HOURS 429
-#define DAYS 430
-#define WEEKS 431
-#define SENDQ 432
-#define SEND_PASSWORD 433
-#define SERVERHIDE 434
-#define SERVERINFO 435
-#define SERVLINK_PATH 436
-#define SERVICES_NAME 437
-#define IRCD_SID 438
-#define TKLINE_EXPIRE_NOTICES 439
-#define T_SHARED 440
-#define T_CLUSTER 441
-#define T_SNOOP 442
-#define TYPE 443
-#define SHORT_MOTD 444
-#define SILENT 445
-#define SPOOF 446
-#define SPOOF_NOTICE 447
-#define STATS_E_DISABLED 448
-#define STATS_I_OPER_ONLY 449
-#define STATS_K_OPER_ONLY 450
-#define STATS_O_OPER_ONLY 451
-#define STATS_P_OPER_ONLY 452
-#define TBOOL 453
-#define TMASKED 454
-#define T_REJECT 455
-#define TS_MAX_DELTA 456
-#define TS_WARN_DELTA 457
-#define TWODOTS 458
-#define T_ALL 459
-#define T_BOTS 460
-#define T_SOFTCALLERID 461
-#define T_CALLERID 462
-#define T_CCONN 463
-#define T_CCONN_FULL 464
-#define T_CLIENT_FLOOD 465
-#define T_DEAF 466
-#define T_DEBUG 467
-#define T_DRONE 468
-#define T_EXTERNAL 469
-#define T_FULL 470
-#define T_INVISIBLE 471
-#define T_IPV4 472
-#define T_IPV6 473
-#define T_LOCOPS 474
-#define T_LOGPATH 475
-#define T_L_CRIT 476
-#define T_L_DEBUG 477
-#define T_L_ERROR 478
-#define T_L_INFO 479
-#define T_L_NOTICE 480
-#define T_L_TRACE 481
-#define T_L_WARN 482
-#define T_MAX_CLIENTS 483
-#define T_NCHANGE 484
-#define T_OPERWALL 485
-#define T_REJ 486
-#define T_SERVNOTICE 487
-#define T_SKILL 488
-#define T_SPY 489
-#define T_SSL 490
-#define T_UMODES 491
-#define T_UNAUTH 492
-#define T_UNRESV 493
-#define T_UNXLINE 494
-#define T_WALLOP 495
-#define THROTTLE_TIME 496
-#define TOPICBURST 497
-#define TRUE_NO_OPER_FLOOD 498
-#define TKLINE 499
-#define TXLINE 500
-#define TRESV 501
-#define UNKLINE 502
-#define USER 503
-#define T_USERMODE 504
-#define USE_EGD 505
-#define USE_EXCEPT 506
-#define USE_INVEX 507
-#define USE_KNOCK 508
-#define USE_LOGGING 509
-#define USE_WHOIS_ACTUALLY 510
-#define VHOST 511
-#define VHOST6 512
-#define XLINE 513
-#define WARN 514
-#define WARN_NO_NLINE 515
-#define WEBIRC 516
-typedef union {
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 134 "ircd_parser.y"
+{
   int number;
   char *string;
-} YYSTYPE;
+}
+/* Line 1529 of yacc.c.  */
+#line 578 "y.tab.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
 extern YYSTYPE yylval;
+
Index: src/hash.c
===================================================================
--- src/hash.c	(.../1.0.1)	(revision 183)
+++ src/hash.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hash.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: hash.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -903,7 +904,7 @@
   char chan_name[CHANNELLEN + 2];
 
   if ((remote_request && chptr->chname[0] == '&') ||
-      (SecretChannel(chptr) && !IsMember(source_p, chptr) && !IsOperSnoop(source_p)))
+      (SecretChannel(chptr) && !IsMember(source_p, chptr) && !IsSnoop(source_p)))
     return;
   if ((unsigned int)dlink_list_length(&chptr->members) < list_task->users_min ||
       (unsigned int)dlink_list_length(&chptr->members) > list_task->users_max ||
@@ -920,7 +921,7 @@
 
   /* highlight secret channels to oper snoops */
   ircsprintf(chan_name, "%s%s",
-         (SecretChannel(chptr) && IsOperSnoop(source_p)) ? "*" : "", chptr->chname);
+         (SecretChannel(chptr) && IsSnoop(source_p)) ? "*" : "", chptr->chname);
 
   sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
              chan_name, dlink_list_length(&chptr->members),

Property changes on: src/hash.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/lex.yy.c
===================================================================
--- src/lex.yy.c	(.../1.0.1)	(revision 183)
+++ src/lex.yy.c	(.../1.0.2)	(revision 183)
@@ -1449,7 +1449,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_lexer.l 849 2007-02-19 19:41:59Z db $
+ *  $Id$
+ *  $Hybrid: ircd_lexer.l 849 2007-02-19 19:41:59Z db $
  */
 #define YY_NO_UNPUT 1
 #define YY_NEVER_INTERACTIVE 1

Property changes on: src/lex.yy.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_select.c
===================================================================
--- src/s_bsd_select.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_select.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_select.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_bsd_select.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_select.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/send.c
===================================================================
--- src/send.c	(.../1.0.1)	(revision 183)
+++ src/send.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: send.c 572 2006-04-30 16:57:48Z michael $
+ *  $Id$
+ *  $Hybrid: send.c 572 2006-04-30 16:57:48Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/send.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd.c
===================================================================
--- src/s_bsd.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd.c 683 2006-06-15 14:28:59Z michael $
+ *  $Id$
+ *  $Hybrid: s_bsd.c 683 2006-06-15 14:28:59Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/balloc.c
===================================================================
--- src/balloc.c	(.../1.0.1)	(revision 183)
+++ src/balloc.c	(.../1.0.2)	(revision 183)
@@ -27,7 +27,8 @@
 
 /*! \file balloc.c
  * \brief A block allocator
- * \version $Id: balloc.c 670 2006-06-12 12:20:55Z michael $
+ * \version $Id$
+ * \version $Hybrid: balloc.c 670 2006-06-12 12:20:55Z michael $
  * 
  * About the block allocator
  *

Property changes on: src/balloc.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/tools.c
===================================================================
--- src/tools.c	(.../1.0.1)	(revision 183)
+++ src/tools.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: tools.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: tools.c 33 2005-10-02 20:50:00Z knight $
  *
  * When you update these functions make sure you update the ones in tools.h
  * as well!!!

Property changes on: src/tools.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/numeric.c
===================================================================
--- src/numeric.c	(.../1.0.1)	(revision 183)
+++ src/numeric.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: numeric.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: numeric.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/numeric.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/motd.c
===================================================================
--- src/motd.c	(.../1.0.1)	(revision 183)
+++ src/motd.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: motd.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: motd.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/motd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/irc_string.c
===================================================================
--- src/irc_string.c	(.../1.0.1)	(revision 183)
+++ src/irc_string.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: irc_string.c 593 2006-05-12 05:47:32Z michael $
+ *  $Id$
+ *  $Hybrid: irc_string.c 593 2006-05-12 05:47:32Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/irc_string.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/modules.c
===================================================================
--- src/modules.c	(.../1.0.1)	(revision 183)
+++ src/modules.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: modules.c 512 2006-03-04 16:21:54Z michael $
+ *  $Id$
+ *  $Hybrid: modules.c 512 2006-03-04 16:21:54Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/modules.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/dynlink.c
===================================================================
--- src/dynlink.c	(.../1.0.1)	(revision 183)
+++ src/dynlink.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- * $Id: dynlink.c 258 2005-11-12 18:47:17Z michael $
+ * $Id$
+ * $Hybrid: dynlink.c 258 2005-11-12 18:47:17Z michael $
  *
  */
 #include "stdinc.h"

Property changes on: src/dynlink.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/memory.c
===================================================================
--- src/memory.c	(.../1.0.1)	(revision 183)
+++ src/memory.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: memory.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: memory.c 33 2005-10-02 20:50:00Z knight $
  */
 
 

Property changes on: src/memory.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/list.c
===================================================================
--- src/list.c	(.../1.0.1)	(revision 183)
+++ src/list.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: list.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: list.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/list.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_misc.c
===================================================================
--- src/s_misc.c	(.../1.0.1)	(revision 183)
+++ src/s_misc.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_misc.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_misc.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_misc.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_devpoll.c
===================================================================
--- src/s_bsd_devpoll.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_devpoll.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_devpoll.c 282 2005-11-24 10:31:22Z adx $
+ *  $Id$
+ *  $Hybrid: s_bsd_devpoll.c 282 2005-11-24 10:31:22Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_devpoll.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/event.c
===================================================================
--- src/event.c	(.../1.0.1)	(revision 183)
+++ src/event.c	(.../1.0.2)	(revision 183)
@@ -38,7 +38,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: event.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: event.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /*

Property changes on: src/event.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/ircd.c
===================================================================
--- src/ircd.c	(.../1.0.1)	(revision 183)
+++ src/ircd.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd.c 163 2005-10-20 21:09:02Z adx $
+ *  $Id$
+ *  $Hybrid: ircd.c 163 2005-10-20 21:09:02Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/ircd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/restart.c
===================================================================
--- src/restart.c	(.../1.0.1)	(revision 183)
+++ src/restart.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: restart.c 588 2006-05-08 13:22:59Z michael $
+ *  $Id$
+ *  $Hybrid: restart.c 588 2006-05-08 13:22:59Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/restart.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/version.c
===================================================================
--- src/version.c	(.../1.0.1)	(revision 183)
+++ src/version.c	(.../1.0.2)	(revision 183)
@@ -18,7 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: version.c 685 2006-06-16 12:22:31Z michael $
+ *  $Id$
+ *  $Hybrid: version.c 685 2006-06-16 12:22:31Z michael $
  */
 
 #include "patchlevel.h"
@@ -120,6 +121,7 @@
   "eri, Sean Rees, <eri@esper.net>",
   "Kage, Kelmar Firesun, <kage@esper.net>",
   "dNA, Daniel Pemberton, <dna@esper.net>",
+  "Hikaru, Timothy C. McGrath, <hikaru@esper.net>",
   "",
   "The EsperNet IRC Network: irc.esper.net:5555 (http://www.esper.net)",
   "", 0

Property changes on: src/version.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_epoll.c
===================================================================
--- src/s_bsd_epoll.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_epoll.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_epoll.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_bsd_epoll.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_epoll.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/fdlist.c
===================================================================
--- src/fdlist.c	(.../1.0.1)	(revision 183)
+++ src/fdlist.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: fdlist.c 436 2006-02-11 21:35:16Z michael $
+ *  $Id$
+ *  $Hybrid: fdlist.c 436 2006-02-11 21:35:16Z michael $
  */
 #include "stdinc.h"
 #include "fdlist.h"

Property changes on: src/fdlist.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/irc_res.c
===================================================================
--- src/irc_res.c	(.../1.0.1)	(revision 183)
+++ src/irc_res.c	(.../1.0.2)	(revision 183)
@@ -7,7 +7,8 @@
  * The authors takes no responsibility for any damage or loss
  * of property which results from the use of this software.
  *
- * $Id: irc_res.c 468 2006-02-17 02:42:23Z db $
+ * $Id$
+ * $Hybrid: irc_res.c 468 2006-02-17 02:42:23Z db $
  *
  * July 1999 - Rewrote a bunch of stuff here. Change hostent builder code,
  *     added callbacks and reference counting of returned hostents.

Property changes on: src/irc_res.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/irc_getnameinfo.c
===================================================================
--- src/irc_getnameinfo.c	(.../1.0.1)	(revision 183)
+++ src/irc_getnameinfo.c	(.../1.0.2)	(revision 183)
@@ -46,7 +46,8 @@
 #include "irc_getnameinfo.h"
 #include "irc_string.h"
 
-/*  $Id: irc_getnameinfo.c 33 2005-10-02 20:50:00Z knight $ */
+/*  $Id$ */
+/*  $Hybrid: irc_getnameinfo.c 33 2005-10-02 20:50:00Z knight $ */
 
 static const struct afd {
   int a_af;

Property changes on: src/irc_getnameinfo.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_user.c
===================================================================
--- src/s_user.c	(.../1.0.1)	(revision 183)
+++ src/s_user.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 849 2007-02-19 19:41:59Z db $
+ *  $Id$
+ *  $Hybrid: s_user.c 849 2007-02-19 19:41:59Z db $
  */
 
 #include "stdinc.h"
@@ -111,7 +112,7 @@
   0,                  /* P */
   0,                  /* Q */
   UMODE_REGONLY,      /* R */
-  0,                  /* S */
+  UMODE_CAPTURED,     /* S (for silenced) */
   0,                  /* T */
   0,                  /* U */
   0,                  /* V */
@@ -136,7 +137,7 @@
   0,                  /* m */
   UMODE_NCHANGE,      /* n */
   UMODE_OPER,         /* o */
-  0,                  /* p */
+  UMODE_SNOOP,        /* p */
   0,                  /* q */
   UMODE_REGNICK,      /* r */
   UMODE_SERVNOTICE,   /* s */
@@ -316,6 +317,9 @@
   source_p->localClient->last = CurrentTime;
   /* Straight up the maximum rate of flooding... */
   source_p->localClient->allow_read = MAX_FLOOD_BURST;
+  
+  if (ConfigFileEntry.disable_auth)
+     SetGotId(source_p);
 
   if (!execute_callback(client_check_cb, source_p, username))
     return;
@@ -1014,11 +1018,16 @@
         case '\t':
           break;
 
+        case 'S':
+          if (!IsServer(client_p))
+            break;
+
         case 'r':
         case 'a':
           if (!IsServer(client_p) && !restricted)
             break;
 
+
         default:
           if ((flag = user_modes[(unsigned char)*m]))
           {
@@ -1060,6 +1069,14 @@
     source_p->umodes &= ~UMODE_ADMIN;
   }
 
+  if (MyConnect(source_p) && (source_p->umodes & UMODE_SNOOP) &&
+      !IsOperSnoop(source_p))
+  {
+    //sendto_one(source_p, ":%s NOTICE %s :*** You have no snoop flag;",
+    //           me.name, source_p->name);
+    source_p->umodes &= ~UMODE_SNOOP;
+  }
+
   if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
     ++Count.invisi;
   if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
@@ -1177,7 +1194,7 @@
 
 /* user_welcome()
  *
- * inputs	- client pointer to client to welcome
+ * inputs	- client pointer to client to welc/me
  * output	- NONE
  * side effects	-
  */
@@ -1318,6 +1335,8 @@
     source_p->umodes |= UMODE_ADMIN;
   if (!IsOperN(source_p))
     source_p->umodes &= ~UMODE_NCHANGE;
+  if (IsOperSnoop(source_p))
+    source_p->umodes |= UMODE_SNOOP;
 
   sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
                        source_p->name, source_p->username, source_p->host);

Property changes on: src/s_user.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/getopt.c
===================================================================
--- src/getopt.c	(.../1.0.1)	(revision 183)
+++ src/getopt.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: getopt.c 786 2006-08-27 08:48:04Z michael $
+ *  $Id$
+ *  $Hybrid: getopt.c 786 2006-08-27 08:48:04Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/getopt.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/snprintf.c
===================================================================
--- src/snprintf.c	(.../1.0.1)	(revision 183)
+++ src/snprintf.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: snprintf.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: snprintf.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /**************************************************************

Property changes on: src/snprintf.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/packet.c
===================================================================
--- src/packet.c	(.../1.0.1)	(revision 183)
+++ src/packet.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: packet.c 428 2006-02-11 12:21:51Z michael $
+ *  $Id$
+ *  $Hybrid: packet.c 428 2006-02-11 12:21:51Z michael $
  */
 #include "stdinc.h"
 #include "tools.h"

Property changes on: src/packet.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_conf.c
===================================================================
--- src/s_conf.c	(.../1.0.1)	(revision 183)
+++ src/s_conf.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.c 855 2007-02-26 22:06:45Z db $
+ *  $Id$
+ *  $Hybrid: s_conf.c 855 2007-02-26 22:06:45Z db $
  */
 
 #include "stdinc.h"

Property changes on: src/s_conf.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_kqueue.c
===================================================================
--- src/s_bsd_kqueue.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_kqueue.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_kqueue.c 842 2007-02-09 21:27:48Z adx $
+ *  $Id$
+ *  $Hybrid: s_bsd_kqueue.c 842 2007-02-09 21:27:48Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_kqueue.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/inet_misc.c
===================================================================
--- src/inet_misc.c	(.../1.0.1)	(revision 183)
+++ src/inet_misc.c	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 /* inet_misc.c - inet_pton and inet_ntop for those who don't have it.
- * $Id: inet_misc.c 33 2005-10-02 20:50:00Z knight $
+ * $Id$
+ * $Hybrid: inet_misc.c 33 2005-10-02 20:50:00Z knight $
  *
  * Copyright (c) 1983, 1990, 1993
  *		The Regents of the University of California.  All rights reserved.

Property changes on: src/inet_misc.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/channel_mode.c
===================================================================
--- src/channel_mode.c	(.../1.0.1)	(revision 183)
+++ src/channel_mode.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: channel_mode.c 760 2006-08-18 19:33:26Z michael $
+ *  $Id$
+ *  $Hybrid: channel_mode.c 760 2006-08-18 19:33:26Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/channel_mode.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/client.c
===================================================================
--- src/client.c	(.../1.0.1)	(revision 183)
+++ src/client.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: client.c 853 2007-02-22 06:01:30Z db $
+ *  $Id$
+ *  $Hybrid: client.c 853 2007-02-22 06:01:30Z db $
  */
 
 #include "stdinc.h"

Property changes on: src/client.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/dbuf.c
===================================================================
--- src/dbuf.c	(.../1.0.1)	(revision 183)
+++ src/dbuf.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: dbuf.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: dbuf.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/dbuf.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_poll.c
===================================================================
--- src/s_bsd_poll.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_poll.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_poll.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_bsd_poll.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_bsd_poll.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/csvlib.c
===================================================================
--- src/csvlib.c	(.../1.0.1)	(revision 183)
+++ src/csvlib.c	(.../1.0.2)	(revision 183)
@@ -6,7 +6,8 @@
  *  Use it anywhere you like, if you like it buy us a beer.
  *  If it's broken, don't bother us with the lawyers.
  *
- *  $Id: csvlib.c 521 2006-03-11 21:37:16Z db $
+ *  $Id$
+ *  $Hybrid: csvlib.c 521 2006-03-11 21:37:16Z db $
  */
 
 #include "stdinc.h"

Property changes on: src/csvlib.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/ircd_parser.y
===================================================================
--- src/ircd_parser.y	(.../1.0.1)	(revision 183)
+++ src/ircd_parser.y	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_parser.y 853 2007-02-22 06:01:30Z db $
+ *  $Id$
+ *  $Hybrid: ircd_parser.y 853 2007-02-22 06:01:30Z db $
  */
 
 %{
@@ -1291,6 +1292,10 @@
 {
   if (ypass == 2)
     yy_aconf->modes |= UMODE_LOCOPS;
+} | T_SNOOP
+{
+  if (ypass == 2)
+    yy_aconf->modes |= UMODE_SNOOP;
 };
 
 oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
@@ -3724,6 +3729,9 @@
 } | T_LOCOPS
 {
   ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
+} | T_SNOOP
+{
+  ConfigFileEntry.oper_only_umodes |= UMODE_SNOOP;
 };
 
 general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'

Property changes on: src/ircd_parser.y
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_auth.c
===================================================================
--- src/s_auth.c	(.../1.0.1)	(revision 183)
+++ src/s_auth.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_auth.c 696 2006-06-21 07:52:16Z michael $
+ *  $Id$
+ *  $Hybrid: s_auth.c 696 2006-06-21 07:52:16Z michael $
  */
 
 /*

Property changes on: src/s_auth.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/listener.c
===================================================================
--- src/listener.c	(.../1.0.1)	(revision 183)
+++ src/listener.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: listener.c 563 2006-04-23 09:07:41Z michael $
+ *  $Id$
+ *  $Hybrid: listener.c 563 2006-04-23 09:07:41Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/listener.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/ircd_lexer.l
===================================================================
--- src/ircd_lexer.l	(.../1.0.1)	(revision 183)
+++ src/ircd_lexer.l	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_lexer.l 849 2007-02-19 19:41:59Z db $
+ *  $Id$
+ *  $Hybrid: ircd_lexer.l 849 2007-02-19 19:41:59Z db $
  */
 
 %option case-insensitive

Property changes on: src/ircd_lexer.l
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/hostmask.c
===================================================================
--- src/hostmask.c	(.../1.0.1)	(revision 183)
+++ src/hostmask.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hostmask.c 723 2006-07-16 19:41:33Z adx $
+ *  $Id$
+ *  $Hybrid: hostmask.c 723 2006-07-16 19:41:33Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/hostmask.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/messages.tab
===================================================================
--- src/messages.tab	(.../1.0.1)	(revision 183)
+++ src/messages.tab	(.../1.0.2)	(revision 183)
@@ -16,7 +16,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: messages.tab 808 2006-09-03 18:58:00Z michael $
+ *   $Id$
+ *   $Hybrid: messages.tab 808 2006-09-03 18:58:00Z michael $
  */
 
 static struct NumericInfo replies[] = {

Property changes on: src/messages.tab
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/match.c
===================================================================
--- src/match.c	(.../1.0.1)	(revision 183)
+++ src/match.c	(.../1.0.2)	(revision 183)
@@ -16,7 +16,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: match.c 637 2006-06-01 14:00:50Z adx $
+ * $Id$
+ * $Hybrid: match.c 637 2006-06-01 14:00:50Z adx $
  *
  */
 

Property changes on: src/match.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/hook.c
===================================================================
--- src/hook.c	(.../1.0.1)	(revision 183)
+++ src/hook.c	(.../1.0.2)	(revision 183)
@@ -20,7 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: hook.c 713 2006-07-12 12:37:35Z michael $
+ *  $Id$
+ *  $Hybrid: hook.c 713 2006-07-12 12:37:35Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/hook.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_serv.c
===================================================================
--- src/s_serv.c	(.../1.0.1)	(revision 183)
+++ src/s_serv.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.c 391 2006-02-03 09:57:22Z michael $
+ *  $Id$
+ *  $Hybrid: s_serv.c 391 2006-02-03 09:57:22Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/s_serv.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_log.c
===================================================================
--- src/s_log.c	(.../1.0.1)	(revision 183)
+++ src/s_log.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_log.c 582 2006-05-02 20:47:11Z michael $
+ *  $Id$
+ *  $Hybrid: s_log.c 582 2006-05-02 20:47:11Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/s_log.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/fileio.c
===================================================================
--- src/fileio.c	(.../1.0.1)	(revision 183)
+++ src/fileio.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: fileio.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: fileio.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/fileio.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/parse.c
===================================================================
--- src/parse.c	(.../1.0.1)	(revision 183)
+++ src/parse.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: parse.c 753 2006-07-26 15:58:16Z adx $
+ *  $Id$
+ *  $Hybrid: parse.c 753 2006-07-26 15:58:16Z adx $
  */
 
 #include "stdinc.h"

Property changes on: src/parse.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/irc_reslib.c
===================================================================
--- src/irc_reslib.c	(.../1.0.1)	(revision 183)
+++ src/irc_reslib.c	(.../1.0.2)	(revision 183)
@@ -92,7 +92,8 @@
 #define DNS_LABELTYPE_BITSTRING 0x41
 #define MAXLINE 128
 
-/* $Id: irc_reslib.c 708 2006-07-07 08:56:45Z michael $ */
+/* $Id$ */
+/* $Hybrid: irc_reslib.c 708 2006-07-07 08:56:45Z michael $ */
 
 struct irc_ssaddr irc_nsaddr_list[IRCD_MAXNS];
 int irc_nscount = 0;

Property changes on: src/irc_reslib.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/ircd_signal.c
===================================================================
--- src/ircd_signal.c	(.../1.0.1)	(revision 183)
+++ src/ircd_signal.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd_signal.c 598 2006-05-13 09:08:47Z michael $
+ *  $Id$
+ *  $Hybrid: ircd_signal.c 598 2006-05-13 09:08:47Z michael $
  */
 
 #include "stdinc.h"

Property changes on: src/ircd_signal.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/resv.c
===================================================================
--- src/resv.c	(.../1.0.1)	(revision 183)
+++ src/resv.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: resv.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: resv.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/resv.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_stats.c
===================================================================
--- src/s_stats.c	(.../1.0.1)	(revision 183)
+++ src/s_stats.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_stats.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_stats.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/s_stats.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/sprintf_irc.c
===================================================================
--- src/sprintf_irc.c	(.../1.0.1)	(revision 183)
+++ src/sprintf_irc.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: sprintf_irc.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: sprintf_irc.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/sprintf_irc.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/irc_getaddrinfo.c
===================================================================
--- src/irc_getaddrinfo.c	(.../1.0.1)	(revision 183)
+++ src/irc_getaddrinfo.c	(.../1.0.2)	(revision 183)
@@ -33,7 +33,8 @@
 #include "irc_getaddrinfo.h"
 #include "ircd_defs.h"
 
-/*  $Id: irc_getaddrinfo.c 33 2005-10-02 20:50:00Z knight $ */
+/*  $Id$ */
+/*  $Hybrid: irc_getaddrinfo.c 33 2005-10-02 20:50:00Z knight $ */
 
 static const char in_addrany[]  = { 0, 0, 0, 0 };
 static const char in_loopback[] = { 127, 0, 0, 1 };

Property changes on: src/irc_getaddrinfo.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/s_bsd_sigio.c
===================================================================
--- src/s_bsd_sigio.c	(.../1.0.1)	(revision 183)
+++ src/s_bsd_sigio.c	(.../1.0.2)	(revision 183)
@@ -21,7 +21,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_bsd_sigio.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: s_bsd_sigio.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef _GNU_SOURCE

Property changes on: src/s_bsd_sigio.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: src/rsa.c
===================================================================
--- src/rsa.c	(.../1.0.1)	(revision 183)
+++ src/rsa.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: rsa.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: rsa.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: src/rsa.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/users/index
===================================================================
--- help/users/index	(.../1.0.1)	(revision 183)
+++ help/users/index	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: index 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: index 33 2005-10-02 20:50:00Z knight $
 Help topics available to users:
 
 ACCEPT          ADMIN           AWAY            CHALLENGE

Property changes on: help/users/index
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/users/umode
===================================================================
--- help/users/umode	(.../1.0.1)	(revision 183)
+++ help/users/umode	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: umode 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: umode 33 2005-10-02 20:50:00Z knight $
 MODE <nick> <+|-><modes>
 
 Usermodes:

Property changes on: help/users/umode
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/Makefile.in
===================================================================
--- help/Makefile.in	(.../1.0.1)	(revision 183)
+++ help/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 # Makefile to install help files
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@

Property changes on: help/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/unxline
===================================================================
--- help/opers/unxline	(.../1.0.1)	(revision 183)
+++ help/opers/unxline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: unxline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: unxline 33 2005-10-02 20:50:00Z knight $
 UNXLINE <gecos>
 
 Removes an XLINE 

Property changes on: help/opers/unxline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/testmask
===================================================================
--- help/opers/testmask	(.../1.0.1)	(revision 183)
+++ help/opers/testmask	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: testmask 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: testmask 33 2005-10-02 20:50:00Z knight $
 TESTMASK <user@host>
 
 Will test the given user@host mask, reporting how many local and

Property changes on: help/opers/testmask
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/dline
===================================================================
--- help/opers/dline	(.../1.0.1)	(revision 183)
+++ help/opers/dline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: dline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: dline 33 2005-10-02 20:50:00Z knight $
 DLINE <time> <nick|ip> :[reason] [| oper reason]
 
 <time> if present, gives number of minutes for DLINE

Property changes on: help/opers/dline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/kline
===================================================================
--- help/opers/kline	(.../1.0.1)	(revision 183)
+++ help/opers/kline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: kline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: kline 33 2005-10-02 20:50:00Z knight $
 KLINE [time] <nick|user@host> :[reason] [| oper reason]
 
 [time] if present, gives number of minutes for KLINE

Property changes on: help/opers/kline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/xline
===================================================================
--- help/opers/xline	(.../1.0.1)	(revision 183)
+++ help/opers/xline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: xline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: xline 33 2005-10-02 20:50:00Z knight $
 XLINE [time] <gecos> :[reason]
 
 [time] if present, gives number of minutes for XLINE

Property changes on: help/opers/xline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/unresv
===================================================================
--- help/opers/unresv	(.../1.0.1)	(revision 183)
+++ help/opers/unresv	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: unresv 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: unresv 33 2005-10-02 20:50:00Z knight $
 UNRESV <channel|nick>
 
 -- Remove a RESV on a channel or nick

Property changes on: help/opers/unresv
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/cmode
===================================================================
--- help/opers/cmode	(.../1.0.1)	(revision 183)
+++ help/opers/cmode	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: cmode 341 2005-12-27 13:43:46Z michael $
+# $Id$
+# $Hybrid: cmode 341 2005-12-27 13:43:46Z michael $
 MODE <channel> <+|-><modes> [parameters]
 
 =-=-=-=-=-=-=-=-=-=-=

Property changes on: help/opers/cmode
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/set
===================================================================
--- help/opers/set	(.../1.0.1)	(revision 183)
+++ help/opers/set	(.../1.0.2)	(revision 183)
@@ -38,4 +38,5 @@
   SPLITUSERS  - Sets the minimum amount of users needed to
                 deactivate automatic splitmode.
 
-# $Id: set 416 2006-02-10 09:50:59Z michael $
+# $Id$
+# $Hybrid: set 416 2006-02-10 09:50:59Z michael $

Property changes on: help/opers/set
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/umode
===================================================================
--- help/opers/umode	(.../1.0.1)	(revision 183)
+++ help/opers/umode	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: umode 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: umode 33 2005-10-02 20:50:00Z knight $
 MODE <nick> <+|-><modes>
 
 Usermodes: (* designates that the umode is oper only)

Property changes on: help/opers/umode
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/omotd
===================================================================
--- help/opers/omotd	(.../1.0.1)	(revision 183)
+++ help/opers/omotd	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: omotd 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: omotd 33 2005-10-02 20:50:00Z knight $
 OMOTD [servername]
 
 OMOTD will display the operator message of the day for the

Property changes on: help/opers/omotd
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/rkline
===================================================================
--- help/opers/rkline	(.../1.0.1)	(revision 183)
+++ help/opers/rkline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: rkline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: rkline 33 2005-10-02 20:50:00Z knight $
 RKLINE [time] <mask> [ON <server>] :[reason]
 
 [time] if present, gives number of minutes for temporary RXLINE

Property changes on: help/opers/rkline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/info
===================================================================
--- help/opers/info	(.../1.0.1)	(revision 183)
+++ help/opers/info	(.../1.0.2)	(revision 183)
@@ -4,4 +4,5 @@
 to ircd, and the server configuration (as defined in setup.h,
 defaults.h, and ircd.conf).
 
-# $Id: info 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: info 33 2005-10-02 20:50:00Z knight $

Property changes on: help/opers/info
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/join
===================================================================
--- help/opers/join	(.../1.0.1)	(revision 183)
+++ help/opers/join	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: join 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: join 33 2005-10-02 20:50:00Z knight $
 JOIN <#channel1[,#channel2,#channel3...]> [key]
 
 The JOIN command allows you to enter a public chat area known as

Property changes on: help/opers/join
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/rxline
===================================================================
--- help/opers/rxline	(.../1.0.1)	(revision 183)
+++ help/opers/rxline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: rxline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: rxline 33 2005-10-02 20:50:00Z knight $
 RXLINE [time] <mask> [ON <server>] :[reason]
 
 [time] if present, gives number of minutes for temporary RXLINE

Property changes on: help/opers/rxline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/motd
===================================================================
--- help/opers/motd	(.../1.0.1)	(revision 183)
+++ help/opers/motd	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: motd 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: motd 33 2005-10-02 20:50:00Z knight $
 MOTD [servername]
 
 MOTD will display the message of the day for the

Property changes on: help/opers/motd
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/version
===================================================================
--- help/opers/version	(.../1.0.1)	(revision 183)
+++ help/opers/version	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: version 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: version 33 2005-10-02 20:50:00Z knight $
 VERSION [servername]
 
 VERSION will display the server version of the specified

Property changes on: help/opers/version
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/stats
===================================================================
--- help/opers/stats	(.../1.0.1)	(revision 183)
+++ help/opers/stats	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: stats 66 2005-10-03 23:44:13Z adx $
+# $Id$
+# $Hybrid: stats 66 2005-10-03 23:44:13Z adx $
 STATS <letter> [server|nick]
 
 Queries server [server] (or your own server if no

Property changes on: help/opers/stats
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/undline
===================================================================
--- help/opers/undline	(.../1.0.1)	(revision 183)
+++ help/opers/undline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: undline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: undline 33 2005-10-02 20:50:00Z knight $
 UNDLINE <ip>
 
 Will attempt to undline the given <ip>

Property changes on: help/opers/undline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/ungline
===================================================================
--- help/opers/ungline	(.../1.0.1)	(revision 183)
+++ help/opers/ungline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: ungline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: ungline 33 2005-10-02 20:50:00Z knight $
 UNGLINE <user@host>
 
 -- if glines are enabled --

Property changes on: help/opers/ungline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/squit
===================================================================
--- help/opers/squit	(.../1.0.1)	(revision 183)
+++ help/opers/squit	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: squit 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: squit 33 2005-10-02 20:50:00Z knight $
 SQUIT <server> :[reason]
 
 Splits <server> away from your side of the net with [reason].

Property changes on: help/opers/squit
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/unkline
===================================================================
--- help/opers/unkline	(.../1.0.1)	(revision 183)
+++ help/opers/unkline	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: unkline 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: unkline 33 2005-10-02 20:50:00Z knight $
 UNKLINE <user@host>
 
 Will attempt to unkline the given <user@host>

Property changes on: help/opers/unkline
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: help/opers/index
===================================================================
--- help/opers/index	(.../1.0.1)	(revision 183)
+++ help/opers/index	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: index 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: index 33 2005-10-02 20:50:00Z knight $
 Help topics available to opers only:
 
 CAPAB           CBURST          CLIENT          CLOSE

Property changes on: help/opers/index
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: RELNOTES
===================================================================
--- RELNOTES	(.../1.0.1)	(revision 183)
+++ RELNOTES	(.../1.0.2)	(revision 183)
@@ -1,3 +1,27 @@
+-- esphyb 1.0.2 RELNOTES
+o) Fixed bug where nick changes would be allowed in spite of channel bans
+o) Fixed KILLEN=160
+o) Fixed an issue with KLINE's not matching unidented users
+o) Fixed oper snoop to be a user mode (+p) so remote servers honor it
+o) Fixed captured users to be a user mode (+S) so remote servers can see the state in /WHOIS
+
+-- esphyb 1.0.1 RELNOTES
+o) Fixed MODES=6
+o) Added channel mode +C to disallow all colors, fixed channel mode +c to allow bold and underline
+o) Fixed snoop fixture for TOPIC
+o) Add RPL_WHOISCAPTURED
+o) Fixed m_webirc to match webirc {} blocks on IP or hostname
+
+-- esphyb 1.0.0 RELNOTES
+o) Added colorless channels (+c), oper-only channels (+O), and identified-user channels (+r/+R)
+o) Added help_channel and the hooks to allow /CAPTURE'd users to speak to operators and in that channel
+o) Aliased /HURT and /HEAL to /CAPTURE and /UNCAPTURE
+o) Added SVSMODE and SVSNICK
+o) Added WEBIRC support
+o) Added OJOIN and OPME
+o) Added configuration-driven services aliaces (/NickServ)
+o) Added oper snoop
+
 -- ircd-hybrid-7.2.3 RELNOTES
 o) Added ircd-italian.lang language file
 o) Added -full to etrace
@@ -130,4 +154,5 @@
 Other files recommended for reading: BUGS, README.FIRST, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: RELNOTES 858 2007-02-28 04:15:47Z lusky $
+$Id$
+$Hybrid: RELNOTES 858 2007-02-28 04:15:47Z lusky $

Property changes on: RELNOTES
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/control.c
===================================================================
--- servlink/control.c	(.../1.0.1)	(revision 183)
+++ servlink/control.c	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: control.c 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: control.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: servlink/control.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/Makefile.in
===================================================================
--- servlink/Makefile.in	(.../1.0.1)	(revision 183)
+++ servlink/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 #
 # Makefile.in for servlink/src
 #
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 #
 
 CC              = @CC@

Property changes on: servlink/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/servlink.h
===================================================================
--- servlink/servlink.h	(.../1.0.1)	(revision 183)
+++ servlink/servlink.h	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: servlink.h 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: servlink.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_servlink_servlink_h

Property changes on: servlink/servlink.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/TODO
===================================================================
--- servlink/TODO	(.../1.0.1)	(revision 183)
+++ servlink/TODO	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 Servlink todo list
-$Id: TODO 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: TODO 33 2005-10-02 20:50:00Z knight $
 ------------------
 
 Fix any bugs that come up

Property changes on: servlink/TODO
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/control.h
===================================================================
--- servlink/control.h	(.../1.0.1)	(revision 183)
+++ servlink/control.h	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: control.h 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: control.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_servlink_control_h

Property changes on: servlink/control.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/io.c
===================================================================
--- servlink/io.c	(.../1.0.1)	(revision 183)
+++ servlink/io.c	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: io.c 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: io.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: servlink/io.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/README
===================================================================
--- servlink/README	(.../1.0.1)	(revision 183)
+++ servlink/README	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 Servlink protocol documentation.
-$Id: README 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README 33 2005-10-02 20:50:00Z knight $
 --------------
 
 After negotiating an incoming/outgoing server connection, the ircd will

Property changes on: servlink/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/io.h
===================================================================
--- servlink/io.h	(.../1.0.1)	(revision 183)
+++ servlink/io.h	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: io.h 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: io.h 33 2005-10-02 20:50:00Z knight $
  */
 
 #ifndef INCLUDED_servlink_io_h

Property changes on: servlink/io.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: servlink/servlink.c
===================================================================
--- servlink/servlink.c	(.../1.0.1)	(revision 183)
+++ servlink/servlink.c	(.../1.0.2)	(revision 183)
@@ -15,7 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: servlink.c 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: servlink.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"

Property changes on: servlink/servlink.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/rsa_respond/configure
===================================================================
--- tools/rsa_respond/configure	(.../1.0.1)	(revision 183)
+++ tools/rsa_respond/configure	(.../1.0.2)	(revision 183)
@@ -6,7 +6,8 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# $Id: configure 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: configure 33 2005-10-02 20:50:00Z knight $
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -908,7 +909,8 @@
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-$Id: configure 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: configure 33 2005-10-02 20:50:00Z knight $
 _ACEOF
   exit 0
 fi

Property changes on: tools/rsa_respond/configure
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/rsa_respond/Makefile.in
===================================================================
--- tools/rsa_respond/Makefile.in	(.../1.0.1)	(revision 183)
+++ tools/rsa_respond/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: Makefile.in 33 2005-10-02 20:50:00Z knight $
 
 CC = @CC@
 LIBS = @LIBS@

Property changes on: tools/rsa_respond/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/rsa_respond/configure.ac
===================================================================
--- tools/rsa_respond/configure.ac	(.../1.0.1)	(revision 183)
+++ tools/rsa_respond/configure.ac	(.../1.0.2)	(revision 183)
@@ -1,10 +1,12 @@
-# $Id: configure.ac 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: configure.ac 33 2005-10-02 20:50:00Z knight $
 # This file is by Joshua Kwan, and the source is in the public domain.
 
 AC_INIT
 AC_CONFIG_FILES(Makefile)
 
-AC_COPYRIGHT([$Id: configure.ac 33 2005-10-02 20:50:00Z knight $])
+AC_COPYRIGHT([$Id$])
+AC_COPYRIGHT([$Hybrid: configure.ac 33 2005-10-02 20:50:00Z knight $])
 
 AC_PROG_CC
 

Property changes on: tools/rsa_respond/configure.ac
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/rsa_respond/respond.c
===================================================================
--- tools/rsa_respond/respond.c	(.../1.0.1)	(revision 183)
+++ tools/rsa_respond/respond.c	(.../1.0.2)	(revision 183)
@@ -17,7 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *  $Id: respond.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: respond.c 33 2005-10-02 20:50:00Z knight $
  */
 #include <stdio.h>
 #include <string.h>

Property changes on: tools/rsa_respond/respond.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/rsa_respond/README
===================================================================
--- tools/rsa_respond/README	(.../1.0.1)	(revision 183)
+++ tools/rsa_respond/README	(.../1.0.2)	(revision 183)
@@ -33,4 +33,5 @@
 respond compiles properly, and have been tested on FreeBSD 4.x, Linux glibc,
 Solaris 8, and Cygwin 1.2 or higher.
 
-# $Id: README 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: README 33 2005-10-02 20:50:00Z knight $

Property changes on: tools/rsa_respond/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/untabify
===================================================================
--- tools/untabify	(.../1.0.1)	(revision 183)
+++ tools/untabify	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
 #
 # untabify - convert tabs to spaces
 #
-# $Id: untabify 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: untabify 33 2005-10-02 20:50:00Z knight $
 use Text::Tabs;
 $tabstop = 8;
 while (<>) { print expand($_) }

Property changes on: tools/untabify
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(.../1.0.1)	(revision 183)
+++ tools/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 CC		= @CC@
 INSTALL		= @INSTALL@

Property changes on: tools/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/win32/rehash.c
===================================================================
--- tools/win32/rehash.c	(.../1.0.1)	(revision 183)
+++ tools/win32/rehash.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: rehash.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: rehash.c 33 2005-10-02 20:50:00Z knight $ */
 
 #include <windows.h>
 #include "setup.h"

Property changes on: tools/win32/rehash.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/win32/remotd.c
===================================================================
--- tools/win32/remotd.c	(.../1.0.1)	(revision 183)
+++ tools/win32/remotd.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: remotd.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: remotd.c 33 2005-10-02 20:50:00Z knight $ */
 
 #include <windows.h>
 #include "setup.h"

Property changes on: tools/win32/remotd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/win32/kill.c
===================================================================
--- tools/win32/kill.c	(.../1.0.1)	(revision 183)
+++ tools/win32/kill.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: kill.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: kill.c 33 2005-10-02 20:50:00Z knight $ */
 
 #include <windows.h>
 #include "setup.h"

Property changes on: tools/win32/kill.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/README.mkpasswd
===================================================================
--- tools/README.mkpasswd	(.../1.0.1)	(revision 183)
+++ tools/README.mkpasswd	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 mkpasswd.c documentation
-$Id: README.mkpasswd 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README.mkpasswd 33 2005-10-02 20:50:00Z knight $
 
 This is documentation for the mkpasswd.c included in ircd-hybrid-7.
 

Property changes on: tools/README.mkpasswd
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/encspeed.c
===================================================================
--- tools/encspeed.c	(.../1.0.1)	(revision 183)
+++ tools/encspeed.c	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
  * encspeed.c - originally written by einride
  *            - modified for ircd-hybrid-7 by davidt
  *
- * $Id: encspeed.c 33 2005-10-02 20:50:00Z knight $
+ * $Id$
+ * $Hybrid: encspeed.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "setup.h"

Property changes on: tools/encspeed.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/mkpasswd.c
===================================================================
--- tools/mkpasswd.c	(.../1.0.1)	(revision 183)
+++ tools/mkpasswd.c	(.../1.0.2)	(revision 183)
@@ -9,7 +9,8 @@
 ** /dev/random for salt generation added by 
 ** Aaron Sethman <androsyn@ratbox.org>
 **
-** $Id: mkpasswd.c 33 2005-10-02 20:50:00Z knight $
+** $Id$
+** $Hybrid: mkpasswd.c 33 2005-10-02 20:50:00Z knight $
 */
 #include <stdio.h>
 #include <string.h>

Property changes on: tools/mkpasswd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/mkkeypair
===================================================================
--- tools/mkkeypair	(.../1.0.1)	(revision 183)
+++ tools/mkkeypair	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 #!/bin/sh
-# $Id: mkkeypair 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: mkkeypair 33 2005-10-02 20:50:00Z knight $
 #
 # mkkeypair - short shell script to generate a OpenSSL RSA key suitable 
 # for use with cryptlinks.

Property changes on: tools/mkkeypair
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: tools/README
===================================================================
--- tools/README	(.../1.0.1)	(revision 183)
+++ tools/README	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: README 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README 33 2005-10-02 20:50:00Z knight $
 
 A directory of support programs for ircd.
 

Property changes on: tools/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: BUGS
===================================================================
--- BUGS	(.../1.0.1)	(revision 183)
+++ BUGS	(.../1.0.2)	(revision 183)
@@ -34,4 +34,5 @@
  For information how to get a gdb backtrace, see INSTALL (near the end of file).
 
 --------------------------------------------------------------------------------
-$Id: BUGS 555 2006-04-22 09:39:44Z michael $
+$Id$
+$Hybrid: BUGS 555 2006-04-22 09:39:44Z michael $

Property changes on: BUGS
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_motd_notice.c
===================================================================
--- contrib/spy_motd_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_motd_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_motd_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_motd_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 #include "stdinc.h"
 #ifndef STATIC_MODULES
@@ -49,7 +50,7 @@
     uninstall_hook(motd_cb, show_motd);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 static void *
 show_motd(va_list args)

Property changes on: contrib/spy_motd_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_services.c
===================================================================
--- contrib/m_services.c	(.../1.0.1)	(revision 183)
+++ contrib/m_services.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_services.c 512 2006-03-04 16:21:54Z michael $
+ *  $Id$
+ *  $Hybrid: m_services.c 512 2006-03-04 16:21:54Z michael $
  */
 /*
  *
@@ -230,7 +231,7 @@
   mod_del_cmd(&os_msgtab);
 }
 
-const char *_version = "$Revision: 512 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: contrib/m_services.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/Makefile.in
===================================================================
--- contrib/Makefile.in	(.../1.0.1)	(revision 183)
+++ contrib/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 #
 # Makefile.in for ircd/contrib
 #
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 #
 CC		= @CC@
 RM		= @RM@

Property changes on: contrib/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_change.c
===================================================================
--- contrib/m_change.c	(.../1.0.1)	(revision 183)
+++ contrib/m_change.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_change.c 564 2006-04-23 15:35:58Z michael $
+ *  $Id$
+ *  $Hybrid: m_change.c 564 2006-04-23 15:35:58Z michael $
  */
 
 /* List of ircd includes from ../include/ */
@@ -78,7 +79,7 @@
   mod_del_cmd(&chgident_msgtab);
 }
 
-const char *_version = "$Revision: 564 $";
+const char *_version = "$Revision$";
 #endif
 
 static void

Property changes on: contrib/m_change.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_spoof.c
===================================================================
--- contrib/m_spoof.c	(.../1.0.1)	(revision 183)
+++ contrib/m_spoof.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_spoof.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_spoof.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /* MODULE CONFIGURATION FOLLOWS -- please read!! */
@@ -128,7 +129,7 @@
   mod_del_cmd(&spoof_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 #ifdef SPOOF_FILE

Property changes on: contrib/m_spoof.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/README.cloaking
===================================================================
--- contrib/README.cloaking	(.../1.0.1)	(revision 183)
+++ contrib/README.cloaking	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
 ircd-hybrid IP/hostname cloaking README:
 -----------------------------------------------
-$Id: README.cloaking 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README.cloaking 33 2005-10-02 20:50:00Z knight $
 
 Copyright (c) 2005 by Alan 'knight-' LeVee of ChatJunkies IRC Network
 -----------------------------------------------

Property changes on: contrib/README.cloaking
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/setup-win32.h
===================================================================
--- contrib/setup-win32.h	(.../1.0.1)	(revision 183)
+++ contrib/setup-win32.h	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 /* include/setup.h suitable for Windows compilers */
-/* $Id: setup-win32.h 309 2005-12-09 11:25:44Z adx $ */
+/* $Id$ */
+/* $Hybrid: setup-win32.h 309 2005-12-09 11:25:44Z adx $ */
 
 
 /*** BEGIN OF STANDARD CONFIGURATION SETTINGS ***/

Property changes on: contrib/setup-win32.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_mkpasswd.c
===================================================================
--- contrib/m_mkpasswd.c	(.../1.0.1)	(revision 183)
+++ contrib/m_mkpasswd.c	(.../1.0.2)	(revision 183)
@@ -6,7 +6,8 @@
  *
  *  You can use this code in any way as long as these names remain.
  *
- *  $Id: m_mkpasswd.c 569 2006-04-27 13:56:29Z michael $
+ *  $Id$
+ *  $Hybrid: m_mkpasswd.c 569 2006-04-27 13:56:29Z michael $
  */
 
 #include "handlers.h"
@@ -43,7 +44,7 @@
   mod_del_cmd(&mkpasswd_msgtab);
 }
 
-const char *_version = "$Revision: 569 $";
+const char *_version = "$Revision$";
 #endif
 
 static void

Property changes on: contrib/m_mkpasswd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/win32build.bat
===================================================================
--- contrib/win32build.bat	(.../1.0.1)	(revision 183)
+++ contrib/win32build.bat	(.../1.0.2)	(revision 183)
@@ -121,4 +121,5 @@
 echo.
 pause
 :end2
-rem $Id: win32build.bat 310 2005-12-09 11:28:02Z adx $
+rem $Id$
+rem $Hybrid: win32build.bat 310 2005-12-09 11:28:02Z adx $

Property changes on: contrib/win32build.bat
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_force.c
===================================================================
--- contrib/m_force.c	(.../1.0.1)	(revision 183)
+++ contrib/m_force.c	(.../1.0.2)	(revision 183)
@@ -25,7 +25,8 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: m_force.c 690 2006-06-17 11:34:25Z michael $
+ * $Id$
+ * $Hybrid: m_force.c 690 2006-06-17 11:34:25Z michael $
  */
 
 #include "stdinc.h"
@@ -75,7 +76,7 @@
   mod_del_cmd(&forcepart_msgtab);
 }
 
-const char *_version = "$Revision: 690 $";
+const char *_version = "$Revision$";
 #endif
 
 /* m_forcejoin()

Property changes on: contrib/m_force.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_links_notice.c
===================================================================
--- contrib/spy_links_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_links_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_links_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_links_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -50,7 +51,7 @@
     uninstall_hook(links_cb, show_links);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 static void *
 show_links(va_list args)

Property changes on: contrib/spy_links_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_operspy.c
===================================================================
--- contrib/m_operspy.c	(.../1.0.1)	(revision 183)
+++ contrib/m_operspy.c	(.../1.0.2)	(revision 183)
@@ -16,7 +16,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_operspy.c 530 2006-03-18 16:47:06Z michael $
+ *   $Id$
+ *   $Hybrid: m_operspy.c 530 2006-03-18 16:47:06Z michael $
  */
 
 /***  PLEASE READ ME  ***/
@@ -140,7 +141,7 @@
 {
   mod_del_cmd(&operspy_msgtab);
 }
-const char *_version = "$Revision: 530 $";
+const char *_version = "$Revision$";
 #endif
 
 #ifdef OPERSPY_LOG

Property changes on: contrib/m_operspy.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/challenge.irc
===================================================================
--- contrib/challenge.irc	(.../1.0.1)	(revision 183)
+++ contrib/challenge.irc	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 /*
- * $Id: challenge.irc 33 2005-10-02 20:50:00Z knight $
+ * $Id$
+ * $Hybrid: challenge.irc 33 2005-10-02 20:50:00Z knight $
 
 	CHALLENGE.IRC
 

Property changes on: contrib/challenge.irc
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_classlist.c
===================================================================
--- contrib/m_classlist.c	(.../1.0.1)	(revision 183)
+++ contrib/m_classlist.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_classlist.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_classlist.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&classlist_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_classlist()

Property changes on: contrib/m_classlist.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_capture.c
===================================================================
--- contrib/m_capture.c	(.../1.0.1)	(revision 183)
+++ contrib/m_capture.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_capture.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_capture.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -72,7 +73,7 @@
   mod_del_cmd(&uncapture_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_capture

Property changes on: contrib/m_capture.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_admin_notice.c
===================================================================
--- contrib/spy_admin_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_admin_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_admin_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_admin_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -50,7 +51,7 @@
     uninstall_hook(admin_cb, show_admin);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 static void *
 show_admin(va_list args)

Property changes on: contrib/spy_admin_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_whois_notice.c
===================================================================
--- contrib/spy_whois_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_whois_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_whois_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_whois_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 #include "stdinc.h"
 #ifndef STATIC_MODULES
@@ -50,7 +51,7 @@
     uninstall_hook(whois_cb, show_notice);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 /* show_notice
  *

Property changes on: contrib/spy_whois_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_ltrace.c
===================================================================
--- contrib/m_ltrace.c	(.../1.0.1)	(revision 183)
+++ contrib/m_ltrace.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_ltrace.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_ltrace.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -52,7 +53,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 static struct Callback *ltrace_cb;
 
 static void *

Property changes on: contrib/m_ltrace.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_trace_notice.c
===================================================================
--- contrib/spy_trace_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_trace_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_trace_notice.c 448 2006-02-12 10:55:28Z michael $
+ *  $Id$
+ *  $Hybrid: spy_trace_notice.c 448 2006-02-12 10:55:28Z michael $
  */
 
 #include "stdinc.h"
@@ -73,7 +74,7 @@
     uninstall_hook(etrace_cb, show_etrace);
 }
 
-const char *_version = "$Revision: 448 $";
+const char *_version = "$Revision$";
 
 static void *
 show_trace(va_list args)

Property changes on: contrib/spy_trace_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_stats_notice.c
===================================================================
--- contrib/spy_stats_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_stats_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_stats_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_stats_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -50,7 +51,7 @@
     uninstall_hook(stats_cb, show_stats);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 /* show a stats request */
 static void *

Property changes on: contrib/spy_stats_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/example_module.c
===================================================================
--- contrib/example_module.c	(.../1.0.1)	(revision 183)
+++ contrib/example_module.c	(.../1.0.2)	(revision 183)
@@ -16,7 +16,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: example_module.c 33 2005-10-02 20:50:00Z knight $
+ *   $Id$
+ *   $Hybrid: example_module.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /* List of ircd includes from ../include/ 
@@ -130,7 +131,7 @@
 
 /* When we last modified the file (shown in /modlist), this is usually:
  */
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: contrib/example_module.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_killhost.c
===================================================================
--- contrib/m_killhost.c	(.../1.0.1)	(revision 183)
+++ contrib/m_killhost.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_killhost.c 620 2006-05-24 18:54:19Z michael $
+ *  $Id$
+ *  $Hybrid: m_killhost.c 620 2006-05-24 18:54:19Z michael $
  *
  */
 
@@ -64,7 +65,7 @@
   mod_del_cmd(&killhost_msgtab);
 }
 
-const char *_version = "$Revision: 620 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_killhost()

Property changes on: contrib/m_killhost.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/ircd.init.in
===================================================================
--- contrib/ircd.init.in	(.../1.0.1)	(revision 183)
+++ contrib/ircd.init.in	(.../1.0.2)	(revision 183)
@@ -3,7 +3,8 @@
 # ircd          This shell script takes care of starting and stopping
 #               ircd-hybrid.
 #
-# $Id: ircd.init.in 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: ircd.init.in 33 2005-10-02 20:50:00Z knight $
 #
 # chkconfig: 2345 92 11
 # description: ircd-hybrid is an Internet Relay Chat server

Property changes on: contrib/ircd.init.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/users/index
===================================================================
--- contrib/help/users/index	(.../1.0.1)	(revision 183)
+++ contrib/help/users/index	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: index 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: index 33 2005-10-02 20:50:00Z knight $
 Help topics available to users:
 
 ACCEPT          ADMIN           AWAY            CHALLENGE

Property changes on: contrib/help/users/index
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/Makefile.in
===================================================================
--- contrib/help/Makefile.in	(.../1.0.1)	(revision 183)
+++ contrib/help/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 # Makefile to install help files
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 INSTALL=	@INSTALL@
 INSTALL_DATA=	@INSTALL_DATA@

Property changes on: contrib/help/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/svsnick
===================================================================
--- contrib/help/opers/svsnick	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/svsnick	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: svsnick 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: svsnick 33 2005-10-02 20:50:00Z knight $
 SVSNICK <oldnick> <newnick>
 
 The SVSNICK command is designed to change a user's nickname to something else.

Property changes on: contrib/help/opers/svsnick
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/clearchan
===================================================================
--- contrib/help/opers/clearchan	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/clearchan	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: clearchan 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: clearchan 33 2005-10-02 20:50:00Z knight $
 CLEARCHAN <channel>
 
 The CLEARCHAN command will essentially take over a channel by purging all

Property changes on: contrib/help/opers/clearchan
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/chgident
===================================================================
--- contrib/help/opers/chgident	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/chgident	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: chgident 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: chgident 33 2005-10-02 20:50:00Z knight $
 CHGIDENT [nickname] <ident>
 
 The CHGIDENT command takes two arguments. The first argument is optional and

Property changes on: contrib/help/opers/chgident
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/forcepart
===================================================================
--- contrib/help/opers/forcepart	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/forcepart	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: forcepart 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: forcepart 33 2005-10-02 20:50:00Z knight $
 FORCEPART <nickname> <channel>
 
 The FORCEPART command requires two arguments to be given. The first

Property changes on: contrib/help/opers/forcepart
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/spoof
===================================================================
--- contrib/help/opers/spoof	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/spoof	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: spoof 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: spoof 33 2005-10-02 20:50:00Z knight $
 SPOOF <user@hostname> <free.form.spoof|-> [flags|- [password]]
 
 The SPOOF command allows you to create free form auth {} spoofs for

Property changes on: contrib/help/opers/spoof
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/mkpasswd
===================================================================
--- contrib/help/opers/mkpasswd	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/mkpasswd	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: mkpasswd 570 2006-04-27 21:52:26Z michael $
+# $Id$
+# $Hybrid: mkpasswd 570 2006-04-27 21:52:26Z michael $
 MKPASSWD <plaintext> [DES|MD5]
 
 The MKPASSWD command is essentially the same as the mkpasswd binary

Property changes on: contrib/help/opers/mkpasswd
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/flags
===================================================================
--- contrib/help/opers/flags	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/flags	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: flags 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: flags 33 2005-10-02 20:50:00Z knight $
 FLAGS [-|+ flag]
 
 The FLAGS command is designed to enable or disable user mode flags in plain english.

Property changes on: contrib/help/opers/flags
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/chghost
===================================================================
--- contrib/help/opers/chghost	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/chghost	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: chghost 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: chghost 33 2005-10-02 20:50:00Z knight $
 CHGHOST [nickname] <hostname>
 
 The CHGHOST command takes two arguments. The first argument is optional and

Property changes on: contrib/help/opers/chghost
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/opme
===================================================================
--- contrib/help/opers/opme	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/opme	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: opme 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: opme 33 2005-10-02 20:50:00Z knight $
 OPME <channel>
 
 OPME will give chanop status to the operator in the given channel.

Property changes on: contrib/help/opers/opme
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/classlist
===================================================================
--- contrib/help/opers/classlist	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/classlist	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: classlist 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: classlist 33 2005-10-02 20:50:00Z knight $
 CLASSLIST <class>
 
 The CLASSLIST command will show complete totals of a class you wish to see.

Property changes on: contrib/help/opers/classlist
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/ctrace
===================================================================
--- contrib/help/opers/ctrace	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/ctrace	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: ctrace 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: ctrace 33 2005-10-02 20:50:00Z knight $
 CTRACE <class>
 
 The CTRACE command will do a trace of users depending on class. Similar

Property changes on: contrib/help/opers/ctrace
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/chgname
===================================================================
--- contrib/help/opers/chgname	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/chgname	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: chgname 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: chgname 33 2005-10-02 20:50:00Z knight $
 CHGNAME [nickname] <realname>
 
 The CHGNAME command takes two arguments. The first argument is optional and

Property changes on: contrib/help/opers/chgname
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/capture
===================================================================
--- contrib/help/opers/capture	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/capture	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: capture 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: capture 33 2005-10-02 20:50:00Z knight $
 CAPTURE <nickname> 
 
 The CAPTURE command will essentially capture a client (e.g. the nickname you pass)

Property changes on: contrib/help/opers/capture
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/jupe
===================================================================
--- contrib/help/opers/jupe	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/jupe	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: jupe 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: jupe 33 2005-10-02 20:50:00Z knight $
 JUPE [servername] :[reason]
 
 The JUPE command takes two arguments. The first argument is the server

Property changes on: contrib/help/opers/jupe
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/uncapture
===================================================================
--- contrib/help/opers/uncapture	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/uncapture	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: uncapture 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: uncapture 33 2005-10-02 20:50:00Z knight $
 UNCAPTURE <nickname> 
 
 The UNCAPTURE command will release a client from capture (e.g. the nickname you pass)

Property changes on: contrib/help/opers/uncapture
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/index
===================================================================
--- contrib/help/opers/index	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/index	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: index 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: index 33 2005-10-02 20:50:00Z knight $
 Help topics available to opers:
 
 CAPAB           CAPTURE         CBURST          CHGHOST

Property changes on: contrib/help/opers/index
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/ltrace
===================================================================
--- contrib/help/opers/ltrace	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/ltrace	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: ltrace 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: ltrace 33 2005-10-02 20:50:00Z knight $
 LTRACE [nickname/server mask]
 
 This command is similar to TRACE, but it doesn't display plain users

Property changes on: contrib/help/opers/ltrace
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/delspoof
===================================================================
--- contrib/help/opers/delspoof	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/delspoof	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: delspoof 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: delspoof 33 2005-10-02 20:50:00Z knight $
 DELSPOOF <user@hostname> 
 
 The DELSPOOF command will remove a auth {} block for any user you request.

Property changes on: contrib/help/opers/delspoof
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/ojoin
===================================================================
--- contrib/help/opers/ojoin	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/ojoin	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: ojoin 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: ojoin 33 2005-10-02 20:50:00Z knight $
 OJOIN [flags]<channel>
 
 The OJOIN command requires only one argument with optional status flags.

Property changes on: contrib/help/opers/ojoin
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/help/opers/forcejoin
===================================================================
--- contrib/help/opers/forcejoin	(.../1.0.1)	(revision 183)
+++ contrib/help/opers/forcejoin	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: forcejoin 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: forcejoin 33 2005-10-02 20:50:00Z knight $
 FORCEJOIN <nickname> <channel>
 
 The FORCEJOIN command requires two arguments to be given. The first

Property changes on: contrib/help/opers/forcejoin
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_flags.c
===================================================================
--- contrib/m_flags.c	(.../1.0.1)	(revision 183)
+++ contrib/m_flags.c	(.../1.0.2)	(revision 183)
@@ -27,7 +27,8 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: m_flags.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_flags.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /* List of ircd includes from ../include/ */
@@ -74,7 +75,7 @@
   mod_del_cmd(&flags_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* FLAGS requires it's own mini parser, since the last parameter in it can

Property changes on: contrib/m_flags.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/ircd-hybrid.spec
===================================================================
--- contrib/ircd-hybrid.spec	(.../1.0.1)	(revision 183)
+++ contrib/ircd-hybrid.spec	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: ircd-hybrid.spec 304 2005-12-09 05:39:16Z lusky $
+# $Id$
+# $Hybrid: ircd-hybrid.spec 304 2005-12-09 05:39:16Z lusky $
 
 %{!?ircd_uid:%define ircd_uid 79}
 %{!?ircd_gid:%define ircd_gid 79}

Property changes on: contrib/ircd-hybrid.spec
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_stats_p_notice.c
===================================================================
--- contrib/spy_stats_p_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_stats_p_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_stats_p_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_stats_p_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -50,7 +51,7 @@
     uninstall_hook(stats_cb, show_stats_p);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 static void *
 show_stats_p(va_list args)

Property changes on: contrib/spy_stats_p_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/README
===================================================================
--- contrib/README	(.../1.0.1)	(revision 183)
+++ contrib/README	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: README 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README 33 2005-10-02 20:50:00Z knight $
 -----------------------------------------------
 
 ircd-hybrid contributive add-ons ::

Property changes on: contrib/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_opme.c
===================================================================
--- contrib/m_opme.c	(.../1.0.1)	(revision 183)
+++ contrib/m_opme.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_opme.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_opme.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -61,7 +62,7 @@
   mod_del_cmd(&opme_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 static int

Property changes on: contrib/m_opme.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_ctrace.c
===================================================================
--- contrib/m_ctrace.c	(.../1.0.1)	(revision 183)
+++ contrib/m_ctrace.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_ctrace.c 309 2005-12-09 11:25:44Z adx $
+ *  $Id$
+ *  $Hybrid: m_ctrace.c 309 2005-12-09 11:25:44Z adx $
  */
 
 #include "stdinc.h"
@@ -51,7 +52,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 309 $";
+const char *_version = "$Revision$";
 static struct Callback *ctrace_cb;
 
 static void *

Property changes on: contrib/m_ctrace.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/ip_cloaking.c
===================================================================
--- contrib/ip_cloaking.c	(.../1.0.1)	(revision 183)
+++ contrib/ip_cloaking.c	(.../1.0.2)	(revision 183)
@@ -31,7 +31,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  *
- * $Id: ip_cloaking.c 698 2006-06-22 09:34:55Z michael $
+ * $Id$
+ * $Hybrid: ip_cloaking.c 698 2006-06-22 09:34:55Z michael $
  */
 
 /*
@@ -73,7 +74,7 @@
 static dlink_node *prev_enter_umode;
 static dlink_node *prev_umode;
 
-const char *_version = "$Revision: 698 $";
+const char *_version = "$Revision$";
 
 static void *reset_ipv6err_flag(va_list);
 static void *h_set_user_mode(va_list);

Property changes on: contrib/ip_cloaking.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_jupe.c
===================================================================
--- contrib/m_jupe.c	(.../1.0.1)	(revision 183)
+++ contrib/m_jupe.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_jupe.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_jupe.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -66,7 +67,7 @@
   mod_del_cmd(&jupe_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: contrib/m_jupe.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/spy_info_notice.c
===================================================================
--- contrib/spy_info_notice.c	(.../1.0.1)	(revision 183)
+++ contrib/spy_info_notice.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: spy_info_notice.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: spy_info_notice.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -50,7 +51,7 @@
     uninstall_hook(info_cb, show_info);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 
 static void *
 show_info(va_list args)

Property changes on: contrib/spy_info_notice.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_ojoin.c
===================================================================
--- contrib/m_ojoin.c	(.../1.0.1)	(revision 183)
+++ contrib/m_ojoin.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_ojoin.c 537 2006-03-24 09:42:22Z michael $
+ *  $Id$
+ *  $Hybrid: m_ojoin.c 537 2006-03-24 09:42:22Z michael $
  */
 
 #include "stdinc.h"
@@ -59,7 +60,7 @@
   mod_del_cmd(&ojoin_msgtab);
 }
 
-const char *_version = "$Revision: 537 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_ojoin()

Property changes on: contrib/m_ojoin.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: contrib/m_clearchan.c
===================================================================
--- contrib/m_clearchan.c	(.../1.0.1)	(revision 183)
+++ contrib/m_clearchan.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_clearchan.c 616 2006-05-22 07:10:56Z michael $
+ *  $Id$
+ *  $Hybrid: m_clearchan.c 616 2006-05-22 07:10:56Z michael $
  */
 
 #include "stdinc.h"
@@ -66,7 +67,7 @@
   mod_del_cmd(&clearchan_msgtab);
 }
 
-const char *_version = "$Revision: 616 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: contrib/m_clearchan.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doxygen.conf
===================================================================
--- doxygen.conf	(.../1.0.1)	(revision 183)
+++ doxygen.conf	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: doxygen.conf 685 2006-06-16 12:22:31Z michael $
+# $Id$
+# $Hybrid: doxygen.conf 685 2006-06-16 12:22:31Z michael $
 
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.

Property changes on: doxygen.conf
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: README.PLATFORMS
===================================================================
--- README.PLATFORMS	(.../1.0.1)	(revision 183)
+++ README.PLATFORMS	(.../1.0.2)	(revision 183)
@@ -24,4 +24,5 @@
 x86          MS Visual C++    Windows       Piotr Nizynski <adx@irc7.pl>
 x86          Borland C++ 5.5  Windows       Piotr Nizynski <adx@irc7.pl>
 
-$Id: README.PLATFORMS 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README.PLATFORMS 33 2005-10-02 20:50:00Z knight $

Property changes on: README.PLATFORMS
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: configure.ac
===================================================================
--- configure.ac	(.../1.0.1)	(revision 183)
+++ configure.ac	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-dnl $Id: configure.ac 715 2006-07-14 21:01:55Z michael $
+dnl $Id$
+dnl $Hybrid: configure.ac 715 2006-07-14 21:01:55Z michael $
 dnl Process this file with autoconf to produce a configure script.
 
 dnl TODO: clean up all the OpenSSL and shared module checking stuff;
@@ -8,9 +9,10 @@
 AC_PREREQ(2.57)
 
 dnl Sneaky way to get an Id tag into the configure script
-AC_COPYRIGHT([$Id: configure.ac 715 2006-07-14 21:01:55Z michael $])
+AC_COPYRIGHT([$Id$])
+AC_COPYRIGHT([$Hybrid: configure.ac 715 2006-07-14 21:01:55Z michael $])
 
-AC_INIT([ircd-hybrid],[7.2.2])
+AC_INIT([esphyb],[1.0.x])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -906,7 +908,7 @@
 
 AC_ARG_WITH(nicklen,
 AC_HELP_STRING([--with-nicklen=LENGTH],[Set the nick length to LENGTH (default 9)]),
-	NICKLEN="$withval", NICKLEN="9")
+	NICKLEN="$withval", NICKLEN="30")
 
 AC_ARG_WITH(topiclen,           
 AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (default 390, max 390)]),

Property changes on: configure.ac
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/kline.txt
===================================================================
--- doc/kline.txt	(.../1.0.1)	(revision 183)
+++ doc/kline.txt	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
  * 
  * Copyright (C) 2005 Hybrid Development Team
  *
- * $Id: kline.txt 410 2006-02-08 14:31:37Z michael $
+ * $Id$
+ * $Hybrid: kline.txt 410 2006-02-08 14:31:37Z michael $
  */
 
 

Property changes on: doc/kline.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in	(.../1.0.1)	(revision 183)
+++ doc/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
 RM		= @RM@

Property changes on: doc/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/server-version-info
===================================================================
--- doc/server-version-info	(.../1.0.1)	(revision 183)
+++ doc/server-version-info	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
                               Server VERSION Info
 
-   $Id: server-version-info 33 2005-10-02 20:50:00Z knight $
+   $Id$
+   $Hybrid: server-version-info 33 2005-10-02 20:50:00Z knight $
 
    Copyright (c) 2005 by ircd-hybrid team
 

Property changes on: doc/server-version-info
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/index.txt
===================================================================
--- doc/index.txt	(.../1.0.1)	(revision 183)
+++ doc/index.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: index.txt 807 2006-09-01 09:00:25Z michael $
+$Id$
+$Hybrid: index.txt 807 2006-09-01 09:00:25Z michael $
 -----------------------------------------------
 
 Documentation for ircd-hybrid

Property changes on: doc/index.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/messages.txt
===================================================================
--- doc/messages.txt	(.../1.0.1)	(revision 183)
+++ doc/messages.txt	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
                          Message Customization Overview
 
-   $Id: messages.txt 33 2005-10-02 20:50:00Z knight $
+   $Id$
+   $Hybrid: messages.txt 33 2005-10-02 20:50:00Z knight $
 
    Copyright (c) 2005 by ircd-hybrid team
 

Property changes on: doc/messages.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/modes.txt
===================================================================
--- doc/modes.txt	(.../1.0.1)	(revision 183)
+++ doc/modes.txt	(.../1.0.2)	(revision 183)
@@ -8,7 +8,7 @@
 These describe the user modes, channel modes, and channel modes that require
 arguments that are available to the user. It is hardcoded into src/messages.tab.
 
-This has been updated for esphyb-1.0.0.
+This has been updated for esphyb-1.0.2.
 
 Here is a guide to the preceding modes:
 
@@ -30,9 +30,11 @@
 +l - locops       - See LOCOPS messages
 +n - nchange      - See client nick changes
 +o - oper         - Operator status
++p - snoop        - See invisible users in /WHO and secret channels in /WHOIS
 +r - regnick      - Identified to services (only services may set this)
 +R - regonly      - Only users identified to services may message you
 +s - servnotice   - See general server notices
++S - silenced     - Cannot speak except to operators and in the help channel
 +u - unauth       - See unauthorized client notices
 +w - wallop       - See server generated WALLOPS
 +x - external     - See remote server connection and split notices
@@ -43,7 +45,7 @@
 
 +b - ban          - Channel ban on nick!user@host
 +c - colorless    - No colors on channel
-+C - ascii only   - No colors or control characters. Only ASCII characters permitted
++C - ascii only   - No colors or control characters (bold/underline/reverse)
 +e - exempt       - Exemption from bans
 +I - invex        - Invite exceptions, nick!user@host does not need to be
                     explicitly INVITE'd into the channel before being able
@@ -53,7 +55,7 @@
 +l - limit        - Limit the number of users in a channel
 +m - moderated    - Users without +v/h/o cannot send text to the channel
 +M - regmod       - Only identified users may speak
-+n - noexternal   - Users must be in the channel to send text to it
++n - no external  - Users must be in the channel to send text to it
 +o - chanop       - Full operator status
 +O - operonly     - Only Operators may join/speak
 +p - private      - Private is obsolete, this now restricts KNOCK, and can be
@@ -71,4 +73,5 @@
 Note that most of the channel modes can be disabled in the conf file for
 networks that do not wish to support them.
 
-# $Id: modes.txt 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid modes.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/modes.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/ircd.8
===================================================================
--- doc/ircd.8	(.../1.0.1)	(revision 183)
+++ doc/ircd.8	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 .\" @(#)ircd.8 7b10 25 Oct 2001
-.\" $Id: ircd.8 33 2005-10-02 20:50:00Z knight $
+.\" $Id$
+.\" $Hybrid: ircd.8 33 2005-10-02 20:50:00Z knight $
 .TH IRCD 8 "14 May 2003" "ircd-hybrid-7"
 .SH NAME
 ircd \- The IRCD-Hybrid Internet Relay Chat server

Property changes on: doc/ircd.8
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/README.openssl
===================================================================
--- doc/technical/README.openssl	(.../1.0.1)	(revision 183)
+++ doc/technical/README.openssl	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
 Getting OpenSSL to work with hybrid-7
 =====================================
-$Id: README.openssl 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: README.openssl 33 2005-10-02 20:50:00Z knight $
 
 PREFACE
 =======

Property changes on: doc/technical/README.openssl
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/fd-management.txt
===================================================================
--- doc/technical/fd-management.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/fd-management.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 Overview of the filedescriptor subsystem
 Adrian Chadd <adrian@creative.net.au>
 
-$Id: fd-management.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: fd-management.txt 33 2005-10-02 20:50:00Z knight $
 
 
 Filedescriptor lists

Property changes on: doc/technical/fd-management.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/index.txt
===================================================================
--- doc/technical/index.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/index.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: index.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: index.txt 33 2005-10-02 20:50:00Z knight $
 -----------------------------------------------
 
 Technical Documentation for ircd-hybrid-7

Property changes on: doc/technical/index.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/ts3.txt
===================================================================
--- doc/technical/ts3.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/ts3.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: ts3.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: ts3.txt 33 2005-10-02 20:50:00Z knight $
                        Protocol changes for +TSora
                        ---------------------------
 

Property changes on: doc/technical/ts3.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/ts5.txt
===================================================================
--- doc/technical/ts5.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/ts5.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
   Overview of the TS5 system
   Lee H <lee@leeh.co.uk>
 
-$Id: ts5.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: ts5.txt 33 2005-10-02 20:50:00Z knight $
 
 For the purposes of this document, ircd versions:
   hybrid6.0

Property changes on: doc/technical/ts5.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/ts6.txt
===================================================================
--- doc/technical/ts6.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/ts6.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: ts6.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: ts6.txt 33 2005-10-02 20:50:00Z knight $
 
 TS6 Proposal (v7)
 Written by Lee H <lee@leeh.co.uk>

Property changes on: doc/technical/ts6.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/cryptlink.txt
===================================================================
--- doc/technical/cryptlink.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/cryptlink.txt	(.../1.0.2)	(revision 183)
@@ -336,4 +336,5 @@
          administrators/IRCops on the server of the key mismatch.
     14.  Server #1 closes the socket.
 
-$Id: cryptlink.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: cryptlink.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/technical/cryptlink.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/Persistent_Clients.txt
===================================================================
--- doc/technical/Persistent_Clients.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/Persistent_Clients.txt	(.../1.0.2)	(revision 183)
@@ -102,4 +102,5 @@
 TBD. What to do if a dronebot net is programmed to /suspend as many
 as possible, in order to eat up memory in a DDoS attempt.
 
-$Id: Persistent_Clients.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: Persistent_Clients.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/technical/Persistent_Clients.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/event.txt
===================================================================
--- doc/technical/event.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/event.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 Overview of the event subsystem
 Adrian Chadd <adrian@creative.net.au>
 
-$Id: event.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: event.txt 33 2005-10-02 20:50:00Z knight $
 
 One of the things that immediately struck me whilst first looking at the
 code was that the ircd periodically scheduled things in io_loop() but

Property changes on: doc/technical/event.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/whats-new-code.txt
===================================================================
--- doc/technical/whats-new-code.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/whats-new-code.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 
 Whats changed in the codebase
 
-# $Id: whats-new-code.txt 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: whats-new-code.txt 33 2005-10-02 20:50:00Z knight $
 
 First, please note one thing - a *LOT* has changed in hybrid-7.
 

Property changes on: doc/technical/whats-new-code.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/rfc2812.txt
===================================================================
--- doc/technical/rfc2812.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/rfc2812.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: rfc2812.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: rfc2812.txt 33 2005-10-02 20:50:00Z knight $
 
 Network Working Group                                            C. Kalt
 Request for Comments: 2812                                    April 2000

Property changes on: doc/technical/rfc2812.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/rfc2813.txt
===================================================================
--- doc/technical/rfc2813.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/rfc2813.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: rfc2813.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: rfc2813.txt 33 2005-10-02 20:50:00Z knight $
 
 Network Working Group                                           C. Kalt
 Request for Comments: 2813                                   April 2000

Property changes on: doc/technical/rfc2813.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/hostmask.txt
===================================================================
--- doc/technical/hostmask.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/hostmask.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 The Hostmask and Netmask System
 Copyright(c) 2001 by Andrew Miller(A1kmm)<a1kmm@mware.virtualave.net>
 
-$Id: hostmask.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: hostmask.txt 33 2005-10-02 20:50:00Z knight $
 ------------------------------------------------------------------------
 
 Contents ::

Property changes on: doc/technical/hostmask.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/network.txt
===================================================================
--- doc/technical/network.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/network.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 Overview of the network subsystem
 Adrian Chadd <adrian@creative.net.au>
 
-$Id: network.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: network.txt 33 2005-10-02 20:50:00Z knight $
 
 This document is an overview of the new and hopefully improved network
 subsystem.

Property changes on: doc/technical/network.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/send.txt
===================================================================
--- doc/technical/send.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/send.txt	(.../1.0.2)	(revision 183)
@@ -259,4 +259,5 @@
 
 -- Diane Bruce 
 
-$Id: send.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: send.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/technical/send.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/file-management.txt
===================================================================
--- doc/technical/file-management.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/file-management.txt	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 Overview of the file management subsystem
 Adrian Chadd <adrian@creative.net.au>
 
-$Id: file-management.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: file-management.txt 33 2005-10-02 20:50:00Z knight $
 
 File operations
 ---------------

Property changes on: doc/technical/file-management.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/technical/rfc1459.txt
===================================================================
--- doc/technical/rfc1459.txt	(.../1.0.1)	(revision 183)
+++ doc/technical/rfc1459.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: rfc1459.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: rfc1459.txt 33 2005-10-02 20:50:00Z knight $
 
 Network Working Group                                      J. Oikarinen
 Request for Comments: 1459                                      D. Reed

Property changes on: doc/technical/rfc1459.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/whats-new.txt
===================================================================
--- doc/whats-new.txt	(.../1.0.1)	(revision 183)
+++ doc/whats-new.txt	(.../1.0.2)	(revision 183)
@@ -79,4 +79,5 @@
 - Testmask feature allows you to count number of local and remote clients for
   a given hostmask.
 
-$Id: whats-new.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: whats-new.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/whats-new.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/resv.txt
===================================================================
--- doc/resv.txt	(.../1.0.1)	(revision 183)
+++ doc/resv.txt	(.../1.0.2)	(revision 183)
@@ -4,7 +4,8 @@
  *
  * Copyright (C) 2001 Hybrid Development Team
  *
- * $Id: resv.txt 33 2005-10-02 20:50:00Z knight $
+ * $Id$
+ * $Hybrid: resv.txt 33 2005-10-02 20:50:00Z knight $
  */
 
 				RESV

Property changes on: doc/resv.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/LazyLinks.txt
===================================================================
--- doc/LazyLinks.txt	(.../1.0.1)	(revision 183)
+++ doc/LazyLinks.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: LazyLinks.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: LazyLinks.txt 33 2005-10-02 20:50:00Z knight $
 		          Lazy Links
 			  ==========
 	(Ideas by Dianora and orabidoo; initial spec by orabidoo)

Property changes on: doc/LazyLinks.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/CIDR.txt
===================================================================
--- doc/CIDR.txt	(.../1.0.1)	(revision 183)
+++ doc/CIDR.txt	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: CIDR.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: CIDR.txt 33 2005-10-02 20:50:00Z knight $
 
 CIDR Information
 ----------------

Property changes on: doc/CIDR.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/challenge.txt
===================================================================
--- doc/challenge.txt	(.../1.0.1)	(revision 183)
+++ doc/challenge.txt	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
                        Oper Challenge and Response System
 
-   $Id: challenge.txt 33 2005-10-02 20:50:00Z knight $
+   $Id$
+   $Hybrid: challenge.txt 33 2005-10-02 20:50:00Z knight $
 
    Copyright (c) 2001-2005 by ircd-hybrid team
 

Property changes on: doc/challenge.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/guidelines.txt
===================================================================
--- doc/guidelines.txt	(.../1.0.1)	(revision 183)
+++ doc/guidelines.txt	(.../1.0.2)	(revision 183)
@@ -33,4 +33,5 @@
 
 8.  Don't forget to include a CVS Id.
 
-# $Id: guidelines.txt 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: guidelines.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/guidelines.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/modeg.txt
===================================================================
--- doc/modeg.txt	(.../1.0.1)	(revision 183)
+++ doc/modeg.txt	(.../1.0.2)	(revision 183)
@@ -141,4 +141,5 @@
 
 --
 W. Campbell
-$Id: modeg.txt 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: modeg.txt 33 2005-10-02 20:50:00Z knight $

Property changes on: doc/modeg.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: doc/serverhide.txt
===================================================================
--- doc/serverhide.txt	(.../1.0.1)	(revision 183)
+++ doc/serverhide.txt	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
                              Server Hide Reference
 
-   $Id: serverhide.txt 33 2005-10-02 20:50:00Z knight $
+   $Id$
+   $Hybrid: serverhide.txt 33 2005-10-02 20:50:00Z knight $
 
    Copyright (c) 2001 by ircd-hybrid team
 

Property changes on: doc/serverhide.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: TODO
===================================================================
--- TODO	(.../1.0.1)	(revision 183)
+++ TODO	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: TODO 555 2006-04-22 09:39:44Z michael $
+$Id$
+$Hybrid: TODO 555 2006-04-22 09:39:44Z michael $
 
 - dynamically extensible parser for modules
 

Property changes on: TODO
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: Hybrid-team
===================================================================
--- Hybrid-team	(.../1.0.1)	(revision 183)
+++ Hybrid-team	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-$Id: Hybrid-team 33 2005-10-02 20:50:00Z knight $
+$Id$
+$Hybrid: Hybrid-team 33 2005-10-02 20:50:00Z knight $
 
 The hybrid team is a group of ircd coders who were frustrated
 with the instability and all-out "dirtiness" of the EFnet ircd's

Property changes on: Hybrid-team
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: INSTALL
===================================================================
--- INSTALL	(.../1.0.1)	(revision 183)
+++ INSTALL	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
                             Hybrid INSTALL Document
 
-   $Id: INSTALL 685 2006-06-16 12:22:31Z michael $
+   $Id$
+   $Hybrid: INSTALL 685 2006-06-16 12:22:31Z michael $
 
    Copyright (c) 1997-2006 IRCD-Hybrid Development Team
 

Property changes on: INSTALL
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/Makefile.in
===================================================================
--- lib/Makefile.in	(.../1.0.1)	(revision 183)
+++ lib/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-#   $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+#   $Id$
+#   $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 RM = @RM@
 

Property changes on: lib/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre.h
===================================================================
--- lib/pcre/pcre.h	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre.h	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre.h 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre.h 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *       Perl-Compatible Regular Expressions      *

Property changes on: lib/pcre/pcre.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/LICENCE
===================================================================
--- lib/pcre/LICENCE	(.../1.0.1)	(revision 183)
+++ lib/pcre/LICENCE	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: LICENCE 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: LICENCE 33 2005-10-02 20:50:00Z knight $ */
 
 PCRE LICENCE
 ------------

Property changes on: lib/pcre/LICENCE
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/Makefile.in
===================================================================
--- lib/pcre/Makefile.in	(.../1.0.1)	(revision 183)
+++ lib/pcre/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 CC		= @CC@
 AR		= @AR@

Property changes on: lib/pcre/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_chartables.c
===================================================================
--- lib/pcre/pcre_chartables.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_chartables.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_chartables.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_chartables.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_chartables.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_compile.c
===================================================================
--- lib/pcre/pcre_compile.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_compile.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_compile.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_compile.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_compile.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_study.c
===================================================================
--- lib/pcre/pcre_study.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_study.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_study.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_study.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_study.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_tables.c
===================================================================
--- lib/pcre/pcre_tables.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_tables.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_tables.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_tables.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_tables.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/AUTHORS
===================================================================
--- lib/pcre/AUTHORS	(.../1.0.1)	(revision 183)
+++ lib/pcre/AUTHORS	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: AUTHORS 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: AUTHORS 33 2005-10-02 20:50:00Z knight $ */
 
 THE MAIN PCRE LIBRARY
 ---------------------

Property changes on: lib/pcre/AUTHORS
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_fullinfo.c
===================================================================
--- lib/pcre/pcre_fullinfo.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_fullinfo.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_fullinfo.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_fullinfo.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_fullinfo.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_internal.h
===================================================================
--- lib/pcre/pcre_internal.h	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_internal.h	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_internal.h 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_internal.h 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_internal.h
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_try_flipped.c
===================================================================
--- lib/pcre/pcre_try_flipped.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_try_flipped.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_try_flipped.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_try_flipped.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_try_flipped.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/README
===================================================================
--- lib/pcre/README	(.../1.0.1)	(revision 183)
+++ lib/pcre/README	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: README 668 2006-06-11 13:39:25Z michael $ */
+/* $Id$ */
+/* $Hybrid: README 668 2006-06-11 13:39:25Z michael $ */
 
 
 PCRE (Perl Compatible Regular Expression) library version 6.4 (latest as

Property changes on: lib/pcre/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_globals.c
===================================================================
--- lib/pcre/pcre_globals.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_globals.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_globals.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_globals.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_globals.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: lib/pcre/pcre_exec.c
===================================================================
--- lib/pcre/pcre_exec.c	(.../1.0.1)	(revision 183)
+++ lib/pcre/pcre_exec.c	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-/* $Id: pcre_exec.c 33 2005-10-02 20:50:00Z knight $ */
+/* $Id$ */
+/* $Hybrid: pcre_exec.c 33 2005-10-02 20:50:00Z knight $ */
 
 /*************************************************
 *      Perl-Compatible Regular Expressions       *

Property changes on: lib/pcre/pcre_exec.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-italian.lang
===================================================================
--- messages/ircd-italian.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-italian.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2007 Afaa (http://www.ircd-hybrid.it)
 ; Federico Giovannini <afaa@ircd-hybrid.it>
-; $Id: ircd-italian.lang 33 2007-12-18 09:31:00Z Afaa $
+; $Id$
+; $Hybrid: ircd-italian.lang 33 2007-12-18 09:31:00Z Afaa $
 
 RPL_WELCOME:		 :%s 001 %s :Benvenuto su %s Internet Relay Chat Network %s
 RPL_YOURHOST:		 :%s 002 %s :Hostname del server è %s, versione corrente %s

Property changes on: messages/ircd-italian.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/Makefile.in
===================================================================
--- messages/Makefile.in	(.../1.0.1)	(revision 183)
+++ messages/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 831 2006-12-19 15:52:19Z michael $
+# $Id$
+# $Hybrid: Makefile.in 831 2006-12-19 15:52:19Z michael $
 #
 RM		= @RM@
 MV		= @MV@

Property changes on: messages/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-russian.lang
===================================================================
--- messages/ircd-russian.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-russian.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2003
 ; Ilya Shtift <ishtift@tagil.svrw.ru>, 2003.
-; $Id: ircd-russian.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-russian.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :Äîáðî ïîæàëîâàòü â %s Internet Relay Chat Network %s
 RPL_YOURHOST:            :%s 002 %s :Âàø ñåðâåð %s, âåðñèÿ %s

Property changes on: messages/ircd-russian.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-norwegian.lang
===================================================================
--- messages/ircd-norwegian.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-norwegian.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; SOME DESCRIPTIVE TITLE.
 ; Copyright (C) YEAR Free Software Foundation, Inc.
 ; FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-; $Id: ircd-norwegian.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-norwegian.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :Velkommen til %s Internet Relay Nettverket %s
 RPL_YOURHOST:            :%s 002 %s :Verten din er %s, som bruker versjon %s

Property changes on: messages/ircd-norwegian.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-standard.example.lang
===================================================================
--- messages/ircd-standard.example.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-standard.example.lang	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
 ; ircd-hybrid-7 standard message file - for reference only
 ; Copyright (C) 2003 Joshua Kwan <joshk@triplehelix.org>
-; $Id: ircd-standard.example.lang 660 2006-06-09 18:51:22Z adx $
+; $Id$
+; $Hybrid: ircd-standard.example.lang 660 2006-06-09 18:51:22Z adx $
 
 ; Use this file as a starting point for translating everything into the
 ; language you need. This file contains all of the defined events in 

Property changes on: messages/ircd-standard.example.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/custom.lang
===================================================================
--- messages/custom.lang	(.../1.0.1)	(revision 183)
+++ messages/custom.lang	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 ; A compilation of original h5/h6/bsdnet numerics
-; $Id: custom.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: custom.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_CREATED:           :%s 003 %s :This server rose from the ashes %s
 RPL_STATSUPTIME:       :%s 242 %s :Dianora hasn't messed with the server code now in %d days, %d:%02d:%02d

Property changes on: messages/custom.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ayb.lang
===================================================================
--- messages/ayb.lang	(.../1.0.1)	(revision 183)
+++ messages/ayb.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2000
 ; David Taylor <davidt@yadt.co.uk>, 2000.
-; $Id: ayb.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ayb.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :ALL YOUR BASE ARE BELONG TO %s, %s!!!
 RPL_CREATED:             :%s 003 %s :Someone set up us the server %s

Property changes on: messages/ayb.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/README
===================================================================
--- messages/README	(.../1.0.1)	(revision 183)
+++ messages/README	(.../1.0.2)	(revision 183)
@@ -40,4 +40,5 @@
 to bugs@ircd-hybrid.org, hybrid@ircd-hybrid.org, or directly to one of the people
 who work with the translations.
 
-$Id: README 831 2006-12-19 15:52:19Z michael $
+$Id$
+$Hybrid: README 831 2006-12-19 15:52:19Z michael $

Property changes on: messages/README
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-polish.lang
===================================================================
--- messages/ircd-polish.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-polish.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2003-2005, Piotr Ni¿yñski <adx@irc7.pl>
 ; Coding: ISO-8859-2 * CP-1250
-; $Id: ircd-polish.lang 660 2006-06-09 18:51:22Z adx $
+; $Id$
+; $Hybrid: ircd-polish.lang 660 2006-06-09 18:51:22Z adx $
 
 RPL_WELCOME:            :%s 001 %s :Witaj w sieci IRC %s, %s
 RPL_YOURHOST:           :%s 002 %s :Twój host to %s, obecna wersja %s

Property changes on: messages/ircd-polish.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-croatian.lang
===================================================================
--- messages/ircd-croatian.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-croatian.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2000
 ; David Taylor <davidt@yadt.co.uk>, 2000.
-; $Id: ircd-croatian.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-croatian.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :Dobro do¹li na %s Internet Relay Chat Network %s
 RPL_YOURHOST:            :%s 002 %s :Va¹ host je %s, i koristi verziju %s

Property changes on: messages/ircd-croatian.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-french.lang
===================================================================
--- messages/ircd-french.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-french.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2003
 ; Joshua Kwan <joshk@triplehelix.org>
-; $Id: ircd-french.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-french.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_LUSEROP:             :%s 252 %s %d :opérateurs IRC en ligne
 RPL_LOAD2HI:             :%s 263 %s :Veuillez patienter, le serveur est trop occupé

Property changes on: messages/ircd-french.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-spanish.lang
===================================================================
--- messages/ircd-spanish.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-spanish.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; SOME DESCRIPTIVE TITLE.
 ; Copyright (C) YEAR Free Software Foundation, Inc.
 ; FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-; $Id: ircd-spanish.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-spanish.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :Bienvenido al %s Internet Relay Chat Network %s
 RPL_YOURHOST:            :%s 002 %s :Estas en el servidor %s, corriendo la version %s

Property changes on: messages/ircd-spanish.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-swedish.lang
===================================================================
--- messages/ircd-swedish.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-swedish.lang	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
 ; Copyright (C) 2000-2005
 ; David Taylor <davidt@yadt.co.uk>, 2000.
 ; Rickard Åberg <shelter@chatjunkies.org>, 2005.
-; $Id: ircd-swedish.lang 660 2006-06-09 18:51:22Z adx $
+; $Id$
+; $Hybrid: ircd-swedish.lang 660 2006-06-09 18:51:22Z adx $
 
 RPL_WELCOME:		 :%s 001 %s :Välkommen till %s Internet Relay Chat Network %s
 RPL_YOURHOST:            :%s 002 %s :Din värd är %s, som kör version %s

Property changes on: messages/ircd-swedish.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-danish.lang
===================================================================
--- messages/ircd-danish.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-danish.lang	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
 ; Copyright (C) YEAR Free Software Foundation, Inc.
 ; Xride 
 ; Soren Straarup <xride@x12.dk>, 2001.
-; $Id: ircd-danish.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-danish.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:             :%s 001 %s :Velkommen til %s Internet Rel‘ Netv‘rket %s
 RPL_YOURHOST:            :%s 002 %s :Din v‘rt er %s, k›rer version %s

Property changes on: messages/ircd-danish.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-dutch.lang
===================================================================
--- messages/ircd-dutch.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-dutch.lang	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
 ; ircd-hybrid-7 standard message file - Dutch language
 ; Copyright (C) 2005 Kenneth Pang <nexu.jin@gmail.com>
-; $Id: ircd-dutch.lang 660 2006-06-09 18:51:22Z adx $
+; $Id$
+; $Hybrid: ircd-dutch.lang 660 2006-06-09 18:51:22Z adx $
 
 RPL_WELCOME:             :%s 001 %s :Welkom op het %s Internet Relay Netwerk %s
 RPL_YOURHOST:            :%s 002 %s :Jouw host is %s, werkend met versie %s

Property changes on: messages/ircd-dutch.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-german.lang
===================================================================
--- messages/ircd-german.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-german.lang	(.../1.0.2)	(revision 183)
@@ -2,7 +2,8 @@
 ; Copyright (C) 2000-2005
 ; David Taylor <davidt@yadt.co.uk>, 2000.
 ; Markus R. <mxr@chatjunkies.org>, 2005. 
-; $Id: ircd-german.lang 660 2006-06-09 18:51:22Z adx $
+; $Id$
+; $Hybrid: ircd-german.lang 660 2006-06-09 18:51:22Z adx $
 
 RPL_WELCOME:		 :%s 001 %s :Wilkommen im %s Internet Relay Chat Netz, %s!
 RPL_YOURHOST:		 :%s 002 %s :Du bist verbunden mit %s, version %s

Property changes on: messages/ircd-german.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: messages/ircd-brazilian_pt.lang
===================================================================
--- messages/ircd-brazilian_pt.lang	(.../1.0.1)	(revision 183)
+++ messages/ircd-brazilian_pt.lang	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 ; ircd-hybrid-7 custom message file
 ; Copyright (C) 2003
 ; Marcelo Lipienski <und3rl1n3d@gmail.com>
-; $Id: ircd-brazilian_pt.lang 33 2005-10-02 20:50:00Z knight $
+; $Id$
+; $Hybrid: ircd-brazilian_pt.lang 33 2005-10-02 20:50:00Z knight $
 
 RPL_WELCOME:		 :%s 001 %s :Bem vindo a %s Internet Relay Chat Network %s
 RPL_YOURHOST:		 :%s 002 %s :Voce esta no servidor %s, rodando a versão %s

Property changes on: messages/ircd-brazilian_pt.lang
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_hash.c
===================================================================
--- modules/m_hash.c	(.../1.0.1)	(revision 183)
+++ modules/m_hash.c	(.../1.0.2)	(revision 183)
@@ -18,7 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_hash.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_hash.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -63,7 +64,7 @@
   mod_del_cmd(&hash_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 static void

Property changes on: modules/m_hash.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_services.c
===================================================================
--- modules/m_services.c	(.../1.0.1)	(revision 183)
+++ modules/m_services.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_services.c 512 2006-03-04 16:21:54Z michael $
+ *  $Id$
+ *  $Hybrid: m_services.c 512 2006-03-04 16:21:54Z michael $
  */
 /*
  *
@@ -191,7 +192,7 @@
   mod_del_cmd(&os_msgtab);
 }
 
-const char *_version = "$Revision: 512 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_services.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/Makefile.in
===================================================================
--- modules/Makefile.in	(.../1.0.1)	(revision 183)
+++ modules/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,7 +1,8 @@
 #
 # Makefile.in for ircd/modules
 #
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 #
 CC		= @CC@
 AR		= @AR@

Property changes on: modules/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_info.c
===================================================================
--- modules/m_info.c	(.../1.0.1)	(revision 183)
+++ modules/m_info.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_info.c 201 2005-11-01 11:41:52Z adx $
+ *  $Id$
+ *  $Hybrid: m_info.c 201 2005-11-01 11:41:52Z adx $
  */
 
 #include "stdinc.h"
@@ -56,7 +57,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 201 $";
+const char *_version = "$Revision$";
 static struct Callback *info_cb;
 
 static void *

Property changes on: modules/m_info.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_gline.c
===================================================================
--- modules/m_gline.c	(.../1.0.1)	(revision 183)
+++ modules/m_gline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_gline.c 554 2006-04-21 17:01:46Z michael $
+ *  $Id$
+ *  $Hybrid: m_gline.c 554 2006-04-21 17:01:46Z michael $
  */
 
 #include "stdinc.h"
@@ -107,7 +108,7 @@
   delete_capability("GLN");
 }
 
-const char *_version = "$Revision: 554 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_gline()

Property changes on: modules/m_gline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_time.c
===================================================================
--- modules/m_time.c	(.../1.0.1)	(revision 183)
+++ modules/m_time.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_time.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_time.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&time_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 /*
  * m_time

Property changes on: modules/m_time.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_rxline.c
===================================================================
--- modules/m_rxline.c	(.../1.0.1)	(revision 183)
+++ modules/m_rxline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_rxline.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_rxline.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -83,7 +84,7 @@
   mod_del_cmd(&unrxline_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 static int

Property changes on: modules/m_rxline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_users.c
===================================================================
--- modules/m_users.c	(.../1.0.1)	(revision 183)
+++ modules/m_users.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_users.c 435 2006-02-11 19:21:50Z michael $
+ *  $Id$
+ *  $Hybrid: m_users.c 435 2006-02-11 19:21:50Z michael $
  */
 
 #include "stdinc.h"
@@ -55,7 +56,7 @@
   mod_del_cmd(&users_msgtab);
 }
 
-const char *_version = "$Revision: 435 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_users.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_kline.c
===================================================================
--- modules/m_kline.c	(.../1.0.1)	(revision 183)
+++ modules/m_kline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kline.c 611 2006-05-18 11:43:38Z michael $
+ *  $Id$
+ *  $Hybrid: m_kline.c 611 2006-05-18 11:43:38Z michael $
  */
 
 #include "stdinc.h"
@@ -105,7 +106,7 @@
   delete_capability("KLN");
 }
 
-const char *_version = "$Revision: 611 $";
+const char *_version = "$Revision$";
 #endif
 
 /* Local function prototypes */

Property changes on: modules/m_kline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_capture.c
===================================================================
--- modules/m_capture.c	(.../1.0.1)	(revision 183)
+++ modules/m_capture.c	(.../1.0.2)	(revision 183)
@@ -19,12 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_capture.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_capture.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
 #include "tools.h"
-#include "common.h"  
+#include "common.h"
 #include "handlers.h"
 #include "client.h"
 #include "hash.h"
@@ -35,6 +36,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_serv.h"
+#include "s_user.h"
 #include "send.h"
 #include "list.h"
 #include "irc_string.h"
@@ -86,7 +88,7 @@
   mod_del_cmd(&heal_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_capture
@@ -143,7 +145,10 @@
                                target_p->host, source_p->name, reason);
           sendto_one(target_p, form_str(RPL_YOURECAPTURED),
                      me.name, target_p->name, reason, ServerInfo.help_channel);
+
+          unsigned int old = target_p->umodes;
           SetCaptured(target_p);
+          send_umode_out(target_p, target_p, old);
         }
 
         sendto_one(source_p, form_str(RPL_ISCAPTURED),
@@ -197,7 +202,10 @@
       {
         sendto_one(target_p, form_str(RPL_YOURECAPTURED),
                    me.name, target_p->name, reason, ServerInfo.help_channel);
+
+        unsigned int old = target_p->umodes;
         SetCaptured(target_p);
+        send_umode_out(target_p, target_p, old);
         ++matches;
       }
     }
@@ -245,7 +253,9 @@
       {
         if (IsCaptured(target_p))
         {
+          unsigned int old = target_p->umodes;
           ClearCaptured(target_p);
+          send_umode_out(target_p, target_p, old);
 
           sendto_realops_flags(UMODE_ALL, L_ALL, "Received UNCAPTURE message for %s (%s@%s). From %s",
                                target_p->name, target_p->username,
@@ -301,7 +311,10 @@
       if (match(nick, target_p->name) &&
           match(host, target_p->host) && match(user, target_p->username))
       {
+        unsigned int old = target_p->umodes;
         ClearCaptured(target_p);
+        send_umode_out(target_p, target_p, old);
+
         sendto_one(target_p, form_str(RPL_YOUREUNCAPTURED), me.name, target_p->name);
         ++matches;
       }

Property changes on: modules/m_capture.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_motd.c
===================================================================
--- modules/m_motd.c	(.../1.0.1)	(revision 183)
+++ modules/m_motd.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_motd.c 589 2006-05-08 18:40:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_motd.c 589 2006-05-08 18:40:00Z michael $
  */
 
 #include "stdinc.h"
@@ -54,7 +55,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 589 $";
+const char *_version = "$Revision$";
 static struct Callback *motd_cb;
 
 static void *

Property changes on: modules/m_motd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_names.c
===================================================================
--- modules/m_names.c	(.../1.0.1)	(revision 183)
+++ modules/m_names.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_names.c 632 2006-06-01 10:53:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_names.c 632 2006-06-01 10:53:00Z michael $
  */
 
 #include "stdinc.h"
@@ -67,7 +68,7 @@
   mod_del_cmd(&names_msgtab);
 }
 
-const char *_version = "$Revision: 632 $";
+const char *_version = "$Revision$";
 #endif
 
 /************************************************************************

Property changes on: modules/m_names.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_drop.c
===================================================================
--- modules/m_drop.c	(.../1.0.1)	(revision 183)
+++ modules/m_drop.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_drop.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_drop.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -60,7 +61,7 @@
   mod_del_cmd(&drop_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 /*
 ** ms_drop

Property changes on: modules/m_drop.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_svinfo.c
===================================================================
--- modules/m_svinfo.c	(.../1.0.1)	(revision 183)
+++ modules/m_svinfo.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_svinfo.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_svinfo.c 33 2005-10-02 20:50:00Z knight $
  */
 #include "stdinc.h"
 #include "handlers.h"
@@ -56,7 +57,7 @@
   mod_del_cmd(&svinfo_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 /*
  * ms_svinfo - SVINFO message handler

Property changes on: modules/m_svinfo.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_eob.c
===================================================================
--- modules/m_eob.c	(.../1.0.1)	(revision 183)
+++ modules/m_eob.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_eob.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_eob.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -54,7 +55,7 @@
   mod_del_cmd(&eob_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_eob.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_list.c
===================================================================
--- modules/m_list.c	(.../1.0.1)	(revision 183)
+++ modules/m_list.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_list.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_list.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -67,7 +68,7 @@
   delete_isupport("SAFELIST");
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 static int

Property changes on: modules/m_list.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_cryptlink.c
===================================================================
--- modules/m_cryptlink.c	(.../1.0.1)	(revision 183)
+++ modules/m_cryptlink.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_cryptlink.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_cryptlink.c 33 2005-10-02 20:50:00Z knight $
  */
 
 /*
@@ -95,7 +96,7 @@
   mod_del_cmd(&cryptlink_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/m_cryptlink.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_challenge.c
===================================================================
--- modules/m_challenge.c	(.../1.0.1)	(revision 183)
+++ modules/m_challenge.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_challenge.c 817 2006-09-10 17:45:31Z michael $
+ *  $Id$
+ *  $Hybrid: m_challenge.c 817 2006-09-10 17:45:31Z michael $
  */
 
 #include "stdinc.h"
@@ -61,7 +62,7 @@
   mod_del_cmd(&challenge_msgtab);
 }
 
-const char *_version = "$Revision: 817 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_challenge.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_tburst.c
===================================================================
--- modules/m_tburst.c	(.../1.0.1)	(revision 183)
+++ modules/m_tburst.c	(.../1.0.2)	(revision 183)
@@ -25,7 +25,8 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: m_tburst.c 395 2006-02-03 17:39:45Z michael $
+ *  $Id$
+ *  $Hybrid: m_tburst.c 395 2006-02-03 17:39:45Z michael $
  */
 
 #include "stdinc.h"
@@ -77,7 +78,7 @@
   delete_capability("TBURST");
 }
 
-const char *_version = "$Revision: 122 $";
+const char *_version = "$Revision$";
 
 #endif /* !STATIC_MODULES */
 

Property changes on: modules/m_tburst.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_restart.c
===================================================================
--- modules/m_restart.c	(.../1.0.1)	(revision 183)
+++ modules/m_restart.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_restart.c 588 2006-05-08 13:22:59Z michael $
+ *  $Id$
+ *  $Hybrid: m_restart.c 588 2006-05-08 13:22:59Z michael $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&restart_msgtab);
 }
 
-const char *_version = "$Revision: 588 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_restart.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_version.c
===================================================================
--- modules/m_version.c	(.../1.0.1)	(revision 183)
+++ modules/m_version.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_version.c 269 2005-11-14 19:39:09Z adx $
+ *  $Id$
+ *  $Hybrid: m_version.c 269 2005-11-14 19:39:09Z adx $
  */
 
 #include "stdinc.h"
@@ -73,7 +74,7 @@
   mod_del_cmd(&version_msgtab);
 }
 
-const char *_version = "$Revision: 269 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_version.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_post.c
===================================================================
--- modules/m_post.c	(.../1.0.1)	(revision 183)
+++ modules/m_post.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_post.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_post.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -69,7 +70,7 @@
   mod_del_cmd(&put_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_post.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_encap.c
===================================================================
--- modules/m_encap.c	(.../1.0.1)	(revision 183)
+++ modules/m_encap.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_encap.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_encap.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -54,7 +55,7 @@
   mod_del_cmd(&encap_msgtab);
   delete_capability("ENCAP");
 }
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_encap.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_connect.c
===================================================================
--- modules/m_connect.c	(.../1.0.1)	(revision 183)
+++ modules/m_connect.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_connect.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_connect.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -60,7 +61,7 @@
   mod_del_cmd(&connect_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_connect.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_killhost.c
===================================================================
--- modules/m_killhost.c	(.../1.0.1)	(revision 183)
+++ modules/m_killhost.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_killhost.c 620 2006-05-24 18:54:19Z michael $
+ *  $Id$
+ *  $Hybrid: m_killhost.c 620 2006-05-24 18:54:19Z michael $
  *
  */
 
@@ -64,7 +65,7 @@
   mod_del_cmd(&killhost_msgtab);
 }
 
-const char *_version = "$Revision: 620 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_killhost()

Property changes on: modules/m_killhost.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_invite.c
===================================================================
--- modules/m_invite.c	(.../1.0.1)	(revision 183)
+++ modules/m_invite.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_invite.c 322 2005-12-24 22:04:58Z michael $
+ *  $Id$
+ *  $Hybrid: m_invite.c 322 2005-12-24 22:04:58Z michael $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&invite_msgtab);
 }
 
-const char *_version = "$Revision: 322 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_invite.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_accept.c
===================================================================
--- modules/m_accept.c	(.../1.0.1)	(revision 183)
+++ modules/m_accept.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_accept.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_accept.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&accept_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_accept.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_locops.c
===================================================================
--- modules/m_locops.c	(.../1.0.1)	(revision 183)
+++ modules/m_locops.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_locops.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_locops.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -58,7 +59,7 @@
   mod_del_cmd(&locops_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_locops.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_away.c
===================================================================
--- modules/m_away.c	(.../1.0.1)	(revision 183)
+++ modules/m_away.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_away.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_away.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -61,7 +62,7 @@
   delete_isupport("AWAYLEN");
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /***********************************************************************

Property changes on: modules/m_away.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_cburst.c
===================================================================
--- modules/m_cburst.c	(.../1.0.1)	(revision 183)
+++ modules/m_cburst.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_cburst.c 632 2006-06-01 10:53:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_cburst.c 632 2006-06-01 10:53:00Z michael $
  */
 
 #include "stdinc.h"
@@ -60,7 +61,7 @@
   mod_del_cmd(&cburst_msgtab);
 }
 
-const char *_version = "$Revision: 632 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_cburst.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_etrace.c
===================================================================
--- modules/m_etrace.c	(.../1.0.1)	(revision 183)
+++ modules/m_etrace.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_etrace.c 856 2007-02-27 02:58:49Z db $
+ *  $Id$
+ *  $Hybrid: m_etrace.c 856 2007-02-27 02:58:49Z db $
  */
 
 #include "stdinc.h"
@@ -54,7 +55,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 856 $";
+const char *_version = "$Revision$";
 static struct Callback *etrace_cb;
 
 static void *

Property changes on: modules/m_etrace.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_knock.c
===================================================================
--- modules/m_knock.c	(.../1.0.1)	(revision 183)
+++ modules/m_knock.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_knock.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_knock.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -84,7 +85,7 @@
   delete_isupport("KNOCK");
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* m_knock

Property changes on: modules/m_knock.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_oper.c
===================================================================
--- modules/m_oper.c	(.../1.0.1)	(revision 183)
+++ modules/m_oper.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_oper.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_oper.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -64,7 +65,7 @@
   mod_del_cmd(&oper_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_oper.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_ison.c
===================================================================
--- modules/m_ison.c	(.../1.0.1)	(revision 183)
+++ modules/m_ison.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_ison.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_ison.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
 {
   mod_del_cmd(&ison_msgtab);
 }
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/m_ison.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_ojoin.c
===================================================================
--- modules/m_ojoin.c	(.../1.0.1)	(revision 183)
+++ modules/m_ojoin.c	(.../1.0.2)	(revision 183)
@@ -20,6 +20,7 @@
  *  USA
  *
  *  $Id$
+ *  $Hybrid: m_ojoin.c 75 2008-03-07 04:34:30Z srees $
  */
 
 #include "stdinc.h"

Property changes on: modules/m_ojoin.c
___________________________________________________________________
Modified: svn:keywords
   - "Author Date Id Rev URL"
   + Date Author Id Revision

Index: modules/m_omotd.c
===================================================================
--- modules/m_omotd.c	(.../1.0.1)	(revision 183)
+++ modules/m_omotd.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_omotd.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_omotd.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&omotd_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* m_omotd()

Property changes on: modules/m_omotd.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_rkline.c
===================================================================
--- modules/m_rkline.c	(.../1.0.1)	(revision 183)
+++ modules/m_rkline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_rkline.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_rkline.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -89,7 +90,7 @@
   mod_del_cmd(&unrkline_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_rkline()

Property changes on: modules/m_rkline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_operwall.c
===================================================================
--- modules/m_operwall.c	(.../1.0.1)	(revision 183)
+++ modules/m_operwall.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_operwall.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_operwall.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -64,7 +65,7 @@
   mod_del_cmd(&globops_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/m_operwall.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_testline.c
===================================================================
--- modules/m_testline.c	(.../1.0.1)	(revision 183)
+++ modules/m_testline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_testline.c 808 2006-09-03 18:58:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_testline.c 808 2006-09-03 18:58:00Z michael $
  */
 
 #include "stdinc.h"
@@ -68,7 +69,7 @@
   mod_del_cmd(&testgecos_msgtab);
 }
  
-const char *_version = "$Revision: 808 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_testline()

Property changes on: modules/m_testline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_whois.c
===================================================================
--- modules/m_whois.c	(.../1.0.1)	(revision 183)
+++ modules/m_whois.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 660 2006-06-09 18:51:22Z adx $
+ *  $Id$
+ *  $Hybrid: m_whois.c 660 2006-06-09 18:51:22Z adx $
  */
 
 #include "stdinc.h"
@@ -59,7 +60,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 660 $";
+const char *_version = "$Revision$";
 static struct Callback *whois_cb;
 
 static void *
@@ -373,7 +374,7 @@
     ms = lp->data;
     chptr = ms->chptr;
 
-    if (ShowChannel(source_p, chptr) || IsOperSnoop(source_p))
+    if (ShowChannel(source_p, chptr) || IsSnoop(source_p))
     {
       /* Don't show local channels if user is doing a remote whois */
       if (!MyConnect(source_p) && (chptr->chname[0] == '&'))
@@ -388,7 +389,7 @@
       }
 
       /* Let oper snoops know that they're looking at a secret channel */
-      if (!PubChannel(chptr) && !IsMember(source_p, chptr) && IsOperSnoop(source_p))
+      if (!PubChannel(chptr) && !IsMember(source_p, chptr) && IsSnoop(source_p))
       {
         tlen = ircsprintf(t, "*");
         t += tlen;

Property changes on: modules/m_whois.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_quit.c
===================================================================
--- modules/core/m_quit.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_quit.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_quit.c 465 2006-02-13 14:19:25Z adx $
+ *  $Id$
+ *  $Hybrid: m_quit.c 465 2006-02-13 14:19:25Z adx $
  */
 
 #include "stdinc.h"
@@ -55,7 +56,7 @@
   mod_del_cmd(&quit_msgtab);
 }
 
-const char *_version = "$Revision: 465 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/core/m_quit.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_sjoin.c
===================================================================
--- modules/core/m_sjoin.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_sjoin.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_sjoin.c 632 2006-06-01 10:53:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_sjoin.c 632 2006-06-01 10:53:00Z michael $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&sjoin_msgtab);
 }
 
-const char *_version = "$Revision: 632 $";
+const char *_version = "$Revision$";
 #endif
 
 static char modebuf[MODEBUFLEN];

Property changes on: modules/core/m_sjoin.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_message.c
===================================================================
--- modules/core/m_message.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_message.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_message.c 666 2006-06-10 23:35:38Z stu $
+ *  $Id$
+ *  $Hybrid: m_message.c 666 2006-06-10 23:35:38Z stu $
  */
 
 #include "stdinc.h"
@@ -125,7 +126,7 @@
   mod_del_cmd(&notice_msgtab);
 }
 
-const char *_version = "$Revision: 666 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/core/m_message.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_mode.c
===================================================================
--- modules/core/m_mode.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_mode.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_mode.c 848 2007-02-19 17:22:44Z db $
+ *  $Id$
+ *  $Hybrid: m_mode.c 848 2007-02-19 17:22:44Z db $
  */
 
 #include "stdinc.h"
@@ -79,7 +80,7 @@
   mod_del_cmd(&bmask_msgtab);
 }
 
-const char *_version = "$Revision: 848 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/core/m_mode.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_nick.c
===================================================================
--- modules/core/m_nick.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_nick.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_nick.c 706 2006-07-02 11:25:55Z michael $
+ *  $Id$
+ *  $Hybrid: m_nick.c 706 2006-07-02 11:25:55Z michael $
  */
 
 #include "stdinc.h"
@@ -93,7 +94,7 @@
   mod_del_cmd(&uid_msgtab);
 }
 
-const char *_version = "$Revision: 706 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mr_nick()
@@ -200,6 +201,7 @@
 {
   char nick[NICKLEN];
   struct Client *target_p;
+  dlink_node *ptr = NULL;   /* for enumerating channels */
 
   if (parc < 2 || EmptyString(parv[1]))
   {
@@ -232,6 +234,20 @@
     return;
   }
 
+  /* prevent nick changes if the user is banned on any channel they're on */
+  if (!IsOper(source_p) && source_p->channel.head)
+  {
+    DLINK_FOREACH(ptr, source_p->channel.head)
+    {
+      struct Membership *ms = ptr->data;
+
+      if (! can_send(ms->chptr, source_p, ms))
+      {
+        return;
+      }
+    }
+  }
+
   if ((target_p = find_client(nick)))
   {
     /* If(target_p == source_p) the client is changing nicks between

Property changes on: modules/core/m_nick.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_squit.c
===================================================================
--- modules/core/m_squit.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_squit.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_squit.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_squit.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -60,7 +61,7 @@
   mod_del_cmd(&squit_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_squit - SQUIT message handler

Property changes on: modules/core/m_squit.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_part.c
===================================================================
--- modules/core/m_part.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_part.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_part.c 454 2006-02-12 19:01:25Z michael $
+ *  $Id$
+ *  $Hybrid: m_part.c 454 2006-02-12 19:01:25Z michael $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&part_msgtab);
 }
 
-const char *_version = "$Revision: 454 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/core/m_part.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_server.c
===================================================================
--- modules/core/m_server.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_server.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_server.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_server.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -77,7 +78,7 @@
   mod_del_cmd(&sid_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/core/m_server.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_kill.c
===================================================================
--- modules/core/m_kill.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_kill.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kill.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_kill.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -65,7 +66,7 @@
   mod_del_cmd(&kill_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_kill()

Property changes on: modules/core/m_kill.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_join.c
===================================================================
--- modules/core/m_join.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_join.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_join.c 855 2007-02-26 22:06:45Z db $
+ *  $Id$
+ *  $Hybrid: m_join.c 855 2007-02-26 22:06:45Z db $
  */
 
 #include "stdinc.h"
@@ -74,7 +75,7 @@
   mod_del_cmd(&join_msgtab);
 }
 
-const char *_version = "$Revision: 855 $";
+const char *_version = "$Revision$";
 #endif
 
 /* last0() stolen from ircu */

Property changes on: modules/core/m_join.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_die.c
===================================================================
--- modules/core/m_die.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_die.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_die.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_die.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&die_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/core/m_die.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/core/m_kick.c
===================================================================
--- modules/core/m_kick.c	(.../1.0.1)	(revision 183)
+++ modules/core/m_kick.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kick.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_kick.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -61,7 +62,7 @@
   mod_del_cmd(&kick_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* m_kick()

Property changes on: modules/core/m_kick.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_testmask.c
===================================================================
--- modules/m_testmask.c	(.../1.0.1)	(revision 183)
+++ modules/m_testmask.c	(.../1.0.2)	(revision 183)
@@ -29,7 +29,8 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: m_testmask.c 816 2006-09-10 17:38:08Z michael $
+ *  $Id$
+ *  $Hybrid: m_testmask.c 816 2006-09-10 17:38:08Z michael $
  */
 
 #include "stdinc.h"
@@ -68,7 +69,7 @@
   mod_del_cmd(&testmask_msgtab);
 }
  
-const char *_version = "$Revision: 816 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_testmask()

Property changes on: modules/m_testmask.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_who.c
===================================================================
--- modules/m_who.c	(.../1.0.1)	(revision 183)
+++ modules/m_who.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_who.c 313 2005-12-23 10:55:47Z michael $
+ *  $Id$
+ *  $Hybrid: m_who.c 313 2005-12-23 10:55:47Z michael $
  */
 #include "stdinc.h"
 #include "tools.h"
@@ -64,7 +65,7 @@
   mod_del_cmd(&who_msgtab);
 }
 
-const char *_version = "$Revision: 313 $";
+const char *_version = "$Revision$";
 #endif
 
 static void who_global(struct Client *source_p, char *mask, int server_oper);
@@ -329,7 +330,7 @@
     ms = ptr->data;
     target_p = ms->client_p;
 
-    if (member || !IsInvisible(target_p) || IsOperSnoop(source_p))
+    if (member || !IsInvisible(target_p) || IsSnoop(source_p))
     {
       if (server_oper && !IsOper(target_p))
         continue;

Property changes on: modules/m_who.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_cap.c
===================================================================
--- modules/m_cap.c	(.../1.0.1)	(revision 183)
+++ modules/m_cap.c	(.../1.0.2)	(revision 183)
@@ -19,12 +19,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_cap.c 575 2006-05-01 11:41:09Z michael $
+ *  $Id$
+ *  $Hybrid: m_cap.c 575 2006-05-01 11:41:09Z michael $
  */
 
 /** @file
  * @brief Capability negotiation commands
- * @version $Id: m_cap.c 575 2006-05-01 11:41:09Z michael $
+ * @version $Id$
+ * @version $Hybrid: m_cap.c 575 2006-05-01 11:41:09Z michael $
  */
 
 #include "stdinc.h"
@@ -64,7 +66,7 @@
   mod_del_cmd(&cap_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 #define CAPFL_HIDDEN    0x0001  /**< Do not advertize this capability */

Property changes on: modules/m_cap.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_pass.c
===================================================================
--- modules/m_pass.c	(.../1.0.1)	(revision 183)
+++ modules/m_pass.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_pass.c 573 2006-05-01 09:40:37Z michael $
+ *  $Id$
+ *  $Hybrid: m_pass.c 573 2006-05-01 09:40:37Z michael $
  */
 
 #include "stdinc.h"
@@ -55,7 +56,7 @@
   mod_del_cmd(&pass_msgtab);
 }
 
-const char *_version = "$Revision: 573 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_pass.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_rehash.c
===================================================================
--- modules/m_rehash.c	(.../1.0.1)	(revision 183)
+++ modules/m_rehash.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_rehash.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_rehash.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -58,7 +59,7 @@
   mod_del_cmd(&rehash_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_rehash.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_webirc.c
===================================================================
--- modules/m_webirc.c	(.../1.0.1)	(revision 183)
+++ modules/m_webirc.c	(.../1.0.2)	(revision 183)
@@ -20,6 +20,7 @@
  *  USA
  *
  *  $Id$
+ *  $Hybrid: m_webirc.c 121 2008-04-02 03:17:02Z srees $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&webirc_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_webirc.c
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Date Author Id Revision

Index: modules/m_llnick.c
===================================================================
--- modules/m_llnick.c	(.../1.0.1)	(revision 183)
+++ modules/m_llnick.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_llnick.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_llnick.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -60,7 +61,7 @@
   mod_del_cmd(&llnick_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 /*
  * m_llnick

Property changes on: modules/m_llnick.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_userhost.c
===================================================================
--- modules/m_userhost.c	(.../1.0.1)	(revision 183)
+++ modules/m_userhost.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_userhost.c 268 2005-11-14 11:02:39Z adx $
+ *  $Id$
+ *  $Hybrid: m_userhost.c 268 2005-11-14 11:02:39Z adx $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&userhost_msgtab);
 }
 
-const char *_version = "$Revision: 268 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_userhost.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_map.c
===================================================================
--- modules/m_map.c	(.../1.0.1)	(revision 183)
+++ modules/m_map.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_map.c 268 2005-11-14 11:02:39Z adx $
+ *  $Id$
+ *  $Hybrid: m_map.c 268 2005-11-14 11:02:39Z adx $
  */
 
 #include "stdinc.h"
@@ -53,7 +54,7 @@
   mod_del_cmd(&map_msgtab);
 }
 
-const char *_version = "$Revision: 268 $";
+const char *_version = "$Revision$";
 #endif
 
 static char buf[IRCD_BUFSIZE];

Property changes on: modules/m_map.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_nburst.c
===================================================================
--- modules/m_nburst.c	(.../1.0.1)	(revision 183)
+++ modules/m_nburst.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_nburst.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_nburst.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&nburst_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 /*
 ** m_nburst

Property changes on: modules/m_nburst.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_topic.c
===================================================================
--- modules/m_topic.c	(.../1.0.1)	(revision 183)
+++ modules/m_topic.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_topic.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_topic.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -63,7 +64,7 @@
   mod_del_cmd(&topic_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* m_topic()

Property changes on: modules/m_topic.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_xline.c
===================================================================
--- modules/m_xline.c	(.../1.0.1)	(revision 183)
+++ modules/m_xline.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_xline.c 382 2006-01-31 12:13:42Z michael $
+ *  $Id$
+ *  $Hybrid: m_xline.c 382 2006-01-31 12:13:42Z michael $
  */
 
 #include "stdinc.h"
@@ -86,7 +87,7 @@
   mod_del_cmd(&unxline_msgtab);
 }
 
-const char *_version = "$Revision: 382 $";
+const char *_version = "$Revision$";
 #endif
 
 

Property changes on: modules/m_xline.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_resv.c
===================================================================
--- modules/m_resv.c	(.../1.0.1)	(revision 183)
+++ modules/m_resv.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_resv.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_resv.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -73,7 +74,7 @@
   mod_del_cmd(&unresv_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /* mo_resv()

Property changes on: modules/m_resv.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_links.c
===================================================================
--- modules/m_links.c	(.../1.0.1)	(revision 183)
+++ modules/m_links.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_links.c 575 2006-05-01 11:41:09Z michael $
+ *  $Id$
+ *  $Hybrid: m_links.c 575 2006-05-01 11:41:09Z michael $
  */
 
 #include "stdinc.h"
@@ -48,7 +49,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 575 $";
+const char *_version = "$Revision$";
 static struct Callback *links_cb;
 
 static void *

Property changes on: modules/m_links.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_wallops.c
===================================================================
--- modules/m_wallops.c	(.../1.0.1)	(revision 183)
+++ modules/m_wallops.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_wallops.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_wallops.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&wallops_msgtab);
 }
  
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_wallops.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_lljoin.c
===================================================================
--- modules/m_lljoin.c	(.../1.0.1)	(revision 183)
+++ modules/m_lljoin.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_lljoin.c 632 2006-06-01 10:53:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_lljoin.c 632 2006-06-01 10:53:00Z michael $
  */
 
 #include "stdinc.h"
@@ -62,7 +63,7 @@
   mod_del_cmd(&lljoin_msgtab);
 }
 
-const char *_version = "$Revision: 632 $";
+const char *_version = "$Revision$";
 #endif
 /*
  * m_lljoin

Property changes on: modules/m_lljoin.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_help.c
===================================================================
--- modules/m_help.c	(.../1.0.1)	(revision 183)
+++ modules/m_help.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_help.c 575 2006-05-01 11:41:09Z michael $
+ *  $Id$
+ *  $Hybrid: m_help.c 575 2006-05-01 11:41:09Z michael $
  */
 
 #include "stdinc.h"
@@ -71,7 +72,7 @@
   mod_del_cmd(&uhelp_msgtab);
 }
 
-const char *_version = "$Revision: 575 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_help.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_admin.c
===================================================================
--- modules/m_admin.c	(.../1.0.1)	(revision 183)
+++ modules/m_admin.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_admin.c 589 2006-05-08 18:40:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_admin.c 589 2006-05-08 18:40:00Z michael $
  */
 
 #include "stdinc.h"
@@ -48,7 +49,7 @@
 
 #ifndef STATIC_MODULES
 static struct Callback *admin_cb;
-const char *_version = "$Revision: 589 $";
+const char *_version = "$Revision$";
 
 static void *
 va_admin(va_list args)

Property changes on: modules/m_admin.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_set.c
===================================================================
--- modules/m_set.c	(.../1.0.1)	(revision 183)
+++ modules/m_set.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_set.c 646 2006-06-07 12:42:00Z michael $
+ *  $Id$
+ *  $Hybrid: m_set.c 646 2006-06-07 12:42:00Z michael $
  */
 
 /* rewritten by jdc */
@@ -65,7 +66,7 @@
   mod_del_cmd(&set_msgtab);
 }
 
-const char *_version = "$Revision: 646 $";
+const char *_version = "$Revision$";
 #endif
 
 /* Structure used for the SET table itself */

Property changes on: modules/m_set.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_ping.c
===================================================================
--- modules/m_ping.c	(.../1.0.1)	(revision 183)
+++ modules/m_ping.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_ping.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_ping.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&ping_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_ping.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_stats.c
===================================================================
--- modules/m_stats.c	(.../1.0.1)	(revision 183)
+++ modules/m_stats.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_stats.c 584 2006-05-07 15:26:45Z michael $
+ *  $Id$
+ *  $Hybrid: m_stats.c 584 2006-05-07 15:26:45Z michael $
  */
 
 #include "stdinc.h"
@@ -63,7 +64,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 584 $";
+const char *_version = "$Revision$";
 static struct Callback *stats_cb;
 
 static void *

Property changes on: modules/m_stats.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_trace.c
===================================================================
--- modules/m_trace.c	(.../1.0.1)	(revision 183)
+++ modules/m_trace.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_trace.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_trace.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -53,7 +54,7 @@
 };
 
 #ifndef STATIC_MODULES
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 static struct Callback *trace_cb;
 
 static void *

Property changes on: modules/m_trace.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_opme.c
===================================================================
--- modules/m_opme.c	(.../1.0.1)	(revision 183)
+++ modules/m_opme.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_opme.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_opme.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -61,7 +62,7 @@
   mod_del_cmd(&opme_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_opme.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_pong.c
===================================================================
--- modules/m_pong.c	(.../1.0.1)	(revision 183)
+++ modules/m_pong.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_pong.c 503 2006-03-03 19:53:47Z michael $
+ *  $Id$
+ *  $Hybrid: m_pong.c 503 2006-03-03 19:53:47Z michael $
  */
 
 #include "stdinc.h"
@@ -57,7 +58,7 @@
   mod_del_cmd(&pong_msgtab);
 }
 
-const char *_version = "$Revision: 503 $";
+const char *_version = "$Revision$";
 #endif
 
 static void

Property changes on: modules/m_pong.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_close.c
===================================================================
--- modules/m_close.c	(.../1.0.1)	(revision 183)
+++ modules/m_close.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_close.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_close.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -54,7 +55,7 @@
   mod_del_cmd(&close_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_close.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_capab.c
===================================================================
--- modules/m_capab.c	(.../1.0.1)	(revision 183)
+++ modules/m_capab.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_capab.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_capab.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -52,7 +53,7 @@
   mod_del_cmd(&capab_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_capab.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_whowas.c
===================================================================
--- modules/m_whowas.c	(.../1.0.1)	(revision 183)
+++ modules/m_whowas.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whowas.c 269 2005-11-14 19:39:09Z adx $
+ *  $Id$
+ *  $Hybrid: m_whowas.c 269 2005-11-14 19:39:09Z adx $
  */
 
 #include "stdinc.h"
@@ -63,7 +64,7 @@
   mod_del_cmd(&whowas_msgtab);
 }
 
-const char *_version = "$Revision: 269 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_whowas.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_lusers.c
===================================================================
--- modules/m_lusers.c	(.../1.0.1)	(revision 183)
+++ modules/m_lusers.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_lusers.c 269 2005-11-14 19:39:09Z adx $
+ *  $Id$
+ *  $Hybrid: m_lusers.c 269 2005-11-14 19:39:09Z adx $
  */
 
 #include "stdinc.h"
@@ -58,7 +59,7 @@
   mod_del_cmd(&lusers_msgtab);
 }
 
-const char *_version = "$Revision: 269 $";
+const char *_version = "$Revision$";
 #endif
 /* m_lusers - LUSERS message handler
  * parv[0] = sender

Property changes on: modules/m_lusers.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: modules/m_user.c
===================================================================
--- modules/m_user.c	(.../1.0.1)	(revision 183)
+++ modules/m_user.c	(.../1.0.2)	(revision 183)
@@ -19,7 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_user.c 33 2005-10-02 20:50:00Z knight $
+ *  $Id$
+ *  $Hybrid: m_user.c 33 2005-10-02 20:50:00Z knight $
  */
 
 #include "stdinc.h"
@@ -56,7 +57,7 @@
   mod_del_cmd(&user_msgtab);
 }
 
-const char *_version = "$Revision: 33 $";
+const char *_version = "$Revision$";
 #endif
 
 /*

Property changes on: modules/m_user.c
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: etc/example.efnet.conf
===================================================================
--- etc/example.efnet.conf	(.../1.0.1)	(revision 183)
+++ etc/example.efnet.conf	(.../1.0.2)	(revision 183)
@@ -1,1337 +0,0 @@
-/* doc/example.efnet.conf - ircd-hybrid-7 EFnet Example configuration file
- * Copyright (C) 2000-2006 Hybrid Development Team
- *
- * Written by ejb, wcampbel, db, leeh and others
- * Other example configurations can be found in the source dir under
- * etc/.
- *
- * $Id: example.efnet.conf 853 2007-02-22 06:01:30Z db $
- */
-
-/* IMPORTANT NOTES:
- *
- * auth {} blocks MUST be specified in order of precedence.  The first one
- * that matches a user will be used.  So place spoofs first, then specials,
- * then general access.
- *
- * Shell style (#), C++ style (//) and C style comments are supported.
- *
- * Files may be included by either:
- *        .include "filename"
- *        .include <filename>
- *
- * Times/durations are written as:
- *        12 hours 30 minutes 1 second
- *        
- * Valid units of time:
- *        month, week, day, hour, minute, second
- *
- * Valid units of size:
- *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte
- *
- * Sizes and times may be singular or plural.  
- */ 
-
-/* EFNET NOTE:
- *
- * This configuration file is a BASIC configuration file for use
- * on EFnet.  You MUST still take the time to set this file up
- * properly.
- *
- * DISCLAIMER: This file was submitted by Disciple@EFnet and has
- *             since been modified by the Hybrid team.
- */
- 
-/*
- * serverinfo {}:  contains information about the server. (OLD M:)
- */
-serverinfo {
-	/*
-	 * name: the name of our server.  This cannot be changed at runtime.
-	 */
-	name = "efnet.irc";
-
-	/*
-	 * sid: a server's unique ID.  This is three characters long and must
-	 * be in the form [0-9][A-Z0-9][A-Z0-9].  The first character must be
-	 * a digit, followed by 2 alpha-numerical letters.
-	 * NOTE: The letters must be capitalized.  This cannot be changed at runtime.
-	 */
-	sid = "_CHANGE_ME_";
-
-	/*
-	 * description: the description of the server.  '[' and ']' may not
-	 * be used here for compatibility with older servers.
-	 */
-	description = "hybrid-7 test server";
-
-	/*
-	 * network info: the name and description of the network this server
-	 * is on.  Shown in the 005 reply and used with serverhiding.
-	 */
-	network_name = "EFnet";
-	network_desc = "Eris Free Network";
-
-	/*
-	 * hub: allow this server to act as a hub and have multiple servers
-	 * connected to it.  This may not be changed if there are active
-	 * LazyLink servers.
-	 */
-	hub = no;
-
-	/*
-	 * vhost: the IP to bind to when we connect outward to ipv4 servers.
-	 * This should be an ipv4 IP only, or "* for INADDR_ANY.
-	 */
-	#vhost = "192.169.0.1";
-
-	/*
-	 * vhost6: the IP to bind to when we connect outward to ipv6 servers.
-	 * This should be an ipv6 IP only, or "* for INADDR_ANY.
-	 */
-	#vhost6 = "3ffe:80e8:546::2";
-
-	/* max_clients: the maximum number of clients allowed to connect */
-	max_clients = 512;
-
-	/*
-	 * rsa key: the path to the file containing our rsa key for cryptlink.
-	 *
-	 * Example command to store a 2048 bit RSA keypair in
-	 * rsa.key, and the public key in rsa.pub:
-	 * 
-	 * 	openssl genrsa -out rsa.key 2048
-	 *	openssl rsa -in rsa.key -pubout -out rsa.pub
-	 *	chown <ircd-user>.<ircd.group> rsa.key rsa.pub
-	 *	chmod 0600 rsa.key
-	 *	chmod 0644 rsa.pub
-	 */
-	#rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
-};
-
-/*
- * admin {}:  contains admin information about the server. (OLD A:)
- */
-admin {
-	name = "EFnet Admin";
-	description = "Main Server Administrator";
-	email = "<irc-admin@efnet.irc>";
-};
-
-/*
- * log {}:  contains information about logfiles.
- */
-log {
-	/* Do you want to enable logging to ircd.log? */
-	use_logging = yes;
-
-	/*
-	 * logfiles: the logfiles to use for user connects, /oper uses,
-	 * and failed /oper.  These files must exist for logging to be used.
-	 */
-	fname_userlog = "logs/userlog";
-	fname_operlog = "logs/operlog";
-	fname_killlog = "logs/kill";
-	fname_klinelog = "logs/kline";
-	fname_glinelog = "logs/gline";
-
-	/*
-	 * log_level: the amount of detail to log in ircd.log.  The
-	 * higher, the more information is logged.  May be changed
-	 * once the server is running via /quote SET LOG.  Either:
-	 * L_CRIT, L_ERROR, L_WARN, L_NOTICE, L_TRACE, L_INFO or L_DEBUG
-	 */
-	log_level = L_INFO;
-};
-
-/*
- * class {}:  contains information about classes for users (OLD Y:)
- */
-class {
-	/* name: the name of the class.  classes are text now */
-	name = "users";
-
-	/*
-	 * ping_time: how often a client must reply to a PING from the
-	 * server before they are dropped.
-	 */
-	ping_time = 90 seconds;
-
-	/*
-	 * number_per_ip: how many local users are allowed to connect
-	 * from one IP  (optional)
-	 */
-	number_per_ip = 2;
-
-	/*
-	 * max_local: how many local users are allowed to connect
-	 * from one ident@host  (optional)
-	 */
-	max_local = 2;
-
-	/*
-	 * max_global: network-wide limit of users per ident@host  (optional)
-	 */
-	max_global = 10;
-
-	/*
-	 * max_number: the maximum number of users allowed in this class (optional)
-	 */
-	max_number = 100;
-
-	/*
-	 * the following lines are optional and allow you to define
-	 * how many users can connect from one /NN subnet
-	 */
-	cidr_bitlen_ipv4 = 24;
-	cidr_bitlen_ipv6 = 120;
-	number_per_cidr = 16;
-
-	/*
-	 * sendq: the amount of data allowed in a clients queue before
-	 * they are dropped.
-	 */
-	sendq = 100 kbytes;
-};
-
-class {
-	name = "opers";
-
-	/*
-	 * contrary to seeming popular belief, setting ping time
-	 * higher for an oper is NOT doing them a favor.
-	 * Since if a link is dead its dead and it means
-	 * you have to use another nick long enough to kill the old one :-)
-	 * Its much better to use a fairly standard 90 second ping time
-	 */
-	ping_time = 90 seconds;
-	number_per_ip = 10;
-	max_number = 100;
-	sendq = 1 mbyte;
-};
-
-class {
-	name = "server";
-
-	/*
-	 * Same thing here.  It's a fallacy to think increasing
-	 * ping time for servers is a "good idea."  All it leads to
-	 * is "ghosting" on one end. Not a good idea.
-	 */
-	ping_time = 90 seconds;
-
-	/*
-	 * ping_warning: how fast a server must reply to a PING before
-	 * a warning to opers is generated.
-	 */
-	ping_warning = 15 seconds;
-
-	/*
-	 * connectfreq: only used in server classes.  Specifies the delay
-	 * between autoconnecting to servers.
-	 *
-	 * Both comstud and I recommend 10 minutes a few years ago.
-	 * 15 minutes might be right now.  The reason you don't want it too
-	 * low is, you make the servers reconnect too quickly with
-	 * a large sendq, and they _will_ nick collide. badly. 5 minutes
-	 * IS way too short.
-	 */
-	connectfreq = 15 minutes;
-
-	/* max number: the amount of servers to autoconnect to */
-	max_number = 1;
-
-	/* sendq: servers need a higher sendq as they send more data */
-	sendq = 15 megabytes;
-};
-
-/*
- * listen {}:  contains information about the ports ircd listens on (OLD P:)
- */
-listen {
-	/*
-	 * port: the specific port to listen on.  If no host is specified
-	 * before, it will listen on all available IPs.
-	 *
-	 * Ports are separated via a comma, a range may be specified using ".."
-	 */
-	
-	/* port: listen on all available IPs, ports 6665 to 6669 */
-	port = 6665 .. 6669;
-
-	/*
-	 * Listen on 192.168.0.1/7023 and hidden from STATS P
-	 * unless you are an administrator.
-	 *
-	 * NOTE: The "flags" directive has to come before "port".  Always!
-	 */
-	flags = hidden;
-	host = "192.168.0.1";
-	port = 7023;
-
-	/*
-	 * host: set a specific IP/host the ports after the line will listen 
-	 * on.  This may be ipv4 or ipv6.
-	 */
-	host = "1.2.3.4";
-	port = 7000, 7001;
-
-	host = "3ffe:1234:a:b:c::d";
-	port = 7002;
-};
-
-/*
- * auth {}:  allow users to connect to the ircd (OLD I:)
- */
-auth {
-	/*
-	 * user: the user@host allowed to connect.  Multiple IPv4/IPv6 user 
-	 * lines are permitted per auth block.
-	 */
-	user = "*@172.16.0.0/12";
-	user = "*test@123D:B567:*";
-
-	/* password: an optional password that is required to use this block */
-	password = "letmein";
-
-	/*
-	 * encrypted: controls whether the auth password above has been
-	 * encrypted.
-	 */
-	encrypted = yes;
-
-	/*
-	 * spoof: fake the users host to this.  This is free-form,
-	 * just do everyone a favor and don't abuse it. ('=' prefix on /stats I)
-	 */
-	spoof = "I.still.hate.packets";
-
-	/* class: the class the user is placed in */
-	class = "opers";
-
-	/*
-	 * need_password: don't allow users who haven't supplied the correct
-	 *                password to connect using another auth{} block
-	 *                ('&' prefix on /stats I if disabled)
-	 * need_ident:    require the user to have identd to connect ('+' prefix on /stats I)
-	 * spoof_notice:  enable spoofing notification to admins
-	 * exceed_limit:  allow a user to exceed class limits ('>' prefix on /stats I)
-	 * kline_exempt:  exempt this user from k/glines ('^' prefix on /stats I)
-	 * gline_exempt:  exempt this user from glines ('_' prefix on /stats I)
-	 * resv_exempt:   exempt this user from resvs ('$' prefix on /stats I)
-	 * no_tilde:      remove ~ from a user with no ident ('-' prefix on /stats I)
-	 * can_flood:     allow this user to exceed flood limits ('|' prefix on /stats I)
-	 * can_idle:      exempt this user from idle restrictions ('<' prefix on /stats I)
-	 */
-	flags = need_password, spoof_notice, exceed_limit, kline_exempt,
-		gline_exempt, resv_exempt, no_tilde, can_flood, can_idle;
-};
-
-auth {
-	/*
-	 * redirect: the server and port to redirect a user to.  A user does
-	 * not have to obey the redirection, the ircd just suggests an alternative
-	 * server for them.
-	 */
-	redirserv = "this.is.not.a.real.server";
-	redirport = 6667;
-	
-	user = "*.server";
-
-	/* class: a class is required even though it is not used */
-	class = "users";
-};
-
-auth {
-	user = "*@*";
-	class = "users";
-	flags = need_ident;
-};
-
-/*
- * operator {}:  defines ircd operators. (OLD O:)
- *
- * ircd-hybrid no longer supports local operators, privileges are
- * controlled via flags.
- */
-operator {
-	/* name: the name of the oper */
-	/* NOTE: operator "opername"{} is also supported */
-	name = "god";
-
-	/*
-	 * user: the user@host required for this operator.  CIDR is not
-	 * supported.  Multiple user="" lines are supported.
-	 */
-	user = "*god@*";
-	user = "*@127.0.0.1";
-
-	/*
-	 * password: the password required to oper.  By default this will
-	 * need to be encrypted using 'mkpasswd'.  MD5 is supported.
-	 */
-	password = "etcnjl8juSU1E";
-
-	/*
-	 * encrypted: controls whether the oper password above has been
-	 * encrypted.  (OLD CRYPT_OPER_PASSWORD now optional per operator)
-	 */
-	encrypted = yes;
-
-	/*
-	 * rsa_public_key_file: the public key for this oper when using Challenge.
-	 * A password should not be defined when this is used, see 
-	 * doc/challenge.txt for more information.
-	 */
-#	rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
-
-	/* class: the class the oper joins when they successfully /oper */
-	class = "opers";
-
-	/*
-	 * umodes: default usermodes opers get when they /oper.  If defined,
-	 * it will override oper_umodes settings in general {}.
-	 * Available usermodes:
-	 *
-	 * +b - bots         - See bot and drone flooding notices
-	 * +c - cconn        - Client connection/quit notices
-	 * +C - cconn_full   - Client connection/quit notices full
-	 * +D - deaf         - Don't receive channel messages
-	 * +d - debug        - See debugging notices
-	 * +f - full         - See I: line full notices
-	 * +G - softcallerid - Server Side Ignore for users not on your channels
-	 * +g - callerid     - Server Side Ignore (for privmsgs etc)
-	 * +i - invisible    - Not shown in NAMES or WHO unless you share a
-	 *                     a channel
-	 * +k - skill        - See server generated KILL messages
-	 * +l - locops       - See LOCOPS messages
-	 * +n - nchange      - See client nick changes
-	 * +r - rej          - See rejected client notices
-	 * +s - servnotice   - See general server notices
-	 * +u - unauth       - See unauthorized client notices
-	 * +w - wallop       - See server generated WALLOPS
-	 * +x - external     - See remote server connection and split notices
-	 * +y - spy          - See LINKS, STATS, TRACE notices etc.
-	 * +z - operwall     - See oper generated WALLOPS
-	 */
-#	umodes = locops, servnotice, operwall, wallop;
-
-	/*
-	 * privileges: controls the activities and commands an oper is 
-	 * allowed to do on the server.  All options default to no.
-	 * Available options:
-	 *
-	 * global_kill:  allows remote users to be /KILL'd (OLD 'O' flag)
-	 * remote:       allows remote SQUIT and CONNECT   (OLD 'R' flag)
-	 * remoteban:    allows remote KLINE/UNKLINE
-	 * kline:        allows KILL, KLINE and DLINE      (OLD 'K' flag)
-	 * unkline:      allows UNKLINE and UNDLINE        (OLD 'U' flag)
-	 * gline:        allows GLINE                      (OLD 'G' flag)
-	 * xline:         allows XLINE                     (OLD 'X' flag)
-	 * operwall:     allows OPERWALL
-	 * nick_changes: allows oper to see nickchanges    (OLD 'N' flag)
-	 *               via usermode +n
-	 * rehash:       allows oper to REHASH config      (OLD 'H' flag)
-	 * die:          allows DIE and RESTART            (OLD 'D' flag)
-	 * admin:        gives admin privileges.  admins
-	 *               may (un)load modules and see the
-	 *               real IPs of servers.
-	 * hidden_admin: same as 'admin', but noone can recognize you as
-	 *               being an admin
-	 * hidden_oper:  not shown in /stats p (except for other operators)
-	 */
-	/* You can either use
-	 * die = yes;
-	 * rehash = yes;
-	 *
-	 * or in a flags statement i.e.
-	 * flags = die, rehash;
-	 *
-	 * You can also negate a flag with ~ i.e.
-	 * flags = ~remote;
-	 *
-	 */
-	flags = global_kill, remote, kline, unkline, xline,
-		die, rehash, nick_changes, admin, operwall;
-};
-
-/*
- * connect {}:  controls servers we connect to (OLD C:, N:, H:, L:)
- */
-connect {
-	/* name: the name of the server */
-	name = "irc.uplink.com";
-
-	/*
-	 * host: the host or IP to connect to.  If a hostname is used it
-	 * must match the reverse dns of the server.
-	 */
-	host = "192.168.0.1";
-
-	/*
-	 * vhost: the IP to bind to when we connect outward to servers.
-	 * serverinfo::vhost and serverinfo::vhost6 will be overridden
-	 * by this directive.
-	 */
-	vhost = "192.168.0.2";
-
-	/*
-	 * passwords: the passwords we send (OLD C:) and accept (OLD N:).
-	 * The remote server will have these passwords reversed.
-	 */
-	send_password = "password";
-	accept_password = "anotherpassword";
-
-	/*
-	 * encrypted: controls whether the accept_password above has been
-	 * encrypted.  (OLD CRYPT_LINK_PASSWORD now optional per connect)
-	 */
-	encrypted = no;
-
-	/* port: the port to connect to this server on */
-	port = 6666;
-
-	/*
-	 * hub_mask: the mask of servers that this server may hub.  Multiple
-	 * entries are permitted
-	 */
-	hub_mask = "*";
-
-	/*
-	 * leaf_mask: the mask of servers this server may not hub.  Multiple
-	 * entries are permitted.  Useful for forbidding EU -> US -> EU routes.
-	 */
-#	leaf_mask = "*.uk";
-
-	/* fakename: the servername we pretend to be when we connect */
-#	fakename = "*.arpa";
-
-	/* class: the class this server is in */
-	class = "server";
-
-	/*
-	 * autoconn:    controls whether we autoconnect to this server or not,
-	 *              dependent on class limits.  By default, this is disabled.
-	 * compressed:  controls whether traffic is compressed via ziplinks.
-	 *              By default, this is disabled
-	 * lazylink:    controls whether this server is a LazyLink.  LazyLink 
-	 *              servers may NOT hub.  See doc/LazyLinks.txt
-	 *
-	 *              EFnet Note:  With this enabled, you download a connect burst
-	 *                           as it is needed, instead of all at once.  This
-	 *                           could allow servers on much smaller lines (T1s)
-	 *                           to link a server. It also could allow a server
-	 *                           on a DoS'ed link to stay connected.
-	 *                           This makes client servers
-	 *                           cheaper to run.  EFnet needs more client servers.
-	 *
-	 * cryptlink:   enable full encryption for all data passing between our
-	 *              server and this link and rsa authentication.
-	 * burst_away:  This will send the /away string that users have set
-	 *              on the server burst.  Note this can be a lot of data
-	 *              and slow down your server burst.
-	 * topicburst:  Send topics to this server during channel burst.  Works
-	 *              only if the server we are connecting to is capable
-	 *              of TBURST/TB.
-	 */
-#	flags = autoconn, lazylink, compressed, cryptlink, burst_away, topicburst;
-};
-
-connect {
-	name = "encrypted.auth.example";
-	host = "some.host.somewhere";
-	port = 6667;
-
-	flags = cryptlink;
-
-	/*
-	 * rsa_public_key_file: the path to the public keyfile of the server.
-	 * Used instead of passwords.
-	 */
-	rsa_public_key_file = "etc/remote.server.keyfile";
-
-	/*
-	 * cipher preference: set the preferred cipher for this link
-	 *
-	 * Available ciphers are:
-	 *      BF/168 BF/128 CAST/128 IDEA/128 RC5.16/128 
-	 *      RC5.12/128 RC5.8/128 3DES/168 DES/56
-	 *
-	 * NOTE:  Some ciphers may not be supported by your OpenSSL.
-	 *        Check the output from 'configure' for available ciphers.
-	 * 
-	 * NOTE2: To help you decide what cipher to use, tools/encspeed
-	 *        will show you approximately how fast each cipher is.
-	 *        However, blowfish is fast and secure, and is probably
-	 *        a good default for most situations.
-	 *
-	 * NOTE3: Default if none is set is BF/128
-	 *
-	 * The cipher *MUST* be the same in both directions.  If you
-	 * set a cipher preference, your uplink must set the same cipher,
-	 * else it will not link.
-	 */
-#	cipher_preference = "BF/168";
-};
-
-/*
- * NOTE: Don't add an extra 'name=' entry if you use
- * the connect "name"{} feature
- */
-connect "ipv6.some.server" {
-	host = "3ffd:dead:beef::1";
-	send_password = "password";
-	accept_password = "password";
-	port = 6666;
-
-	/*
-	 * aftype: controls whether the connection uses "ipv4" or "ipv6".
-	 * Default is ipv4.
-	 */
-	aftype = ipv6;
-	class = "server";
-};
-
-/*
- * cluster {}:  servers that share klines/unkline/xline/unxline/resv/unresv/locops
- * automatically (OLD hyb6 SLAVE_SERVERS)
- */
-cluster {
-	/*
-	 * name: the server to share with, this can take wildcards
-	 *
-	 * NOTE: only local actions will be clustered, meaning if
-	 *       the server receives a shared kline/unkline/etc, it
-	 *       will not be propagated to clustered servers.
-	 *
-	 *       Remote servers are not necessarily required to accept
-	 *       clustered lines, they need a shared{} for *THIS* server
-	 *       in order to accept them.
-	 */
-	name = "*.arpa";
-
-	/*
-	 * type: list of what to share, options are as follows:
-	 *	kline	- share klines
-	 *	tkline	- share temporary klines
-	 * 	unkline	- share unklines
-	 * 	xline	- share xlines
-	 * 	txline	- share temporary xlines
-	 * 	unxline	- share unxlines
-	 * 	resv	- share resvs
-	 * 	tresv	- share temporary resvs
-	 *	unresv	- share unresvs
-	 *	locops	- share locops
-	 *	all	- share all of the above (default)
-	 */
-	type = kline, unkline, locops, xline, resv;
-};
-
-/*
- * shared {}: users that are allowed to remote kline (OLD U:)
- *
- * NOTE: This can be effectively used for remote klines.
- *       Please note that there is no password authentication
- *       for users setting remote klines.  You must also be
- *       /oper'd in order to issue a remote kline.
- */
-shared {
-	/*
-	 * name: the server the user must be on to set klines.  If this is not
-	 * specified, the user will be allowed to kline from all servers.
-	 */
-	name = "irc2.some.server";
-
-	/*
-	 * user: the user@host mask that is allowed to set klines.  If this is
-	 * not specified, all users on the server above will be allowed to set
-	 * a remote kline.
-	 */
-	user = "oper@my.host.is.spoofed";
-
-	/*
-	 * type: list of what to share, options are as follows:
-	 *	kline	- allow oper/server to kline
-	 *	tkline	- allow temporary klines
-	 *	unkline	- allow oper/server to unkline
-	 *	xline	- allow oper/server to xline
-	 * 	txline	- allow temporary xlines
-	 *	unxline	- allow oper/server to unxline
-	 *	resv	- allow oper/server to resv
-	 * 	tresv	- allow temporary resvs
-	 *	unresv	- allow oper/server to unresv
-	 *      locops  - allow oper/server to locops - only used for servers that cluster
-	 *	all	- allow oper/server to do all of the above (default)
-	 */
-	type = kline, unkline, resv;
-};
-
-/*
- * kill {}:  users that are not allowed to connect (OLD K:)
- * Oper issued klines will be added to the specified kline config
- */
-kill {
-	user = "bad@*.hacked.edu";
-	reason = "Obviously hacked account";
-};
-
-kill {
-	user = "^O[[:alpha:]]?[[:digit:]]+(x\.o|\.xo)$@^[[:alnum:]]{4}\.evilnet.org$";
-	type = regex;
-};
-
-/*
- * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
- * Oper issued dlines will be added to the specified dline config
- */
-deny {
-	ip = "10.0.1.0/24";
-	reason = "Reconnecting vhosted bots";
-};
-
-/*
- * exempt {}: IPs that are exempt from deny {} and Dlines. (OLD d:)
- *
- * EFnet Note: We really suggest to enable general::stats_e_disabled
- * if you plan to exempt EFnet server IPs you don't want to show to
- * other operators and/or administrators through "STATS e".
- */
-exempt {
-	ip = "192.168.0.0/16";
-};
-
-/*
- * resv {}:  nicks and channels users may not use/join (OLD Q:)
- */
-resv {
-	/* reason: the reason for the proceeding resv's */
-	reason = "There are no services on this network";
-
-	/* resv: the nicks and channels users may not join/use */
-	nick = "nickserv";
-	nick = "chanserv";
-	nick = "operserv";
-	nick = "JUPES";
-	nick = "JUPE";
-	nick = "CH?NF?X";               # CHANFIX (services.int)
-
-	/* These are totally optional, but may be a good idea */
-	nick = "oper";
-	nick = "ircop";
-	nick = "op";
-	nick = "ident";
-	nick = "pass";
-	channel = "#jupedchan";
-
-	/* resv: wildcard masks are also supported in nicks only */
-	reason = "Clone bots";
-	nick = "clone*";
-};
-
-/*
- * gecos {}:  The X: replacement, used for banning users based on
- * their "realname".
- */
-gecos {
-	name = "*sex*";
-	reason = "Possible spambot";
-};
-
-gecos {
-	name = "sub7server";
-	reason = "Trojan drone";
-};
-
-gecos {
-	name = "*http*";
-	reason = "Spambot";
-};
-
-gecos {
-	name = "^\[J[0o]hn Do[3e]\]-[0-9]{2,5}$";
-	type = regex;
-};
-
-/*
- * channel {}:  The channel block contains options pertaining to channels
- */
-channel {
-	/*
-	 * disable_fake_channels: this option, if set to 'yes', will
-	 * disallow clients to create or join channels that have one
-	 * of the following ASCII characters in their name:
-	 *
-	 *   2 | bold
-	 *   3 | mirc color
-	 *  15 | plain text
-	 *  22 | reverse
-	 *  31 | underline
-	 * 160 | non-breaking space
-	 */
-	disable_fake_channels = yes;
-
-	/*
-	 * restrict_channels: reverse channel RESVs logic, only reserved
-	 * channels are allowed
-	 */
-	restrict_channels = no;
-
-	/*
-	 * disable_local_channels: prevent users from joining &channels.
-	 */
-	disable_local_channels = no;
-
-	/*
-	 * use_invex: Enable/disable channel mode +I, a n!u@h list of masks
-	 * that can join a +i channel without an invite.
-	 */
-	use_invex = yes;
-
-	/*
-	 * use_except: Enable/disable channel mode +e, a n!u@h list of masks
-	 * that can join a channel through a ban (+b).
-	 */
-	use_except = yes;
-
-	/*
-	 * use_knock: Allows users to request an invite to a channel that
-	 * is locked somehow (+ikl).  If the channel is +p or you are banned
-	 * the knock will not be sent.
-	 *
-	 * EFnet Note:  This seems to be used mostly by European servers
-	 *              and not North American ones.
-	 *              Please feel free to disable this if you do not
-	 *              want to run channel knock.
-	 *              channel knock allows an user to "/quote knock #channel"
-	 *              to ask for an invite.  It is typically used in eu-efnet
-	 *              to ask for an invite to #eu-opers.
-	 *              A user who is banned will not have their knock
-	 *              sent to channel.  It is paced, so knock will not
-	 *              cause a flood.
-	 */
-	use_knock = yes;
-
-	/*
-	 * knock_delay: The amount of time a user must wait between issuing
-	 * the knock command.
-	 */
-	knock_delay = 1 minutes;
-
-	/*
-	 * knock_delay_channel: How often a knock to any specific channel
-	 * is permitted, regardless of the user sending the knock.
-	 */
-	knock_delay_channel = 1 minute;
-
-	/*
-	 * burst_topicwho: enable sending of who set topic on topicburst
-	 * default is yes
-	 */
-	burst_topicwho = yes;
-
-	/*
-	 * max_chans_per_user: The maximum number of channels a user can
-	 * join/be on.
-	 */
-	max_chans_per_user = 25;
-
-	/* quiet_on_ban: stop banned people talking in channels. */
-	quiet_on_ban = yes;
-
-	/* max_bans: maximum number of +b/e/I modes in a channel */
-	max_bans = 100;
-
-	/*
-	 * how many joins in how many seconds constitute a flood, use 0 to
-	 * disable. +b opers will be notified (changeable via /set)
-	 */
-	join_flood_count = 16;
-	join_flood_time = 8 seconds;
-
-	/*
-	 * splitcode: The ircd will now check splitmode every few seconds.
-	 *
-	 * Either split users or split servers can activate splitmode, but
-	 * both conditions must be met for the ircd to deactivate splitmode.
-	 * 
-	 * You may force splitmode to be permanent by /quote set splitmode on
-	 */
-
-	/*
-	 * default_split_user_count: when the usercount is lower than this level,
-	 * consider ourselves split.  This must be set for automatic splitmode.
-	 */
-	default_split_user_count = 40000;
-
-	/*
-	 * default_split_server_count: when the servercount is lower than this,
-	 * consider ourselves split.  This must be set for automatic splitmode.
-	 */
-	default_split_server_count = 10;
-
-	/* split no create: disallow users creating channels on split. */
-	no_create_on_split = yes;
-
-	/* split: no join: disallow users joining channels at all on a split */
-	no_join_on_split = no;
-};
-
-/*
- * serverhide {}:  The serverhide block contains the options regarding
- * serverhiding
- */
-serverhide {
-	/*
-	 * flatten_links: this option will show all servers in /links appear
-	 * that they are linked to this current server
-	 *
-	 * EFnet Note:  While this is not a requirement on EFnet, it
-	 *              may be a good idea.  Except, it's useless
-	 *              unless the entire net runs it.
-	 */
-	flatten_links = yes;
-
-	/*
-	 * links_delay: how often to update the links file when it is
-	 * flattened.
-	 */
-	links_delay = 5 minutes;
-
-	/*
-	 * hidden: hide this server from a /links output on servers that
-	 * support it.  This allows hub servers to be hidden etc.
-	 */
-	hidden = no;
-
-	/*
-	 * disable_hidden: prevent servers hiding themselves from a
-	 * /links output.
-	 */
-	disable_hidden = no;
-
-	/*
-	 * hide_servers: hide remote servernames everywhere and instead use
-	 * hidden_name and network_desc.
-	 */
-	hide_servers = no;
-
-	/*
-	 * Use this as the servername users see if hide_servers = yes.
-	 */
-	hidden_name = "*.hidden.com";
-
-	/*
-	 * hide_server_ips: If this is disabled, opers will be unable to see servers
-	 * ips and will be shown a masked ip, admins will be shown the real ip.
-	 *
-	 * If this is enabled, nobody can see a servers ip.  *This is a kludge*, it
-	 * has the side effect of hiding the ips everywhere, including logfiles.
-	 *
-	 * We recommend you leave this disabled, and just take care with who you
-	 * give admin=yes; to.
-	 */
-	hide_server_ips = yes;
-};
-
-/*
- * general {}:  The general block contains many of the options that were once
- * compiled in options in config.h.  The general block is read at start time.
- */
-general {
-	/*
-	 * gline_min_cidr: the minimum required length of a CIDR bitmask
-	 * for IPv4 based glines
-	 */
-	gline_min_cidr = 16;
-
-	/*
-	 * gline_min_cidr6: the minimum required length of a CIDR bitmask
-	 * for IPv6 based glines
-	 */
-	gline_min_cidr6 = 48;
-
-	/*
-	 * Whether to automatically set mode +i on connecting users.
-	 */
-	invisible_on_connect = yes;
-
-	/*
-	 * If you don't explicitly specify burst_away in your connect blocks, then
-	 * they will default to the burst_away value below.
-	 */
-	burst_away = no;
-
-	/*
-	 * Show "actually using host <ip>" on /whois when possible.
-	 */
-	use_whois_actually = yes;
-
-	/*
-	 * Max time from the nickname change that still causes KILL
-	 * automatically to switch for the current nick of that user. (seconds)
-	 */
-	kill_chase_time_limit = 90;
-
-	/*
-	 * If hide_spoof_ips is disabled, opers will be allowed to see the real IP of spoofed
-	 * users in /trace etc.  If this is defined they will be shown a masked IP.
-	 */
-	hide_spoof_ips = yes;
-
-	/*
-	 * Ignore bogus timestamps from other servers.  Yes, this will desync
-	 * the network, but it will allow chanops to resync with a valid non TS 0
-	 *
-	 * This should be enabled network wide, or not at all.
-	 */
-	ignore_bogus_ts = no;
-
-	/*
-	 * disable_auth: completely disable ident lookups; if you enable this,
-	 * be careful of what you set need_ident to in your auth {} blocks
-	 */
-	disable_auth = no;
-
-	/* disable_remote_commands: disable users doing commands on remote servers */
-	disable_remote_commands = no;
-
-	/*
-	 * tkline_expire_notices: enables or disables temporary kline/xline
-	 * expire notices.
-	 */
-	tkline_expire_notices = no;
-
-	/*
-	 * default_floodcount: the default value of floodcount that is configurable
-	 * via /quote set floodcount.  This is the amount of lines a user
-	 * may send to any other user/channel in one second.
-	 */
-	default_floodcount = 10;
-
-	/*
-	 * failed_oper_notice: send a notice to all opers on the server when 
-	 * someone tries to OPER and uses the wrong password, host or ident.
-	 */
-	failed_oper_notice = yes;
-
-	/*
-	 * dots_in_ident: the amount of '.' characters permitted in an ident
-	 * reply before the user is rejected.
-	 */
-	dots_in_ident = 0;
-
-	/*
-	 * dot_in_ip6_addr: ircd-hybrid-6.0 and earlier will disallow hosts 
-	 * without a '.' in them.  This will add one to the end.  Only needed
-	 * for older servers.
-	 */
-	dot_in_ip6_addr = no;
-
-	/*
-	 * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
-	 * placed via the server.  klines hand placed are exempt from limits.
-	 * wildcard chars: '.' ':' '*' '?' '@' '!' '#'
-	 */
-	min_nonwildcard = 3;
-
-	/*
-	 * min_nonwildcard_simple: the minimum non wildcard characters in 
-	 * gecos bans.  wildcard chars: '*' '?' '#'
-	 */
-	min_nonwildcard_simple = 3;
-
-	/* max_accept: maximum allowed /accept's for +g usermode */
-	max_accept = 20;
-
-	/* anti_nick_flood: enable the nickflood control code */
-	anti_nick_flood = yes;
-
-	/* nick flood: the nick changes allowed in the specified period */
-	max_nick_time = 20 seconds;
-	max_nick_changes = 5;
-
-	/*
-	 * anti_spam_exit_message_time: the minimum time a user must be connected
-	 * before custom quit messages are allowed.
-	 */
-	anti_spam_exit_message_time = 5 minutes;
-
-	/*
-	 * ts delta: the time delta allowed between server clocks before
-	 * a warning is given, or before the link is dropped.  all servers
-	 * should run ntpdate/rdate to keep clocks in sync
-	 */
-	ts_warn_delta = 30 seconds;
-	ts_max_delta = 5 minutes;
-
-	/*
-	 * kline_with_reason: show the user the reason why they are k/d/glined 
-	 * on exit.  May give away who set k/dline when set via tcm.
-	 */
-	kline_with_reason = yes;
-
-	/*
-	 * kline_reason: show this message to users on channel
-	 * instead of the oper reason.
-	 */
-	kline_reason = "Connection closed";
-
-	/*
-	 * reject_hold_time: wait this amount of time before disconnecting
-	 * a rejected client. Use 0 to disable.
-	 */
-	reject_hold_time = 30 seconds;
-
-	/*
-	 * warn_no_nline: warn opers about servers that try to connect but
-	 * we don't have a connect {} block for.  Twits with misconfigured 
-	 * servers can get really annoying with this enabled.
-	 */
-	warn_no_nline = yes;
-
-	/*
-	 * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
-	 * operators and administrators.  Doing so is a good idea in case
-	 * there are any exempted (exempt{}) server IPs you don't want to
-	 * see leaked.
-	 */
-	stats_e_disabled = no;
-
-	/* stats_o_oper only: make stats o (opers) oper only */
-	stats_o_oper_only = yes;
-
-	/* stats_P_oper_only: make stats P (ports) oper only */
-	stats_P_oper_only = yes;
-
-	/*
-	 * stats i oper only: make stats i (auth {}) oper only. set to:
-	 *     yes:    show users no auth blocks, made oper only.
-	 *     masked: show users first matching auth block
-	 *     no:     show users all auth blocks.
-	 */
-	stats_i_oper_only = yes;
-
-	/*
-	 * stats_k_oper_only: make stats k/K (klines) oper only.  set to:
-	 *     yes:    show users no auth blocks, made oper only
-	 *     masked: show users first matching auth block
-	 *     no:     show users all auth blocks.
-	 */
-	stats_k_oper_only = yes;
-
-	/*
-	 * caller_id_wait: time between notifying a +g user that somebody
-	 * is messaging them.
-	 */
-	caller_id_wait = 1 minute;
-
-	/*
-	 * opers_bypass_callerid: allows operators to bypass +g and message
-	 * anyone who has it set (useful if you use services).
-	 */
-	opers_bypass_callerid = no;
-
-	/*
-	 * pace_wait_simple: time between use of less intensive commands
-	 * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
-	 */
-	pace_wait_simple = 1 second;
-
-	/*
-	 * pace_wait: time between more intensive commands
-	 * (INFO, LINKS, LIST, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
-	 */
-	pace_wait = 10 seconds;
-
-	/*
-	 * short_motd: send clients a notice telling them to read the motd
-	 * instead of forcing a motd to clients who may simply ignore it.
-	 */
-	short_motd = no;
-
-	/*
-	 * ping_cookie: require clients to respond exactly to a ping command,
-	 * can help block certain types of drones and FTP PASV mode spoofing.
-	 */
-	ping_cookie = no;
-
-	/* no_oper_flood: increase flood limits for opers. */
-	no_oper_flood = yes;
-
-	/*
-	 * true_no_oper_flood: completely eliminate flood limits for opers
-	 * and for clients with can_flood = yes in their auth {} blocks
-	 */
-	true_no_oper_flood = yes;
-
-	/* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels */
-	oper_pass_resv = yes;
-
-	/*
-	 * idletime: the maximum amount of time a user may idle before
-	 * they are disconnected
-	 */
-	idletime = 0;
-
-	/* REMOVE ME.  The following line checks you've been reading. */
-	havent_read_conf = 1;
-
-	/*
-	 * max_targets: the maximum amount of targets in a single 
-	 * PRIVMSG/NOTICE.  Set to 999 NOT 0 for unlimited.
-	 */
-	max_targets = 4;
-
-	/*
-	 * client_flood: maximum amount of data in a clients queue before
-	 * they are dropped for flooding.
-	 */
-	client_flood = 2560 bytes;
-
-	/*
-	 * message_locale: the default message locale
-	 * Use "standard" for the compiled in defaults.
-	 * To install the translated messages, go into messages/ in the
-	 * source directory and run `make install'.
-	 */
-	message_locale = "standard";
-
-	/*
-	 * usermodes configurable: a list of usermodes for the options below
-	 *
-	 * +b - bots         - See bot and drone flooding notices
-	 * +c - cconn        - Client connection/quit notices
-	 * +C - cconn        - Client connection/quit notices full
-	 * +D - deaf         - Don't receive channel messages
-	 * +d - debug        - See debugging notices
-	 * +f - full         - See I: line full notices
-	 * +G - softcallerid - Server Side Ignore for users not on your channels
-	 * +g - callerid     - Server Side Ignore (for privmsgs etc)
-	 * +i - invisible    - Not shown in NAMES or WHO unless you share a 
-	 *                     a channel
-	 * +k - skill        - See server generated KILL messages
-	 * +l - locops       - See LOCOPS messages
-	 * +n - nchange      - See client nick changes
-	 * +r - rej          - See rejected client notices
-	 * +s - servnotice   - See general server notices
-	 * +u - unauth       - See unauthorized client notices
-	 * +w - wallop       - See server generated WALLOPS
-	 * +x - external     - See remote server connection and split notices
-	 * +y - spy          - See LINKS, STATS, TRACE notices etc.
-	 * +z - operwall     - See oper generated WALLOPS
-	 */
-
-	/* oper_only_umodes: usermodes only opers may set */
-	oper_only_umodes = bots, cconn, cconn_full, debug, full, skill,
-                           nchange, rej, spy, external, operwall,
-                           locops, unauth;
-
-	/* oper_umodes: default usermodes opers get when they /oper */
-	oper_umodes = bots, locops, servnotice, operwall, wallop;
-
-	/*
-	 * servlink_path: path to 'servlink' program used by ircd to handle
-	 * encrypted/compressed server <-> server links.
-	 *
-	 * only define if servlink is not in same directory as ircd itself.
-	 */
-	#servlink_path = "/usr/local/ircd/bin/servlink";
-
-	/*
-	 * default_cipher_preference: default cipher to use for cryptlink when none is
-	 * specified in connect block.
-	 */
-	#default_cipher_preference = "BF/168";
-
-	/*
-	 * use_egd: if your system does not have *random devices yet you
-	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-	 * EGD is *very* CPU intensive when gathering data for its pool
-	 */
-#	use_egd = yes;
-
-	/*
-	 * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
-	 * which automatically finds the path.
-	 */
-#	egdpool_path = "/var/run/egd-pool";
-
-
-	/*
-	 * compression_level: level of compression for compressed links between
-	 * servers.  
-	 *
-	 * values are between: 1 (least compression, fastest)
-	 *                and: 9 (most compression, slowest).
-	 */
-#	compression_level = 6;
-
-	/*
-	 * throttle_time: the minimum amount of time between connections from
-	 * the same ip.  exempt {} blocks are excluded from this throttling.
-	 * Offers protection against flooders who reconnect quickly.  
-	 * Set to 0 to disable.
-	 */
-	throttle_time = 0;
-};
-
-glines {
-	/*
-	 * EFnet Note: This feature is required for European EFnet servers
-	 *             and is used by several North American servers.  As
-	 *             such, it has been left on by default.  If you
-	 *             do not want your server to participate in G:Lines
-	 *             you should disable this.
-	 */
-
-	/* enable: enable glines, network wide temp klines */
-	enable = yes;
-
-	/*
-	 * duration: the amount of time a gline will remain on your
-	 * server before expiring
-	 */
-	duration = 1 day;
-
-	/*
-	 * logging: which types of rules you want to log when triggered
-	 * (choose reject or block)
-	 */
-	logging = reject, block;
-
-	/*
-	 * NOTE: gline ACLs can cause a desync of glines throughout the
-	 * network, meaning some servers may have a gline triggered, and
-	 * others may not. Also, you only need insert rules for glines
-	 * that you want to block and/or reject. If you want to accept and
-	 * propagate the gline, do NOT put a rule for it.
-	 */
-
-	/* user@host for rule to apply to */
-	user = "god@I.still.hate.packets";
-	/* server for rule to apply to */
-	name = "hades.arpa";
-
-	/*
-	 * action: action to take when a matching gline is found. options are:
-	 *  reject	- do not apply the gline locally
-	 *  block	- do not propagate the gline
-	 */
-	action = reject, block;
-
-	user = "god@*";
-	name = "*";
-	action = block;
-};
-
-modules {
-	/*
-	 * module path: other paths to search for modules specified below
-	 * and in /modload.
-	 */
-	path = "/usr/local/ircd/modules";
-	path = "/usr/local/ircd/modules/autoload";
-
-	/* module: the name of a module to load on startup/rehash */
-	#module = "some_module.so";
-};
Index: etc/example.conf
===================================================================
--- etc/example.conf	(.../1.0.1)	(revision 183)
+++ etc/example.conf	(.../1.0.2)	(revision 183)
@@ -5,7 +5,8 @@
  * Other example configurations can be found in the source dir under
  * etc/.
  *
- * $Id: example.conf 853 2007-02-22 06:01:30Z db $
+ * $Id$
+ * $Hybrid: example.conf 853 2007-02-22 06:01:30Z db $
  */
 
 /* IMPORTANT NOTES:
@@ -75,6 +76,12 @@
     */
     services_name = "services.my.net";
 
+    /*
+     * help_channel: sets the channel a user can JOIN and PRIVMSG to if
+     * they are CAPTURED (silenced)
+    */
+    help_channel = "#operhelp";
+
 	/*
 	 * hub: allow this server to act as a hub and have multiple servers
 	 * connected to it.  This may not be changed if there are active
@@ -441,6 +448,7 @@
 	 * hidden_admin: same as 'admin', but noone can recognize you as
 	 *               being an admin
 	 * hidden_oper:  not shown in /stats p (except for other operators)
+     * snoop:        can see invisible users and secret channels 
 	 */
 	/* You can either use
 	 * die = yes;
@@ -454,7 +462,7 @@
 	 *
 	 */
 	flags = global_kill, remote, kline, unkline, xline,
-		die, rehash, nick_changes, admin, operwall;
+		die, rehash, nick_changes, admin, operwall, snoop;
 };
 
 /*
@@ -1175,6 +1183,7 @@
 	 * +k - skill        - See server generated KILL messages
 	 * +l - locops       - See LOCOPS messages
 	 * +n - nchange      - See client nick changes
+     * +p - snoop        - See invisible users and secret channels (snoop operflag)
 	 * +r - rej          - See rejected client notices
 	 * +s - servnotice   - See general server notices
 	 * +u - unauth       - See unauthorized client notices
@@ -1187,7 +1196,7 @@
 	/* oper_only_umodes: usermodes only opers may set */
 	oper_only_umodes = bots, cconn, cconn_full, debug, full, skill,
                            nchange, rej, spy, external, operwall,
-                           locops, unauth;
+                           locops, unauth, snoop;
 
 	/* oper_umodes: default usermodes opers get when they /oper */
 	oper_umodes = bots, locops, servnotice, operwall, wallop;

Property changes on: etc/example.conf
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: etc/Makefile.in
===================================================================
--- etc/Makefile.in	(.../1.0.1)	(revision 183)
+++ etc/Makefile.in	(.../1.0.2)	(revision 183)
@@ -1,4 +1,5 @@
-# $Id: Makefile.in 715 2006-07-14 21:01:55Z michael $
+# $Id$
+# $Hybrid: Makefile.in 715 2006-07-14 21:01:55Z michael $
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@

Property changes on: etc/Makefile.in
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: etc/example.conf.quick
===================================================================
--- etc/example.conf.quick	(.../1.0.1)	(revision 183)
+++ etc/example.conf.quick	(.../1.0.2)	(revision 183)
@@ -3,7 +3,8 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: example.conf.quick 264 2005-11-13 11:11:29Z adx $
+ * $Id$
+ * $Hybrid: example.conf.quick 264 2005-11-13 11:11:29Z adx $
  */
 
 /* IMPORTANT NOTES:
@@ -42,6 +43,7 @@
 	description = "hybrid-7 test server";
 	network_name = "MyNet";
 	network_desc = "This is My Network";
+    help_channel = "#operhelp";
 	hub = no;
 	#vhost = "192.169.0.1";
 	#vhost6 = "3ffe:80e8:546::2";
@@ -151,7 +153,7 @@
 	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
 	class = "opers";
 	flags = global_kill, remote, kline, unkline, gline,
-		xline, die, rehash, nick_changes, admin;
+		xline, die, rehash, nick_changes, admin, snoop;
 };
 
 /* connect {}: controls servers we connect to (OLD C:, N:, H:, L:) */
@@ -345,7 +347,7 @@
 	client_flood = 2560;
 	message_locale = "standard";
 	oper_only_umodes = bots, cconn, debug, full, skill, nchange, 
-                     rej, spy, external, operwall, locops, unauth;
+                     rej, spy, external, operwall, locops, unauth, snoop;
 
 	oper_umodes = bots, locops, servnotice, operwall, wallop;
 

Property changes on: etc/example.conf.quick
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: etc/simple.conf
===================================================================
--- etc/simple.conf	(.../1.0.1)	(revision 183)
+++ etc/simple.conf	(.../1.0.2)	(revision 183)
@@ -1,6 +1,7 @@
 # Hybrid 7 minimal example configuration file
 #
-# $Id: simple.conf 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: simple.conf 33 2005-10-02 20:50:00Z knight $
 #
 # This is a basic ircd.conf that will get your server running with
 # little modification.  See the example.conf for more specific 
@@ -15,6 +16,7 @@
 	sid = "_CHANGE_ME_";
 	description = "Test IRC Server";
 	hub = no;
+    help_channel = "#operhelp";
 };
 
 # The administrator block sets up the server administrator information,

Property changes on: etc/simple.conf
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

Index: install-sh
===================================================================
--- install-sh	(.../1.0.1)	(revision 183)
+++ install-sh	(.../1.0.2)	(revision 183)
@@ -1,5 +1,6 @@
 #!/bin/sh
-# $Id: install-sh 33 2005-10-02 20:50:00Z knight $
+# $Id$
+# $Hybrid: install-sh 33 2005-10-02 20:50:00Z knight $
 #
 # install - install a program, script, or datafile
 #

Property changes on: install-sh
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision

