diff -ru ircd-hybrid-6-CVS/CVS/Entries ircd-hybrid-6-CARNet/CVS/Entries
--- ircd-hybrid-6-CVS/CVS/Entries	Mon Jul  2 18:47:23 2001
+++ ircd-hybrid-6-CARNet/CVS/Entries	Mon Jul  2 18:45:49 2001
@@ -4,13 +4,13 @@
 D/src////
 D/tools////
 D/zlib////
-/INSTALL/1.7/Sun Jul  1 13:18:31 2001//
-/LICENSE/1.2/Wed Jun 13 19:31:08 2001//
-/Makefile.in/1.19/Wed Jun 13 19:31:08 2001//
-/README.FIRST/1.10/Wed Jun 13 19:31:08 2001//
-/README.small_nets/1.4/Wed Jun 13 19:31:08 2001//
-/RELNOTES/1.6/Sun Jul  1 13:18:31 2001//
-/opers.txt/1.14/Wed Jun 13 19:31:08 2001//
-/configure/1.17/Sun Jul  1 13:18:34 2001//
-/ChangeLog/1.341/Mon Jul  2 16:47:22 2001//
-/Hybrid-team/1.21/Mon Jul  2 16:47:23 2001//
+/ChangeLog/1.341/Mon Jul  2 16:45:49 2001//
+/Hybrid-team/1.21/Mon Jul  2 16:45:49 2001//
+/INSTALL/1.7/Sun Jul  1 13:21:01 2001//
+/LICENSE/1.2/Sun Jul  1 13:21:01 2001//
+/Makefile.in/1.19/Sun Jul  1 13:21:01 2001//
+/README.FIRST/1.10/Sun Jul  1 13:21:01 2001//
+/README.small_nets/1.4/Sun Jul  1 13:21:01 2001//
+/RELNOTES/1.6/Sun Jul  1 13:21:02 2001//
+/configure/1.17/Sun Jul  1 13:21:02 2001//
+/opers.txt/1.14/Sun Jul  1 13:21:02 2001//
diff -ru ircd-hybrid-6-CVS/autoconf/CVS/Entries ircd-hybrid-6-CARNet/autoconf/CVS/Entries
--- ircd-hybrid-6-CVS/autoconf/CVS/Entries	Sun Jul  1 15:19:51 2001
+++ ircd-hybrid-6-CARNet/autoconf/CVS/Entries	Mon Jul  2 18:45:49 2001
@@ -1,6 +1,6 @@
-/config.guess/1.2/Fri Oct  6 03:00:51 2000//
-/config.sub/1.2/Fri Oct  6 03:00:51 2000//
-/install-sh/1.4/Fri Oct  6 03:00:51 2000//
-/acconfig.h/1.4/Sun Jul  1 13:18:34 2001//
-/configure.in/1.16/Sun Jul  1 13:18:34 2001//
+/acconfig.h/1.4/Sun Jul  1 13:21:01 2001//
+/config.guess/1.2/Sun Jul  1 13:21:01 2001//
+/config.sub/1.2/Sun Jul  1 13:21:02 2001//
+/configure.in/1.16/Sun Jul  1 13:21:01 2001//
+/install-sh/1.4/Sun Jul  1 13:21:02 2001//
 D
diff -ru ircd-hybrid-6-CVS/doc/CVS/Entries ircd-hybrid-6-CARNet/doc/CVS/Entries
--- ircd-hybrid-6-CVS/doc/CVS/Entries	Sun Jul  1 15:18:34 2001
+++ ircd-hybrid-6-CARNet/doc/CVS/Entries	Mon Jul  2 18:45:49 2001
@@ -1,20 +1,20 @@
 D/old////
-/CIDR.txt/1.3/Wed Jun 13 19:31:08 2001//
-/INDEX/1.1/Wed Jun 13 19:31:09 2001//
-/Makefile/1.2/Wed Jun 13 19:31:08 2001//
-/README.TSora/1.2/Wed Jun 13 19:31:08 2001//
-/README.openssl/1.1/Sat Jun 16 06:15:39 2001//
-/Tao-of-IRC.940110/1.1.1.1/Wed Jun 13 19:31:08 2001//
-/blalloc.txt/1.1.1.1/Wed Jun 13 19:31:08 2001//
-/cryptlink.txt/1.1/Wed Jun 13 19:31:09 2001//
-/encryption.txt/1.3/Wed Jun 13 19:31:08 2001//
-/example.conf/1.29/Wed Jun 13 19:31:08 2001//
-/example.conf.trillian/1.5/Wed Jun 13 19:31:08 2001//
-/ircd.8/1.2/Wed Jun 13 19:31:08 2001//
-/mtrie.txt/1.2/Wed Jun 13 19:31:08 2001//
-/operguide.txt/1.1/Wed Jun 13 19:31:09 2001//
-/opermyth.txt/1.1/Wed Jun 13 19:31:08 2001//
-/rfc1459.txt/1.1.1.1/Wed Jun 13 19:31:08 2001//
-/server-version-info/1.5/Wed Jun 13 19:31:08 2001//
-/simple.conf/1.4/Wed Jun 13 19:31:09 2001//
-/yline.txt/1.1/Wed Jun 13 19:31:09 2001//
+/CIDR.txt/1.3/Sun Jul  1 13:21:02 2001//
+/INDEX/1.1/Sun Jul  1 13:21:02 2001//
+/Makefile/1.2/Sun Jul  1 13:21:02 2001//
+/README.TSora/1.2/Sun Jul  1 13:21:02 2001//
+/README.openssl/1.1/Sun Jul  1 13:21:02 2001//
+/Tao-of-IRC.940110/1.1.1.1/Sun Jul  1 13:21:02 2001//
+/blalloc.txt/1.1.1.1/Sun Jul  1 13:21:02 2001//
+/cryptlink.txt/1.1/Sun Jul  1 13:21:02 2001//
+/encryption.txt/1.3/Sun Jul  1 13:21:02 2001//
+/example.conf/1.29/Sun Jul  1 13:21:02 2001//
+/example.conf.trillian/1.5/Sun Jul  1 13:21:02 2001//
+/ircd.8/1.2/Sun Jul  1 13:21:02 2001//
+/mtrie.txt/1.2/Sun Jul  1 13:21:02 2001//
+/operguide.txt/1.1/Sun Jul  1 13:21:02 2001//
+/opermyth.txt/1.1/Sun Jul  1 13:21:02 2001//
+/rfc1459.txt/1.1.1.1/Sun Jul  1 13:21:02 2001//
+/server-version-info/1.5/Sun Jul  1 13:21:02 2001//
+/simple.conf/1.4/Sun Jul  1 13:21:02 2001//
+/yline.txt/1.1/Sun Jul  1 13:21:02 2001//
diff -ru ircd-hybrid-6-CVS/doc/old/CVS/Entries ircd-hybrid-6-CARNet/doc/old/CVS/Entries
--- ircd-hybrid-6-CVS/doc/old/CVS/Entries	Sun Jul  1 15:18:35 2001
+++ ircd-hybrid-6-CARNet/doc/old/CVS/Entries	Mon Jul  2 18:45:49 2001
@@ -1,4 +1,4 @@
 D/US-Admin////
-/Authors/1.1/Wed Jun 13 19:31:09 2001//
-/Etiquette/1.1/Wed Jun 13 19:31:09 2001//
-/README/1.1/Wed Jun 13 19:31:09 2001//
+/Authors/1.1/Sun Jul  1 13:21:02 2001//
+/Etiquette/1.1/Sun Jul  1 13:21:02 2001//
+/README/1.1/Sun Jul  1 13:21:02 2001//
diff -ru ircd-hybrid-6-CVS/doc/old/US-Admin/CVS/Entries ircd-hybrid-6-CARNet/doc/old/US-Admin/CVS/Entries
--- ircd-hybrid-6-CVS/doc/old/US-Admin/CVS/Entries	Sun Jul  1 15:18:35 2001
+++ ircd-hybrid-6-CARNet/doc/old/US-Admin/CVS/Entries	Mon Jul  2 18:45:49 2001
@@ -1,4 +1,4 @@
-/Networking/1.1/Wed Jun 13 19:31:09 2001//
-/Operators/1.1/Wed Jun 13 19:31:09 2001//
-/README/1.1/Wed Jun 13 19:31:09 2001//
+/Networking/1.1/Sun Jul  1 13:21:02 2001//
+/Operators/1.1/Sun Jul  1 13:21:02 2001//
+/README/1.1/Sun Jul  1 13:21:02 2001//
 D
diff -ru ircd-hybrid-6-CVS/include/CVS/Entries ircd-hybrid-6-CARNet/include/CVS/Entries
--- ircd-hybrid-6-CVS/include/CVS/Entries	Mon Jul  2 18:47:27 2001
+++ ircd-hybrid-6-CARNet/include/CVS/Entries	Mon Jul  2 18:45:55 2001
@@ -1,52 +1,52 @@
-/blalloc.h/1.4/Wed Jun 13 19:31:09 2001//
-/class.h/1.5/Wed Jun 13 19:31:09 2001//
-/client.h/1.49/Sun Jul  1 13:18:36 2001//
-/common.h/1.15/Wed Jun 13 19:31:09 2001//
-/dbuf.h/1.6/Wed Jun 13 19:31:09 2001//
-/dline_conf.h/1.4/Wed Jun 13 19:31:09 2001//
-/fdlist.h/1.10/Wed Jun 13 19:31:09 2001//
-/fileio.h/1.2/Wed Jun 13 19:31:09 2001//
-/flud.h/1.4/Wed Jun 13 19:31:09 2001//
-/hash.h/1.8/Wed Jun 13 19:31:09 2001//
-/irc_string.h/1.15/Wed Jun 13 19:31:09 2001//
-/ircd.h/1.19/Sun Jul  1 13:18:38 2001//
-/ircd_defs.h/1.10/Sun Jul  1 13:18:38 2001//
-/ircd_signal.h/1.1/Wed Jun 13 19:31:09 2001//
-/list.h/1.4/Wed Jun 13 19:31:09 2001//
-/listener.h/1.4/Wed Jun 13 19:31:09 2001//
-/m_commands.h/1.4/Wed Jun 13 19:31:09 2001//
-/m_gline.h/1.4/Wed Jun 13 19:31:09 2001//
-/m_kline.h/1.4/Wed Jun 13 19:31:09 2001//
-/motd.h/1.7/Wed Jun 13 19:31:09 2001//
-/msg.h/1.16/Wed Jun 13 19:31:09 2001//
-/mtrie_conf.h/1.6/Wed Jun 13 19:31:09 2001//
-/oratime.h/1.1/Wed Jun 13 19:31:09 2001//
-/packet.h/1.2/Wed Jun 13 19:31:09 2001//
-/parse.h/1.3/Wed Jun 13 19:31:09 2001//
-/res.h/1.14/Wed Jun 13 19:31:09 2001//
-/restart.h/1.4/Wed Jun 13 19:31:09 2001//
-/s_auth.h/1.2/Wed Jun 13 19:31:09 2001//
-/s_bsd.h/1.14/Wed Jun 13 19:31:09 2001//
-/s_conf.h/1.46/Sun Jul  1 13:18:40 2001//
-/s_crypt.h/1.4/Wed Jun 13 19:31:09 2001//
-/s_debug.h/1.7/Wed Jun 13 19:31:09 2001//
-/s_log.h/1.5/Wed Jun 13 19:31:09 2001//
-/s_misc.h/1.7/Wed Jun 13 19:31:09 2001//
-/s_stats.h/1.1/Wed Jun 13 19:31:09 2001//
-/s_user.h/1.9/Wed Jun 13 19:31:09 2001//
-/s_zip.h/1.2/Wed Jun 13 19:31:09 2001//
-/scache.h/1.1/Wed Jun 13 19:31:09 2001//
-/send.h/1.13/Wed Jun 13 19:31:09 2001//
-/sprintf_irc.h/1.2/Wed Jun 13 19:31:09 2001//
-/struct.h/1.85/Wed Jun 13 19:31:09 2001//
-/whowas.h/1.6/Wed Jun 13 19:31:09 2001//
-/setup.h.in/1.10/Sun Jul  1 13:19:51 2001//
-/channel.h/1.32/Mon Jul  2 16:47:23 2001//
-/config.h/1.114/Mon Jul  2 16:47:24 2001//
-/config.h.dist/1.100/Mon Jul  2 16:47:26 2001//
-/m_info.h/1.13/Mon Jul  2 16:47:26 2001//
-/numeric.h/1.17/Mon Jul  2 16:47:26 2001//
-/patchlevel.h/1.140/Mon Jul  2 16:47:27 2001//
-/s_serv.h/1.12/Mon Jul  2 16:47:27 2001//
-/serno.h/1.968/Mon Jul  2 16:47:27 2001//
+/blalloc.h/1.4/Sun Jul  1 13:21:02 2001//
+/channel.h/1.32/Mon Jul  2 16:45:49 2001//
+/class.h/1.5/Sun Jul  1 13:21:02 2001//
+/client.h/1.49/Sun Jul  1 13:21:02 2001//
+/common.h/1.15/Sun Jul  1 13:21:02 2001//
+/config.h/1.114/Mon Jul  2 16:45:50 2001//
+/config.h.dist/1.100/Mon Jul  2 16:45:55 2001//
+/dbuf.h/1.6/Sun Jul  1 13:21:02 2001//
+/dline_conf.h/1.4/Sun Jul  1 13:21:02 2001//
+/fdlist.h/1.10/Sun Jul  1 13:21:02 2001//
+/fileio.h/1.2/Sun Jul  1 13:21:02 2001//
+/flud.h/1.4/Sun Jul  1 13:21:02 2001//
+/hash.h/1.8/Sun Jul  1 13:21:02 2001//
+/irc_string.h/1.15/Sun Jul  1 13:21:02 2001//
+/ircd.h/1.19/Sun Jul  1 13:21:02 2001//
+/ircd_defs.h/1.10/Sun Jul  1 13:21:02 2001//
+/ircd_signal.h/1.1/Sun Jul  1 13:21:02 2001//
+/list.h/1.4/Sun Jul  1 13:21:02 2001//
+/listener.h/1.4/Sun Jul  1 13:21:02 2001//
+/m_commands.h/1.4/Sun Jul  1 13:21:02 2001//
+/m_gline.h/1.4/Sun Jul  1 13:21:02 2001//
+/m_info.h/1.13/Mon Jul  2 16:45:55 2001//
+/m_kline.h/1.4/Sun Jul  1 13:21:02 2001//
+/motd.h/1.7/Sun Jul  1 13:21:02 2001//
+/msg.h/1.16/Sun Jul  1 13:21:02 2001//
+/mtrie_conf.h/1.6/Sun Jul  1 13:21:02 2001//
+/numeric.h/1.17/Mon Jul  2 16:45:55 2001//
+/oratime.h/1.1/Sun Jul  1 13:21:03 2001//
+/packet.h/1.2/Sun Jul  1 13:21:03 2001//
+/parse.h/1.3/Sun Jul  1 13:21:03 2001//
+/patchlevel.h/1.140/Mon Jul  2 16:45:55 2001//
+/res.h/1.14/Sun Jul  1 13:21:03 2001//
+/restart.h/1.4/Sun Jul  1 13:21:03 2001//
+/s_auth.h/1.2/Sun Jul  1 13:21:03 2001//
+/s_bsd.h/1.14/Sun Jul  1 13:21:03 2001//
+/s_conf.h/1.46/Sun Jul  1 13:21:03 2001//
+/s_crypt.h/1.4/Sun Jul  1 13:21:03 2001//
+/s_debug.h/1.7/Sun Jul  1 13:21:03 2001//
+/s_log.h/1.5/Sun Jul  1 13:21:03 2001//
+/s_misc.h/1.7/Sun Jul  1 13:21:03 2001//
+/s_serv.h/1.12/Mon Jul  2 16:45:55 2001//
+/s_stats.h/1.1/Sun Jul  1 13:21:03 2001//
+/s_user.h/1.9/Sun Jul  1 13:21:03 2001//
+/s_zip.h/1.2/Sun Jul  1 13:21:03 2001//
+/scache.h/1.1/Sun Jul  1 13:21:03 2001//
+/send.h/1.13/Sun Jul  1 13:21:03 2001//
+/serno.h/1.968/Mon Jul  2 16:45:55 2001//
+/setup.h.in/1.10/Sun Jul  1 13:21:03 2001//
+/sprintf_irc.h/1.2/Sun Jul  1 13:21:03 2001//
+/struct.h/1.85/Sun Jul  1 13:21:03 2001//
+/whowas.h/1.6/Sun Jul  1 13:21:03 2001//
 D
diff -ru ircd-hybrid-6-CVS/include/config.h ircd-hybrid-6-CARNet/include/config.h
--- ircd-hybrid-6-CVS/include/config.h	Mon Jul  2 18:47:24 2001
+++ ircd-hybrid-6-CARNet/include/config.h	Mon Jul  2 19:06:34 2001
@@ -51,8 +51,8 @@
  * system limits. If you know what you are doing, increase them now
  */
 
-#define HARD_FDLIMIT_   256
-#define INIT_MAXCLIENTS 180
+#define HARD_FDLIMIT_   1000
+#define INIT_MAXCLIENTS 600
 
 /*
  * This is how many 'buffer connections' we allow...
@@ -109,8 +109,8 @@
  *
  */
 
-#define DPATH   "/usr/local/ircd/"
-#define SPATH   "/usr/local/ircd/ircd"
+#define DPATH   "/opt/irc/hybrid/"
+#define SPATH   "/opt/irc/hybrid/ircd"
 #define CPATH   "ircd.conf"
 #define KPATH   "kline.conf"
 #define DLPATH  "kline.conf"
@@ -144,12 +144,12 @@
 /* NETWORK_NAME
  * Displayed in place of the servername when SERVERHIDE is enabled
  */   
-#define NETWORK_NAME "EFnet"
+#define NETWORK_NAME "CARNet"
 
 /* NETWORK_DESC
  * Displayed in place of the server info when SERVERHIDE is enabled
  */
-#define NETWORK_DESC "Eris Free Network"
+#define NETWORK_DESC "CARNet IRC Network"
 
 
 /* TS_MAX_DELTA and TS_WARN_DELTA -  allowed delta for TS when another
@@ -185,8 +185,8 @@
  *
  * These need to be defined if you want to use SYSLOG logging, too.
  */
-#define FNAME_USERLOG "/usr/local/ircd/users"
-#define FNAME_OPERLOG "/usr/local/ircd/opers"
+#define FNAME_USERLOG "/opt/irc/hybrid/users"
+#define FNAME_OPERLOG "/opt/irc/hybrid/opers"
 
 /* RFC1035_ANAL
  * Defining this causes ircd to reject hostnames with non-compliant chars.
@@ -237,12 +237,12 @@
 /* SHOW_FAILED_OPER_ID - if FAILED_OPER_NOTICE is defined, also notify when
  * a client fails to oper because of a identity mismatch (wrong host or nick)
  */
-#undef SHOW_FAILED_OPER_ID
+#define SHOW_FAILED_OPER_ID
 
 /* SHOW_FAILED_OPER_PASSWD - if FAILED_OPER_NOTICE is defined, also show the
  * attempted passwd
  */
-#undef SHOW_FAILED_OPER_PASSWD
+#define SHOW_FAILED_OPER_PASSWD
 
 /* CLIENT_SERVER - Don't be so fascist about idle clients ;)
  * changes behaviour of HTM code to make clients lag less.
@@ -268,7 +268,7 @@
 #define ANTI_NICK_FLOOD
 /* defaults allow 5 nick changes in 20 seconds */
 #define MAX_NICK_TIME 20
-#define MAX_NICK_CHANGES 5 
+#define MAX_NICK_CHANGES 3 
 
 /* DO_IDENTD - check identd
  * if you undefine this, ircd will never check identd regardless of
@@ -346,7 +346,7 @@
  * seeing STATS p requests, look below for the answer to that
  * argument.
  */
-#undef STATS_NOTICE
+#define STATS_NOTICE
 
 /* STATS_P_NOTICE - See STATS p requests only, when STATS_NOTICE
  * is undefined.  This allows opers to see requests by users for
@@ -360,7 +360,7 @@
  * Why do opers need this at all? Its an invasion of privacy. bah.
  * you don't need this. -Dianora
  */
-#undef WHOIS_NOTICE
+#define WHOIS_NOTICE
 
 /* WHOIS_WAIT - minimum seconds between remote use of WHOIS before
  * max use count is reset
@@ -403,7 +403,7 @@
  */
 #undef TRUE_NO_OPER_FLOOD
 
-#undef CRYPT_LINKS             /* allow encrypted server-server links */
+#define CRYPT_LINKS             /* allow encrypted server-server links */
 #define CRYPT_LINKS_CNPREFIX '@'
 #define CRYPT_LINKS_PRIVATEKEYFILE "private.key"
 
@@ -444,7 +444,7 @@
  * Above 4 will only give a rather marginal increase in compression for a
  * large increase in CPU usage.
  */
-#define ZIP_LEVEL       2
+#define ZIP_LEVEL       4
 
 /*
  * OPER_UMODES LOCOP_UMODES - set these to be the initial umodes when OPER'ing
@@ -476,7 +476,7 @@
  * security problem - they can use the "-f" option to read any files
  * that the 'new' access lets them.
  */
-#define CMDLINE_CONFIG
+#undef CMDLINE_CONFIG
 
 /* INIT_LOG_LEVEL - what level of information is logged to ircd.log
  * options are:
@@ -564,7 +564,7 @@
  * send to the server without processing before disconnecting the client for
  * flooding it.  Values greater than 8000 make no difference to the server.
  */
-#define CLIENT_FLOOD    2560
+#define CLIENT_FLOOD    1560
 
 /* NOISY_HTM - should HTM be noisy by default
  * should be YES or NO
@@ -702,7 +702,7 @@
  * -Dianora
  */
 
-#undef NO_PRIORITY
+#define NO_PRIORITY
 
 /* LITTLE_I_LINE support
  * clients with a little i instead of an I in their I line
@@ -728,7 +728,7 @@
 /* GLINE_TIME - local expire time for GLINES
  * As configured here, a GLINE will last 12 hours
  */
-#define GLINE_TIME      (12*3600)
+#define GLINE_TIME      (2*3600)
 
 /* NO_FAKE_GLINES - disable fake glines
  * Define this if you want to stop fake glines from users who
@@ -740,7 +740,7 @@
 /* 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
  */
-#undef IGNORE_BOGUS_TS
+#define IGNORE_BOGUS_TS
 
 /* CHANMODE_E
  * /mode #channel +e allows you to add exceptions to bans.
@@ -758,15 +758,33 @@
  * stop server "+e patches" and desyncs across a hub where leaf servers
  * +e lists differ.   --fl_
  */
-#undef CHANMODE_E
+#define CHANMODE_E
 
 /* USE_KNOCK
  * KNOCK allows users to send a "knock" to a +i channel.
  */
-#undef USE_KNOCK
+#define USE_KNOCK
 
 /* -------------- END NOT APPROVED ON EFNET SECTION --------------------- */
 
+/* ----------------- CARNet extra patches section --------------------- */
+/* Define this if you want addresses starting with `_' in ircd.conf to
+   be SMART_SPOOFed to new address that is CRC16 encoded. -kre
+ */
+#define SMART_SPOOF
+
+/* Prefix that indicates whether SMART_SPOOFed addresses should be
+   prefixed or not. It should usually be `asy-' since most addresses
+   you want to be spoofed are async ttys. If not defined, it will
+   be ignored. -kre */
+#define SMART_SPOOF_PREFIX "asy-"
+
+/* Define to polinomial value for proper CRC16 encoding. Should be
+   either 0xa001, 0x8408, 0x1021. This *has* to be defined if
+   SMART_SPOOF is defined. -kre */
+#define SMART_SPOOF_POLY 0xa001
+
+/* ------------------- End CARNet extra patches section -------------- */
 
 /*   STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP  */
 
@@ -964,7 +982,7 @@
  *
  */
   
-#undef REJECT_HOLD
+#define REJECT_HOLD
 #define REJECT_HOLD_TIME 30 
 
 /* maximum number of fd's that will be used for reject holding */
diff -ru ircd-hybrid-6-CVS/include/config.h.dist ircd-hybrid-6-CARNet/include/config.h.dist
--- ircd-hybrid-6-CVS/include/config.h.dist	Mon Jul  2 18:47:26 2001
+++ ircd-hybrid-6-CARNet/include/config.h.dist	Mon Jul  2 19:10:09 2001
@@ -16,7 +16,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: config.h.dist,v 1.100 2001/07/02 03:04:14 db Exp $
+ * $Id: config.h,v 1.114 2001/07/02 03:04:13 db Exp $
  */
 #ifndef INCLUDED_config_h
 #define INCLUDED_config_h
@@ -51,8 +51,8 @@
  * system limits. If you know what you are doing, increase them now
  */
 
-#define HARD_FDLIMIT_   256
-#define INIT_MAXCLIENTS 180
+#define HARD_FDLIMIT_   1000
+#define INIT_MAXCLIENTS 600
 
 /*
  * This is how many 'buffer connections' we allow...
@@ -109,8 +109,8 @@
  *
  */
 
-#define DPATH   "/usr/local/ircd/"
-#define SPATH   "/usr/local/ircd/ircd"
+#define DPATH   "/opt/irc/hybrid/"
+#define SPATH   "/opt/irc/hybrid/ircd"
 #define CPATH   "ircd.conf"
 #define KPATH   "kline.conf"
 #define DLPATH  "kline.conf"
@@ -144,12 +144,12 @@
 /* NETWORK_NAME
  * Displayed in place of the servername when SERVERHIDE is enabled
  */   
-#define NETWORK_NAME "EFnet"
+#define NETWORK_NAME "CARNet"
 
 /* NETWORK_DESC
  * Displayed in place of the server info when SERVERHIDE is enabled
  */
-#define NETWORK_DESC "Eris Free Network"
+#define NETWORK_DESC "CARNet IRC Network"
 
 
 /* TS_MAX_DELTA and TS_WARN_DELTA -  allowed delta for TS when another
@@ -185,8 +185,8 @@
  *
  * These need to be defined if you want to use SYSLOG logging, too.
  */
-#define FNAME_USERLOG "/usr/local/ircd/users"
-#define FNAME_OPERLOG "/usr/local/ircd/opers"
+#define FNAME_USERLOG "/opt/irc/hybrid/users"
+#define FNAME_OPERLOG "/opt/irc/hybrid/opers"
 
 /* RFC1035_ANAL
  * Defining this causes ircd to reject hostnames with non-compliant chars.
@@ -237,12 +237,12 @@
 /* SHOW_FAILED_OPER_ID - if FAILED_OPER_NOTICE is defined, also notify when
  * a client fails to oper because of a identity mismatch (wrong host or nick)
  */
-#undef SHOW_FAILED_OPER_ID
+#define SHOW_FAILED_OPER_ID
 
 /* SHOW_FAILED_OPER_PASSWD - if FAILED_OPER_NOTICE is defined, also show the
  * attempted passwd
  */
-#undef SHOW_FAILED_OPER_PASSWD
+#define SHOW_FAILED_OPER_PASSWD
 
 /* CLIENT_SERVER - Don't be so fascist about idle clients ;)
  * changes behaviour of HTM code to make clients lag less.
@@ -268,7 +268,7 @@
 #define ANTI_NICK_FLOOD
 /* defaults allow 5 nick changes in 20 seconds */
 #define MAX_NICK_TIME 20
-#define MAX_NICK_CHANGES 5 
+#define MAX_NICK_CHANGES 3 
 
 /* DO_IDENTD - check identd
  * if you undefine this, ircd will never check identd regardless of
@@ -346,7 +346,7 @@
  * seeing STATS p requests, look below for the answer to that
  * argument.
  */
-#undef STATS_NOTICE
+#define STATS_NOTICE
 
 /* STATS_P_NOTICE - See STATS p requests only, when STATS_NOTICE
  * is undefined.  This allows opers to see requests by users for
@@ -360,7 +360,7 @@
  * Why do opers need this at all? Its an invasion of privacy. bah.
  * you don't need this. -Dianora
  */
-#undef WHOIS_NOTICE
+#define WHOIS_NOTICE
 
 /* WHOIS_WAIT - minimum seconds between remote use of WHOIS before
  * max use count is reset
@@ -403,7 +403,7 @@
  */
 #undef TRUE_NO_OPER_FLOOD
 
-#undef CRYPT_LINKS             /* allow encrypted server-server links */
+#define CRYPT_LINKS             /* allow encrypted server-server links */
 #define CRYPT_LINKS_CNPREFIX '@'
 #define CRYPT_LINKS_PRIVATEKEYFILE "private.key"
 
@@ -444,7 +444,7 @@
  * Above 4 will only give a rather marginal increase in compression for a
  * large increase in CPU usage.
  */
-#define ZIP_LEVEL       2
+#define ZIP_LEVEL       4
 
 /*
  * OPER_UMODES LOCOP_UMODES - set these to be the initial umodes when OPER'ing
@@ -476,7 +476,7 @@
  * security problem - they can use the "-f" option to read any files
  * that the 'new' access lets them.
  */
-#define CMDLINE_CONFIG
+#undef CMDLINE_CONFIG
 
 /* INIT_LOG_LEVEL - what level of information is logged to ircd.log
  * options are:
@@ -564,7 +564,7 @@
  * send to the server without processing before disconnecting the client for
  * flooding it.  Values greater than 8000 make no difference to the server.
  */
-#define CLIENT_FLOOD    2560
+#define CLIENT_FLOOD    1560
 
 /* NOISY_HTM - should HTM be noisy by default
  * should be YES or NO
@@ -702,7 +702,7 @@
  * -Dianora
  */
 
-#undef NO_PRIORITY
+#define NO_PRIORITY
 
 /* LITTLE_I_LINE support
  * clients with a little i instead of an I in their I line
@@ -728,7 +728,7 @@
 /* GLINE_TIME - local expire time for GLINES
  * As configured here, a GLINE will last 12 hours
  */
-#define GLINE_TIME      (12*3600)
+#define GLINE_TIME      (2*3600)
 
 /* NO_FAKE_GLINES - disable fake glines
  * Define this if you want to stop fake glines from users who
@@ -740,7 +740,7 @@
 /* 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
  */
-#undef IGNORE_BOGUS_TS
+#define IGNORE_BOGUS_TS
 
 /* CHANMODE_E
  * /mode #channel +e allows you to add exceptions to bans.
@@ -758,15 +758,33 @@
  * stop server "+e patches" and desyncs across a hub where leaf servers
  * +e lists differ.   --fl_
  */
-#undef CHANMODE_E
+#define CHANMODE_E
 
 /* USE_KNOCK
  * KNOCK allows users to send a "knock" to a +i channel.
  */
-#undef USE_KNOCK
+#define USE_KNOCK
 
 /* -------------- END NOT APPROVED ON EFNET SECTION --------------------- */
 
+/* ----------------- CARNet extra patches section --------------------- */
+/* Define this if you want addresses starting with `_' in ircd.conf to
+   be SMART_SPOOFed to new address that is CRC16 encoded. -kre
+ */
+#define SMART_SPOOF
+
+/* Prefix that indicates whether SMART_SPOOFed addresses should be
+   prefixed or not. It should usually be `asy-' since most addresses
+   you want to be spoofed are async ttys. If not defined, it will
+   be ignored. -kre */
+#define SMART_SPOOF_PREFIX "asy-"
+
+/* Define to polinomial value for proper CRC16 encoding. Should be
+   either 0xa001, 0x8408, 0x1021. This *has* to be defined if
+   SMART_SPOOF is defined. -kre */
+#define SMART_SPOOF_POLY 0xa001
+
+/* ------------------- End CARNet extra patches section -------------- */
 
 /*   STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP  */
 
@@ -964,7 +982,7 @@
  *
  */
   
-#undef REJECT_HOLD
+#define REJECT_HOLD
 #define REJECT_HOLD_TIME 30 
 
 /* maximum number of fd's that will be used for reject holding */
diff -ru ircd-hybrid-6-CVS/include/patchlevel.h ircd-hybrid-6-CARNet/include/patchlevel.h
--- ircd-hybrid-6-CVS/include/patchlevel.h	Mon Jul  2 18:47:27 2001
+++ ircd-hybrid-6-CARNet/include/patchlevel.h	Mon Jul  2 18:48:54 2001
@@ -17,5 +17,5 @@
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL    "2.8/hybrid-6.1b3"
+#define PATCHLEVEL    "2.8/hybrid-6.1b3/CARNet"
 #endif
diff -ru ircd-hybrid-6-CVS/include/s_conf.h ircd-hybrid-6-CARNet/include/s_conf.h
--- ircd-hybrid-6-CVS/include/s_conf.h	Sun Jul  1 15:18:40 2001
+++ ircd-hybrid-6-CARNet/include/s_conf.h	Mon Jul  2 18:48:01 2001
@@ -294,6 +294,7 @@
 #define CONF_FLAGS_ALLOW_AUTO_CONN      0x0400
 #define CONF_FLAGS_ZIP_LINK             0x0800
 #define CONF_FLAGS_SPOOF_IP             0x1000
+#define CONF_FLAGS_SMART_SPOOF_IP       0x2000
 
 #ifdef LITTLE_I_LINES
 #define CONF_FLAGS_LITTLE_I_LINE        0x8000
@@ -319,6 +320,7 @@
 
 #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
 #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
+#define IsConfDoSmartSpoofIp(x) ((x)->flags & CONF_FLAGS_SMART_SPOOF_IP)
 #ifdef LITTLE_I_LINES
 #define IsConfLittleI(x)        ((x)->flags & CONF_FLAGS_LITTLE_I_LINE)
 #endif
diff -ru ircd-hybrid-6-CVS/src/CVS/Entries ircd-hybrid-6-CARNet/src/CVS/Entries
--- ircd-hybrid-6-CVS/src/CVS/Entries	Mon Jul  2 18:47:32 2001
+++ ircd-hybrid-6-CARNet/src/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,90 +1,90 @@
 D/test////
-/.depend/1.42/Wed Jun 13 19:31:09 2001//
-/Makefile.in/1.60/Wed Jun 13 19:31:09 2001//
-/blalloc.c/1.18/Wed Jun 13 19:31:09 2001//
-/class.c/1.14/Wed Jun 13 19:31:09 2001//
-/client.c/1.64/Sun Jul  1 13:18:48 2001//
-/dbuf.c/1.16/Wed Jun 13 19:31:10 2001//
-/dline_conf.c/1.36/Wed Jun 13 19:31:09 2001//
-/fdlist.c/1.10/Wed Jun 13 19:31:10 2001//
-/fileio.c/1.5/Wed Jun 13 19:31:10 2001//
-/flud.c/1.5/Wed Jun 13 19:31:10 2001//
-/hash.c/1.37/Wed Jun 13 19:31:10 2001//
-/irc_string.c/1.9/Wed Jun 13 19:31:10 2001//
-/ircd.c/1.141/Wed Jun 13 19:31:10 2001//
-/ircd_signal.c/1.2/Wed Jun 13 19:31:10 2001//
-/list.c/1.41/Wed Jun 13 19:31:10 2001//
-/listener.c/1.18/Wed Jun 13 19:31:10 2001//
-/m_admin.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_away.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_capab.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_close.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_cryptauth.c/1.5/Sun Jul  1 13:18:48 2001//
-/m_cryptserv.c/1.7/Sun Jul  1 13:18:49 2001//
-/m_die.c/1.3/Wed Jun 13 19:31:10 2001//
-/m_error.c/1.4/Wed Jun 13 19:31:10 2001//
-/m_gline.c/1.42/Sun Jul  1 13:18:49 2001//
-/m_help.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_htm.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_ison.c/1.4/Wed Jun 13 19:31:10 2001//
-/m_kill.c/1.8/Sun Jul  1 13:18:50 2001//
-/m_kline.c/1.57/Sun Jul  1 13:18:51 2001//
-/m_links.c/1.7/Wed Jun 13 19:31:10 2001//
-/m_list.c/1.3/Wed Jun 13 19:31:10 2001//
-/m_locops.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_ltrace.c/1.7/Sun Jul  1 13:18:51 2001//
-/m_lusers.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_message.c/1.11/Wed Jun 13 19:31:10 2001//
-/m_mode.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_oper.c/1.8/Wed Jun 13 19:31:10 2001//
-/m_operwall.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_pass.c/1.4/Wed Jun 13 19:31:10 2001//
-/m_ping.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_pong.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_quit.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_rehash.c/1.8/Sun Jul  1 13:18:51 2001//
-/m_restart.c/1.3/Wed Jun 13 19:31:10 2001//
-/m_server.c/1.14/Sun Jul  1 13:18:52 2001//
-/m_set.c/1.6/Wed Jun 13 19:31:10 2001//
-/m_squit.c/1.3/Wed Jun 13 19:31:10 2001//
-/m_stats.c/1.15/Sun Jul  1 13:18:52 2001//
-/m_svinfo.c/1.5/Sun Jul  1 13:18:52 2001//
-/m_time.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_trace.c/1.7/Sun Jul  1 13:18:53 2001//
-/m_unkline.c/1.41/Sun Jul  1 13:18:53 2001//
-/m_userhost.c/1.10/Wed Jun 13 19:31:10 2001//
-/m_users.c/1.1/Wed Jun 13 19:31:10 2001//
-/m_version.c/1.5/Wed Jun 13 19:31:10 2001//
-/m_wallops.c/1.2/Wed Jun 13 19:31:10 2001//
-/m_who.c/1.3/Wed Jun 13 19:31:10 2001//
-/m_whois.c/1.7/Wed Jun 13 19:31:10 2001//
-/match.c/1.25/Wed Jun 13 19:31:10 2001//
-/motd.c/1.23/Wed Jun 13 19:31:10 2001//
-/mtrie_conf.c/1.73/Wed Jun 13 19:31:10 2001//
-/numeric.c/1.3/Wed Jun 13 19:31:10 2001//
-/oratime.c/1.3/Wed Jun 13 19:31:10 2001//
-/packet.c/1.23/Wed Jun 13 19:31:10 2001//
-/res.c/1.54/Wed Jun 13 19:31:10 2001//
-/restart.c/1.10/Wed Jun 13 19:31:10 2001//
-/s_auth.c/1.48/Sun Jul  1 13:18:54 2001//
-/s_bsd.c/1.134/Sun Jul  1 13:18:56 2001//
-/s_crypt.c/1.7/Sun Jul  1 13:19:00 2001//
-/s_debug.c/1.51/Wed Jun 13 19:31:11 2001//
-/s_log.c/1.11/Wed Jun 13 19:31:11 2001//
-/s_misc.c/1.71/Sun Jul  1 13:19:00 2001//
-/s_serv.c/1.221/Sun Jul  1 13:19:00 2001//
-/s_stats.c/1.1/Wed Jun 13 19:31:11 2001//
-/s_zip.c/1.25/Wed Jun 13 19:31:11 2001//
-/scache.c/1.16/Wed Jun 13 19:31:11 2001//
-/send.c/1.100/Sun Jul  1 13:19:04 2001//
-/sprintf_irc.c/1.9/Wed Jun 13 19:31:10 2001//
-/version.c.SH/1.24/Wed Jun 13 19:31:11 2001//
-/whowas.c/1.33/Wed Jun 13 19:31:11 2001//
-/channel.c/1.200/Mon Jul  2 16:47:27 2001//
-/m_connect.c/1.8/Mon Jul  2 16:47:28 2001//
-/m_info.c/1.40/Mon Jul  2 16:47:28 2001//
-/messages.tab/1.16/Mon Jul  2 16:47:28 2001//
-/messages_cust.tab/1.15/Mon Jul  2 16:47:28 2001//
-/parse.c/1.45/Mon Jul  2 16:47:28 2001//
-/s_conf.c/1.201/Mon Jul  2 16:47:29 2001//
-/s_user.c/1.234/Mon Jul  2 16:47:32 2001//
+/.depend/1.42/Sun Jul  1 13:21:03 2001//
+/Makefile.in/1.60/Sun Jul  1 13:21:03 2001//
+/blalloc.c/1.18/Sun Jul  1 13:21:03 2001//
+/channel.c/1.200/Mon Jul  2 16:46:01 2001//
+/class.c/1.14/Sun Jul  1 13:21:03 2001//
+/client.c/1.64/Sun Jul  1 13:21:03 2001//
+/dbuf.c/1.16/Sun Jul  1 13:21:03 2001//
+/dline_conf.c/1.36/Sun Jul  1 13:21:03 2001//
+/fdlist.c/1.10/Sun Jul  1 13:21:03 2001//
+/fileio.c/1.5/Sun Jul  1 13:21:03 2001//
+/flud.c/1.5/Sun Jul  1 13:21:03 2001//
+/hash.c/1.37/Sun Jul  1 13:21:03 2001//
+/irc_string.c/1.9/Sun Jul  1 13:21:03 2001//
+/ircd.c/1.141/Sun Jul  1 13:21:03 2001//
+/ircd_signal.c/1.2/Sun Jul  1 13:21:03 2001//
+/list.c/1.41/Sun Jul  1 13:21:03 2001//
+/listener.c/1.18/Sun Jul  1 13:21:03 2001//
+/m_admin.c/1.2/Sun Jul  1 13:21:03 2001//
+/m_away.c/1.2/Sun Jul  1 13:21:03 2001//
+/m_capab.c/1.2/Sun Jul  1 13:21:03 2001//
+/m_close.c/1.1/Sun Jul  1 13:21:03 2001//
+/m_connect.c/1.8/Mon Jul  2 16:46:01 2001//
+/m_cryptauth.c/1.5/Sun Jul  1 13:21:03 2001//
+/m_cryptserv.c/1.7/Sun Jul  1 13:21:03 2001//
+/m_die.c/1.3/Sun Jul  1 13:21:03 2001//
+/m_error.c/1.4/Sun Jul  1 13:21:03 2001//
+/m_gline.c/1.42/Sun Jul  1 13:21:03 2001//
+/m_help.c/1.1/Sun Jul  1 13:21:03 2001//
+/m_htm.c/1.1/Sun Jul  1 13:21:03 2001//
+/m_info.c/1.40/Mon Jul  2 16:46:01 2001//
+/m_ison.c/1.4/Sun Jul  1 13:21:03 2001//
+/m_kill.c/1.8/Sun Jul  1 13:21:03 2001//
+/m_kline.c/1.57/Sun Jul  1 13:21:03 2001//
+/m_links.c/1.7/Sun Jul  1 13:21:03 2001//
+/m_list.c/1.3/Sun Jul  1 13:21:03 2001//
+/m_locops.c/1.2/Sun Jul  1 13:21:03 2001//
+/m_ltrace.c/1.7/Sun Jul  1 13:21:03 2001//
+/m_lusers.c/1.1/Sun Jul  1 13:21:03 2001//
+/m_message.c/1.11/Sun Jul  1 13:21:03 2001//
+/m_mode.c/1.1/Sun Jul  1 13:21:03 2001//
+/m_oper.c/1.8/Sun Jul  1 13:21:03 2001//
+/m_operwall.c/1.2/Sun Jul  1 13:21:03 2001//
+/m_pass.c/1.4/Sun Jul  1 13:21:04 2001//
+/m_ping.c/1.1/Sun Jul  1 13:21:04 2001//
+/m_pong.c/1.2/Sun Jul  1 13:21:04 2001//
+/m_quit.c/1.1/Sun Jul  1 13:21:04 2001//
+/m_rehash.c/1.8/Sun Jul  1 13:21:04 2001//
+/m_restart.c/1.3/Sun Jul  1 13:21:04 2001//
+/m_server.c/1.14/Sun Jul  1 13:21:04 2001//
+/m_set.c/1.6/Sun Jul  1 13:21:04 2001//
+/m_squit.c/1.3/Sun Jul  1 13:21:04 2001//
+/m_stats.c/1.15/Sun Jul  1 13:21:04 2001//
+/m_svinfo.c/1.5/Sun Jul  1 13:21:04 2001//
+/m_time.c/1.1/Sun Jul  1 13:21:04 2001//
+/m_trace.c/1.7/Sun Jul  1 13:21:04 2001//
+/m_unkline.c/1.41/Sun Jul  1 13:21:04 2001//
+/m_userhost.c/1.10/Sun Jul  1 13:21:04 2001//
+/m_users.c/1.1/Sun Jul  1 13:21:04 2001//
+/m_version.c/1.5/Sun Jul  1 13:21:04 2001//
+/m_wallops.c/1.2/Sun Jul  1 13:21:04 2001//
+/m_who.c/1.3/Sun Jul  1 13:21:04 2001//
+/m_whois.c/1.7/Sun Jul  1 13:21:04 2001//
+/match.c/1.25/Sun Jul  1 13:21:04 2001//
+/messages.tab/1.16/Mon Jul  2 16:46:01 2001//
+/messages_cust.tab/1.15/Mon Jul  2 16:46:01 2001//
+/motd.c/1.23/Sun Jul  1 13:21:04 2001//
+/mtrie_conf.c/1.73/Sun Jul  1 13:21:04 2001//
+/numeric.c/1.3/Sun Jul  1 13:21:04 2001//
+/oratime.c/1.3/Sun Jul  1 13:21:04 2001//
+/packet.c/1.23/Sun Jul  1 13:21:04 2001//
+/parse.c/1.45/Mon Jul  2 16:46:02 2001//
+/res.c/1.54/Sun Jul  1 13:21:04 2001//
+/restart.c/1.10/Sun Jul  1 13:21:04 2001//
+/s_auth.c/1.48/Sun Jul  1 13:21:04 2001//
+/s_bsd.c/1.134/Sun Jul  1 13:21:04 2001//
+/s_conf.c/1.201/Mon Jul  2 16:46:03 2001//
+/s_crypt.c/1.7/Sun Jul  1 13:21:04 2001//
+/s_debug.c/1.51/Sun Jul  1 13:21:04 2001//
+/s_log.c/1.11/Sun Jul  1 13:21:04 2001//
+/s_misc.c/1.71/Sun Jul  1 13:21:04 2001//
+/s_serv.c/1.221/Sun Jul  1 13:21:04 2001//
+/s_stats.c/1.1/Sun Jul  1 13:21:04 2001//
+/s_user.c/1.234/Mon Jul  2 16:46:10 2001//
+/s_zip.c/1.25/Sun Jul  1 13:21:04 2001//
+/scache.c/1.16/Sun Jul  1 13:21:04 2001//
+/send.c/1.100/Sun Jul  1 13:21:04 2001//
+/sprintf_irc.c/1.9/Sun Jul  1 13:21:04 2001//
+/version.c.SH/1.24/Sun Jul  1 13:21:05 2001//
+/whowas.c/1.33/Sun Jul  1 13:21:05 2001//
diff -ru ircd-hybrid-6-CVS/src/s_conf.c ircd-hybrid-6-CARNet/src/s_conf.c
--- ircd-hybrid-6-CVS/src/s_conf.c	Mon Jul  2 18:47:29 2001
+++ ircd-hybrid-6-CARNet/src/s_conf.c	Mon Jul  2 19:09:58 2001
@@ -465,6 +465,43 @@
               SetIPSpoof(cptr);
               SetIPHidden(cptr);
             }
+	  
+#ifdef SMART_SPOOF
+	  /* Encode IP to real spoofed CRC16 encoded string -kre */
+	  if (IsConfDoSmartSpoofIp(aconf))
+	    {
+	      /* Re-implementation using CCITT CRC 16 -kre */
+	      unsigned register crc=0, data, i;
+	      char *strptr=cptr->host;
+	      
+	      do
+		for (data=*strptr, i=0; i<8; ++i)
+		  {
+		    if ((crc & 0x0001) ^ (data & 0x0001))
+		      crc = (crc>>1) ^ SMART_SPOOF_POLY;
+		    else
+		      crc>>=1;
+		    data>>=1;
+		  }
+	      while (*(++strptr));
+
+	      /* Notice that SMART_SPOOF_PREFIX should be smaller than
+		 HOSTLEN - I decided to leave it that way, since there is no
+		 checking for IsConfDoSpoofIp, either.. -kre */
+#ifdef SMART_SPOOF_PREFIX
+	      strcpy(cptr->host, SMART_SPOOF_PREFIX);
+	      for (i=strlen(SMART_SPOOF_PREFIX); crc; ++i, crc/=26)
+#else
+              for (i=0; crc; ++i, crc/=26)
+#endif
+		/* Perhaps this should be something faster than otherwise
+		   slow `%' operation. -kre */
+	        cptr->host[i]='A'+(crc%26);
+	      strncpy_irc(cptr->host+i, aconf->name, HOSTLEN-i);
+	      SetIPSpoof(cptr);
+	      SetIPHidden(cptr);
+	    }
+#endif
 
 #ifdef LIMIT_UH
           return(attach_iline(cptr, aconf, username));
@@ -1795,7 +1832,11 @@
           aconf->flags |= CONF_FLAGS_F_LINED;
           break;
         case '_':        /* exempt from glines */
+#ifndef SMART_SPOOF
           aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
+#else
+          aconf->flags |= CONF_FLAGS_SMART_SPOOF_IP;
+#endif
           break;
 #ifdef IDLE_CHECK
         case '<':        /* can idle */
Only in ircd-hybrid-6-CARNet/src: s_conf.c.orig
diff -ru ircd-hybrid-6-CVS/src/test/CVS/Entries ircd-hybrid-6-CARNet/src/test/CVS/Entries
--- ircd-hybrid-6-CVS/src/test/CVS/Entries	Sun Jul  1 15:19:04 2001
+++ ircd-hybrid-6-CARNet/src/test/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,8 +1,8 @@
 D/data////
 D/reference////
-/Makefile/1.8/Wed Jun 13 19:31:11 2001//
-/ilimit_test.c/1.2/Wed Jun 13 19:31:11 2001//
-/match_t.c/1.3/Wed Jun 13 19:31:11 2001//
-/parsetest.c/1.7/Wed Jun 13 19:31:11 2001//
-/strncpy_t.c/1.5/Wed Jun 13 19:31:11 2001//
-/testattr.c/1.2/Wed Jun 13 19:31:11 2001//
+/Makefile/1.8/Sun Jul  1 13:21:04 2001//
+/ilimit_test.c/1.2/Sun Jul  1 13:21:04 2001//
+/match_t.c/1.3/Sun Jul  1 13:21:04 2001//
+/parsetest.c/1.7/Sun Jul  1 13:21:04 2001//
+/strncpy_t.c/1.5/Sun Jul  1 13:21:04 2001//
+/testattr.c/1.2/Sun Jul  1 13:21:04 2001//
diff -ru ircd-hybrid-6-CVS/src/test/data/CVS/Entries ircd-hybrid-6-CARNet/src/test/data/CVS/Entries
--- ircd-hybrid-6-CVS/src/test/data/CVS/Entries	Sun Jul  1 15:19:04 2001
+++ ircd-hybrid-6-CARNet/src/test/data/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,3 +1,3 @@
-/collapse.data/1.1/Wed Jun 13 19:31:11 2001//
-/match.data/1.1/Wed Jun 13 19:31:11 2001//
+/collapse.data/1.1/Sun Jul  1 13:21:04 2001//
+/match.data/1.1/Sun Jul  1 13:21:04 2001//
 D
diff -ru ircd-hybrid-6-CVS/src/test/reference/CVS/Entries ircd-hybrid-6-CARNet/src/test/reference/CVS/Entries
--- ircd-hybrid-6-CVS/src/test/reference/CVS/Entries	Sun Jul  1 15:19:04 2001
+++ ircd-hybrid-6-CARNet/src/test/reference/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,4 +1,4 @@
-/match_t.0/1.1/Wed Jun 13 19:31:11 2001//
-/match_t.ref/1.1/Wed Jun 13 19:31:11 2001//
-/strncpy_t.ref/1.1/Wed Jun 13 19:31:11 2001//
+/match_t.0/1.1/Sun Jul  1 13:21:05 2001//
+/match_t.ref/1.1/Sun Jul  1 13:21:05 2001//
+/strncpy_t.ref/1.1/Sun Jul  1 13:21:05 2001//
 D
diff -ru ircd-hybrid-6-CVS/tools/CVS/Entries ircd-hybrid-6-CARNet/tools/CVS/Entries
--- ircd-hybrid-6-CVS/tools/CVS/Entries	Mon Jul  2 18:47:32 2001
+++ ircd-hybrid-6-CARNet/tools/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,14 +1,14 @@
-/Makefile.in/1.14/Wed Jun 13 19:31:11 2001//
-/README/1.4/Wed Jun 13 19:31:11 2001//
-/encspeed.c/1.3/Wed Jun 13 19:31:11 2001//
-/fixklines.c/1.4/Wed Jun 13 19:31:11 2001//
-/install_ircd/1.8/Wed Jun 13 19:31:11 2001//
-/ircd_start.c/1.2/Wed Jun 13 19:31:11 2001//
-/klineParse.c/1.2/Wed Jun 13 19:31:11 2001//
-/mkconf/1.2/Sun Jul  1 13:19:04 2001//
-/mkkeypair/1.2/Wed Jun 13 19:31:11 2001//
-/mkpasswd.c/1.6/Sun Jul  1 13:19:04 2001//
-/start_ircd.c/1.1/Wed Jun 13 19:31:11 2001//
-/untabify/1.1/Wed Jun 13 19:31:11 2001//
-/viconf.c/1.12/Mon Jul  2 16:47:32 2001//
+/Makefile.in/1.14/Sun Jul  1 13:21:05 2001//
+/README/1.4/Sun Jul  1 13:21:05 2001//
+/encspeed.c/1.3/Sun Jul  1 13:21:05 2001//
+/fixklines.c/1.4/Sun Jul  1 13:21:05 2001//
+/install_ircd/1.8/Sun Jul  1 13:21:05 2001//
+/ircd_start.c/1.2/Sun Jul  1 13:21:05 2001//
+/klineParse.c/1.2/Sun Jul  1 13:21:05 2001//
+/mkconf/1.2/Sun Jul  1 13:21:05 2001//
+/mkkeypair/1.2/Sun Jul  1 13:21:05 2001//
+/mkpasswd.c/1.6/Sun Jul  1 13:21:05 2001//
+/start_ircd.c/1.1/Sun Jul  1 13:21:05 2001//
+/untabify/1.1/Sun Jul  1 13:21:05 2001//
+/viconf.c/1.12/Mon Jul  2 16:46:10 2001//
 D
diff -ru ircd-hybrid-6-CVS/zlib/CVS/Entries ircd-hybrid-6-CARNet/zlib/CVS/Entries
--- ircd-hybrid-6-CVS/zlib/CVS/Entries	Sun Jul  1 15:19:53 2001
+++ ircd-hybrid-6-CARNet/zlib/CVS/Entries	Mon Jul  2 18:46:10 2001
@@ -1,37 +1,37 @@
-/ChangeLog/1.2/Sat Oct 10 05:00:28 1998//
-/FAQ/1.1/Sat Oct 10 05:03:55 1998//
-/INDEX/1.2/Sat Oct 10 05:00:28 1998//
-/README/1.2/Sat Oct 10 05:00:30 1998//
-/algorithm.txt/1.2/Sat Oct 10 05:19:01 1998//
-/deflate.h/1.2/Sat Oct 10 05:00:35 1998//
-/infblock.h/1.1/Tue Oct  6 04:51:21 1998//
-/infcodes.h/1.1/Tue Oct  6 04:51:22 1998//
-/inffast.h/1.1/Tue Oct  6 04:51:23 1998//
-/inffixed.h/1.2/Sat Oct 10 05:00:38 1998//
-/inftrees.h/1.1/Tue Oct  6 04:51:25 1998//
-/infutil.h/1.1/Tue Oct  6 04:51:27 1998//
-/trees.h/1.1/Tue Oct  6 04:51:29 1998//
-/zconf.h/1.2/Sat Oct 10 05:00:42 1998//
-/zlib.3/1.2/Sat Oct 10 05:00:43 1998//
-/zlib.h/1.2/Sat Oct 10 05:00:44 1998//
-/zutil.h/1.2/Sat Oct 10 05:00:46 1998//
-/Makefile.in/1.7/Fri Jun  8 21:38:17 2001//
-/adler32.c/1.2/Sun Jul  1 13:19:51 2001//
-/compress.c/1.2/Sun Jul  1 13:19:51 2001//
-/crc32.c/1.2/Sun Jul  1 13:19:52 2001//
-/deflate.c/1.2/Sun Jul  1 13:19:52 2001//
-/example.c/1.2/Sun Jul  1 13:19:52 2001//
-/gzio.c/1.2/Sun Jul  1 13:19:52 2001//
-/infblock.c/1.2/Sun Jul  1 13:19:52 2001//
-/infcodes.c/1.2/Sun Jul  1 13:19:52 2001//
-/inffast.c/1.1/Sun Jul  1 13:19:52 2001//
-/inflate.c/1.1/Sun Jul  1 13:19:53 2001//
-/inftrees.c/1.2/Sun Jul  1 13:19:53 2001//
-/infutil.c/1.1/Sun Jul  1 13:19:53 2001//
-/maketree.c/1.2/Sun Jul  1 13:19:53 2001//
-/minigzip.c/1.3/Sun Jul  1 13:19:53 2001//
-/setup.h.in/1.2/Sun Jul  1 13:19:05 2001//
-/trees.c/1.2/Sun Jul  1 13:19:53 2001//
-/uncompr.c/1.2/Sun Jul  1 13:19:53 2001//
-/zutil.c/1.2/Sun Jul  1 13:19:53 2001//
+/ChangeLog/1.2/Sun Jul  1 13:21:05 2001//
+/FAQ/1.1/Sun Jul  1 13:21:05 2001//
+/INDEX/1.2/Sun Jul  1 13:21:05 2001//
+/Makefile.in/1.7/Sun Jul  1 13:21:05 2001//
+/README/1.2/Sun Jul  1 13:21:05 2001//
+/adler32.c/1.2/Sun Jul  1 13:21:05 2001//
+/algorithm.txt/1.2/Sun Jul  1 13:21:05 2001//
+/compress.c/1.2/Sun Jul  1 13:21:05 2001//
+/crc32.c/1.2/Sun Jul  1 13:21:05 2001//
+/deflate.c/1.2/Sun Jul  1 13:21:05 2001//
+/deflate.h/1.2/Sun Jul  1 13:21:05 2001//
+/example.c/1.2/Sun Jul  1 13:21:05 2001//
+/gzio.c/1.2/Sun Jul  1 13:21:05 2001//
+/infblock.c/1.2/Sun Jul  1 13:21:05 2001//
+/infblock.h/1.1/Sun Jul  1 13:21:05 2001//
+/infcodes.c/1.2/Sun Jul  1 13:21:05 2001//
+/infcodes.h/1.1/Sun Jul  1 13:21:05 2001//
+/inffast.c/1.1/Sun Jul  1 13:21:05 2001//
+/inffast.h/1.1/Sun Jul  1 13:21:05 2001//
+/inffixed.h/1.2/Sun Jul  1 13:21:05 2001//
+/inflate.c/1.1/Sun Jul  1 13:21:05 2001//
+/inftrees.c/1.2/Sun Jul  1 13:21:05 2001//
+/inftrees.h/1.1/Sun Jul  1 13:21:05 2001//
+/infutil.c/1.1/Sun Jul  1 13:21:05 2001//
+/infutil.h/1.1/Sun Jul  1 13:21:05 2001//
+/maketree.c/1.2/Sun Jul  1 13:21:05 2001//
+/minigzip.c/1.3/Sun Jul  1 13:21:05 2001//
+/setup.h.in/1.2/Sun Jul  1 13:21:05 2001//
+/trees.c/1.2/Sun Jul  1 13:21:05 2001//
+/trees.h/1.1/Sun Jul  1 13:21:05 2001//
+/uncompr.c/1.2/Sun Jul  1 13:21:05 2001//
+/zconf.h/1.2/Sun Jul  1 13:21:05 2001//
+/zlib.3/1.2/Sun Jul  1 13:21:05 2001//
+/zlib.h/1.2/Sun Jul  1 13:21:05 2001//
+/zutil.c/1.2/Sun Jul  1 13:21:05 2001//
+/zutil.h/1.2/Sun Jul  1 13:21:05 2001//
 D