[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2004-11-17 11:46:20
|
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2004-11-17 11:46:01 UTC
Modified files:
ChangeLog ChangeLog.es doc/ircd.sample-en.conf
doc/ircd.sample-es.conf doc/history/Undernet/ChangeLog-u2.10.11
include/ircd_features.h include/patchlevel.h include/s_conf.h
ircd/Makefile.in ircd/channel.c ircd/gline.c ircd/ircd_features.c
ircd/ircd_relay.c ircd/listener.c ircd/m_away.c ircd/m_kill.c
ircd/m_notice.c ircd/m_ping.c ircd/m_pong.c ircd/m_privmsg.c
ircd/m_topic.c ircd/m_version.c ircd/m_wallchops.c
ircd/m_wallvoices.c ircd/m_whois.c ircd/parse.c ircd/s_bsd.c
ircd/s_conf.c ircd/s_err.c ircd/s_user.c
ircd/test/ircd_chattr.0.dat tools/crypter
Log message:
Author: zoltan <zo...@ir...>
Log message:
2004-11-17 Toni García <zo...@ir...> 1.0.alpha12
* Sincronizacion Undernet
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.12 ircd-ircdev/ChangeLog:1.13
--- ircd-ircdev/ChangeLog:1.12 Tue Nov 16 09:58:47 2004
+++ ircd-ircdev/ChangeLog Wed Nov 17 03:45:48 2004
@@ -1,13 +1,16 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.12 2004/11/16 17:58:47 zolty Exp $
+# $Id: ChangeLog,v 1.13 2004/11/17 11:45:48 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2004-11-17 Toni García <zo...@ir...> 1.0.alpha12
+ * Undernet synchronization
+
2004-11-16 Toni García <zo...@ir...> 1.0.alpha11
* IRCD IRC-Dev Reloaded!!
- * Distribuited DataBase preliminary version
+ * Distribuited DataBase preliminary version
2004-05-21 Toni García <zo...@ir...> 1.0.alpha10
* Disallow nick change on a moderated channel
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.12 ircd-ircdev/ChangeLog.es:1.13
--- ircd-ircdev/ChangeLog.es:1.12 Tue Nov 16 09:58:47 2004
+++ ircd-ircdev/ChangeLog.es Wed Nov 17 03:45:48 2004
@@ -1,10 +1,13 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.12 2004/11/16 17:58:47 zolty Exp $
+# $Id: ChangeLog.es,v 1.13 2004/11/17 11:45:48 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2004-11-17 Toni García <zo...@ir...> 1.0.alpha12
+ * Sincronizacion Undernet
+
2004-11-16 Toni García <zo...@ir...> 1.0.alpha11
* IRCD IRC-Dev Ha Vuelto!!
* Vesion preliminar de Base de Datos Distribuidas
Index: ircd-ircdev/doc/history/Undernet/ChangeLog-u2.10.11
diff -u ircd-ircdev/doc/history/Undernet/ChangeLog-u2.10.11:1.1 ircd-ircdev/doc/history/Undernet/ChangeLog-u2.10.11:1.2
--- ircd-ircdev/doc/history/Undernet/ChangeLog-u2.10.11:1.1 Fri Apr 23 03:07:50 2004
+++ ircd-ircdev/doc/history/Undernet/ChangeLog-u2.10.11 Wed Nov 17 03:45:49 2004
@@ -1,3 +1,188 @@
+2004-09-17 Kevin L Mitchell <kl...@mi...>
+
+ * include/patchlevel.h (PATCHLEVEL): Release the sucker.
+
+2004-09-13 Kevin L Mitchell <kl...@mi...>
+
+ * doc/readme.features: update feature name--forgotten in a prior
+ commit
+
+ * doc/ircd.conf.sample: update feature name--forgotten in a prior
+ commit
+
+ * doc/example.conf: update feature name--forgotten in a prior
+ commit
+
+ * include/patchlevel.h (PATCHLEVEL): bump patchlevel (again!),
+ just so we know who's runnin' what...
+
+ * ircd/listener.c (add_listener): a listener needs to be listed as
+ a server port listener BEFORE we open the listening port!
+
+2004-09-11 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/m_topic.c (do_settopic): oh, bah, stupid bug...
+
+2004-06-17 Fredrik Soderblom <fr...@qu...>
+
+ * ircd/s_conf.c (rehash): added restart_resolver()
+
+2003-07-04 Bas Steendijk <ste...@xs...>
+
+ * include/client.h, ircd/m_userhost.c, ircd/m_userip.c, ircd/m_who.c,
+ ircd/m_whois.c, ircd/whocmds.c: the same code, for "can user A see user
+ B is an oper", appeared in a lot of places. made it a define SeeOper.
+
+2004-09-11 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/m_topic.c (do_settopic): Don't allow banned users to set a
+ topic in a channel (adapted from patch by Alexander Maassen
+ <out...@ke...>)
+
+ * tools/Bounce/Bounce.h: drop file location
+
+ * tools/Bounce/Bounce.cpp: drop file location
+
+ * tools/crypter: drop file location; do some minor fixup; does
+ anyone actually use this script?
+
+ * tools/Makefile.crypt: drop file location
+
+ * ircd/test/ircd_chattr.0.dat (IsChannelPrefix): drop + from
+ channel prefix list
+
+ * ircd/s_user.c (hide_hostmask): use the already calculated hidden
+ host
+
+ * ircd/s_err.c: use the already calculated hidden host
+
+ * ircd/m_version.c (mo_version): fix up a comment
+
+ * ircd/m_topic.c (ms_topic): fix up a couple of comments
+
+ * ircd/m_quit.c: drop the "template" moniker
+
+ * ircd/m_privmsg.c: drop the "template" moniker
+
+ * ircd/m_pong.c: drop the "template" moniker
+
+ * ircd/m_ping.c: drop the "template" moniker
+
+ * ircd/m_opmode.c: update file location
+
+ * ircd/m_notice.c: drop the "template" moniker
+
+ * ircd/m_kill.c: drop the "template" moniker
+
+ * ircd/m_clearmode.c: update file location
+
+ * ircd/m_away.c: drop the "template" moniker
+
+ * ircd/ircd_relay.c (relay_directed_message): X does say it's a
+ service, now...
+
+ * config.h.in: drop file location
+
+ * acconfig.h: drop file location
+
+ * ircd/m_whois.c (do_whois): rename FEAT_HIS_LOCAL_CHAN_WHOIS to
+ satisfy reed :P
+
+ * ircd/ircd_features.c: rename FEAT_HIS_LOCAL_CHAN_WHOIS to
+ satisfy reed :P
+
+ * include/ircd_features.h: rename FEAT_HIS_LOCAL_CHAN_WHOIS to
+ satisfy reed :P
+
+ * include/patchlevel.h (PATCHLEVEL): bump patch level
+
+ * ircd/channel.c (is_banned): apply patch #888640
+
+2003-06-08 Matthias Crauwels <ult...@wo...>
+ * include/ircd_features.h: new feature FEAT_HIS_LOCAL_CHAN_WHOIS
+
+ * ircd/ircd_features.c: new feature FEAT_HIS_LOCAL_CHAN_WHOIS
+
+ * ircd/m_whois.c: hide local channels in local WHOIS, this breaks HIS
+
+ * doc/readme.features: documented FEAT_HIS_LOCAL_CHAN_WHOIS
+
+ * doc/ircd.conf.sample: default value for FEAT_HIS_LOCAL_CHAN_WHOIS
+
+2004-09-11 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/m_wallvoices.c (ms_wallvoices): Don't accept & channel
+ WALLVOICES from servers (Bug #721494)
+
+ * ircd/m_wallchops.c (ms_wallchops): Don't accept & channel
+ WALLCHOPS from servers (Bug #721494)
+
+ * ircd/ircd_relay.c: Don't accept & channel messages/notices from
+ servers (Bug #721494)
+
+ * ircd/gline.c (gline_add): fix GLINE logging (Bug #750927)
+
+ * ircd/channel.c: removing limits shouldn't gobble an argument;
+ this was a subtle interaction issue with modebuf...fixed by adding
+ MODE_LIMIT to modebuf_flush_int() and short-circuiting
+ modebuf_mode_uint() to add MODE_LIMIT to mbuf->mb_rem in the
+ removal case. Note that this is not proof against the sequence,
+ "modebuf_mode_uint(mbuf, MODE_ADD | MODE_LIMIT, 10);
+ modebuf_mode_uint(mbuf, MODE_DEL | MODE_LIMIT, 10);"
+ (Bug #916138)
+
+2004-08-31 Isomer <is...@un...>
+ * ircd/m_account.c: Back out untested login-on-connect extensions,
+ we'll relook at these for .12
+
+2004-04-17 Isomer <is...@un...>
+ * ircd/parse.c: Don't rate limit /gline messages
+
+2004-08-26 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/s_conf.c (lookup_confhost): if field 1 of a C-line contains
+ a '/', interpret the text before the '/' as an IP address to bind
+ to locally, and use the text after the '/' as the host to connect
+ to
+
+ * ircd/s_bsd.c (connect_inet): if origin field in struct ConfItem
+ is set, bind to the identified address
+
+ * include/s_conf.h: add origin field to struct ConfItem
+
+2004-06-20 Alex Badea <dec...@us...>
+
+ * ircd/m_account.c: login-on-connect extensions, part 1:
+ added message sub-types and implemented routing
+
+2004-06-18 Alex Badea <dec...@us...>
+
+ * ircd/gline.c (gline_lookup): only return a gline if it's
+ active
+
+ * ircd/s_conf.c (find_kill): don't check for active gline,
+ since gline_lookup does now
+
+2004-06-08 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/parse.c: don't let rank-and-file users escape HIS
+ limitations with /jupe...
+
+2004-05-14 Kevin L Mitchell <kl...@mi...>
+
+ * ircd/ircd_features.c: per CFV-0243, NICKLEN default is increased
+ to 12
+
+ * ircd/s_user.c: process account creation timestamp if present in
+ user mode portion of a N protocol message; add account creation
+ timestamp to outgoing N protocol messages if that timestamp is
+ non-zero
+
+ * ircd/m_account.c: process account creation timestamp if present
+ in AC protocol message
+
+ * include/struct.h: add account creation timestamp
+
2004-03-20 Isomer <is...@un...>
* ircd/m_invite.c: Disallow invites to non existant channels
Index: ircd-ircdev/doc/ircd.sample-en.conf
diff -u ircd-ircdev/doc/ircd.sample-en.conf:1.7 ircd-ircdev/doc/ircd.sample-en.conf:1.8
--- ircd-ircdev/doc/ircd.sample-en.conf:1.7 Fri May 28 03:15:55 2004
+++ ircd-ircdev/doc/ircd.sample-en.conf Wed Nov 17 03:45:49 2004
@@ -1,6 +1,6 @@
# ircd.conf - configuration file for IRC-Dev's IRCD.
#
-# Last Updated: 28, May 2004.
+# Last Updated: 17, Nov 2004.
#
# Written by Niels <ni...@un...>, based on the original example.conf,
# server code and some real-life (ahem) experience.
@@ -821,6 +821,7 @@
# "HIS_STATS_z" = "TRUE";
# "HIS_WHOIS_SERVERNAME" = "TRUE";
# "HIS_WHOIS_IDLETIME" = "TRUE";
+# "HIS_WHOIS_LOCALCHAN" = "TRUE";
# "HIS_WHO_SERVERNAME" = "TRUE";
# "HIS_WHO_HOPCOUNT" = TRUE";
# "HIS_BANWHO" = "TRUE";
Index: ircd-ircdev/doc/ircd.sample-es.conf
diff -u ircd-ircdev/doc/ircd.sample-es.conf:1.2 ircd-ircdev/doc/ircd.sample-es.conf:1.3
--- ircd-ircdev/doc/ircd.sample-es.conf:1.2 Fri May 28 03:15:56 2004
+++ ircd-ircdev/doc/ircd.sample-es.conf Wed Nov 17 03:45:49 2004
@@ -1,6 +1,6 @@
# ircd.conf - archivo de configuración para el IRCD de IRC-Dev.
#
-# Ultima actualización: 28, May 2004.
+# Ultima actualización: 17, Nov 2004.
#
# Escrito por Niels <ni...@un...>, basado en el archivo example.conf
# original, en el código del servidor y la experiencia de la vida real.
@@ -858,6 +858,7 @@
# "HIS_STATS_z" = "TRUE";
# "HIS_WHOIS_SERVERNAME" = "TRUE";
# "HIS_WHOIS_IDLETIME" = "TRUE";
+# "HIS_WHOIS_LOCALCHAN" = "TRUE";
# "HIS_WHO_SERVERNAME" = "TRUE";
# "HIS_WHO_HOPCOUNT" = TRUE";
# "HIS_BANWHO" = "TRUE";
Index: ircd-ircdev/include/ircd_features.h
diff -u ircd-ircdev/include/ircd_features.h:1.6 ircd-ircdev/include/ircd_features.h:1.7
--- ircd-ircdev/include/ircd_features.h:1.6 Fri May 21 08:39:34 2004
+++ ircd-ircdev/include/ircd_features.h Wed Nov 17 03:45:49 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: ircd_features.h,v 1.6 2004/05/21 15:39:34 zolty Exp $
+ * $Id: ircd_features.h,v 1.7 2004/11/17 11:45:49 zolty Exp $
*
*/
#ifndef INCLUDED_features_h
@@ -137,6 +137,7 @@
FEAT_HIS_STATS_z,
FEAT_HIS_WHOIS_SERVERNAME,
FEAT_HIS_WHOIS_IDLETIME,
+ FEAT_HIS_WHOIS_LOCALCHAN,
FEAT_HIS_WHO_SERVERNAME,
FEAT_HIS_WHO_HOPCOUNT,
FEAT_HIS_BANWHO,
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.12 ircd-ircdev/include/patchlevel.h:1.13
--- ircd-ircdev/include/patchlevel.h:1.12 Tue Nov 16 09:58:47 2004
+++ ircd-ircdev/include/patchlevel.h Wed Nov 17 03:45:49 2004
@@ -17,10 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: patchlevel.h,v 1.12 2004/11/16 17:58:47 zolty Exp $
+ * $Id: patchlevel.h,v 1.13 2004/11/17 11:45:49 zolty Exp $
*
*/
-#define PATCHLEVEL ".alpha11"
+#define PATCHLEVEL ".alpha12"
#define RELEASE "1.0"
Index: ircd-ircdev/include/s_conf.h
diff -u ircd-ircdev/include/s_conf.h:1.5 ircd-ircdev/include/s_conf.h:1.6
--- ircd-ircdev/include/s_conf.h:1.5 Fri May 21 08:39:34 2004
+++ ircd-ircdev/include/s_conf.h Wed Nov 17 03:45:49 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: s_conf.h,v 1.5 2004/05/21 15:39:34 zolty Exp $
+ * $Id: s_conf.h,v 1.6 2004/11/17 11:45:49 zolty Exp $
*
*/
#ifndef INCLUDED_s_conf_h
@@ -74,6 +74,7 @@
unsigned int status; /* If CONF_ILLEGAL, delete when no clients */
unsigned int clients; /* Number of *LOCAL* clients using this */
struct ConnectionClass* conn_class; /* Class of connection */
+ struct in_addr origin; /* ip number of connect origin */
struct in_addr ipnum; /* ip number of host field */
char* host;
char* passwd;
Index: ircd-ircdev/ircd/Makefile.in
diff -u ircd-ircdev/ircd/Makefile.in:1.11 ircd-ircdev/ircd/Makefile.in:1.12
--- ircd-ircdev/ircd/Makefile.in:1.11 Tue Nov 16 09:58:47 2004
+++ ircd-ircdev/ircd/Makefile.in Wed Nov 17 03:45:49 2004
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA
-# $Id: Makefile.in,v 1.11 2004/11/16 17:58:47 zolty Exp $
+# $Id: Makefile.in,v 1.12 2004/11/17 11:45:49 zolty Exp $
#### Start of system configuration section. ####
@@ -414,7 +414,7 @@
dbuf.o: dbuf.c ../config.h ../include/dbuf.h ../include/ircd_alloc.h \
../include/ircd_chattr.h ../include/ircd_features.h ../include/send.h \
../include/sys.h
-ddb.o: ddb.c ../config.h ../include/ddb.h
+ddb.o: ddb.c ../config.h
destruct_event.o: destruct_event.c ../config.h ../include/channel.h \
../include/ircd_defs.h ../include/s_debug.h ../include/ircd_alloc.h \
../include/ircd.h ../include/struct.h ../include/ircd_events.h \
@@ -605,12 +605,8 @@
../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
../include/numnicks.h ../include/s_debug.h ../include/s_misc.h \
../include/s_user.h ../include/send.h
-m_db.o: m_db.c ../config.h ../include/ddb.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
- ../include/ircd_events.h ../include/ircd_handler.h ../include/msg.h
-m_dbq.o: m_dbq.c ../config.h ../include/ddb.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
- ../include/ircd_events.h ../include/ircd_handler.h ../include/msg.h
+m_db.o: m_db.c ../config.h
+m_dbq.o: m_dbq.c ../config.h
m_defaults.o: m_defaults.c ../config.h ../include/client.h \
../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
Index: ircd-ircdev/ircd/channel.c
diff -u ircd-ircdev/ircd/channel.c:1.7 ircd-ircdev/ircd/channel.c:1.8
--- ircd-ircdev/ircd/channel.c:1.7 Fri May 21 08:39:34 2004
+++ ircd-ircdev/ircd/channel.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: channel.c,v 1.7 2004/05/21 15:39:34 zolty Exp $
+ * $Id: channel.c,v 1.8 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -501,7 +501,7 @@
if (match(tmp->value.ban.banstr, ip_s) == 0)
break;
}
- else if (match(tmp->value.ban.banstr, s) == 0)
+ if (match(tmp->value.ban.banstr, s) == 0)
break;
else if (sr && match(tmp->value.ban.banstr, sr) == 0)
break;
@@ -1611,7 +1611,7 @@
MODE_WASDELJOINS, 'd',
/* MODE_KEY, 'k', */
/* MODE_BAN, 'b', */
-/* MODE_LIMIT, 'l', */
+ MODE_LIMIT, 'l',
#if defined(UNDERNET)
/* MODE_APASS, 'A', */
/* MODE_UPASS, 'u', */
@@ -2033,6 +2033,11 @@
assert(0 != mbuf);
assert(0 != (mode & (MODE_ADD | MODE_DEL)));
+ if (mode == (MODE_LIMIT | MODE_DEL)) {
+ mbuf->mb_rem |= mode;
+ return;
+ }
+
MB_TYPE(mbuf, mbuf->mb_count) = mode;
MB_UINT(mbuf, mbuf->mb_count) = uint;
Index: ircd-ircdev/ircd/gline.c
diff -u ircd-ircdev/ircd/gline.c:1.6 ircd-ircdev/ircd/gline.c:1.7
--- ircd-ircdev/ircd/gline.c:1.6 Fri May 21 08:39:34 2004
+++ ircd-ircdev/ircd/gline.c Wed Nov 17 03:45:50 2004
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: gline.c,v 1.6 2004/05/21 15:39:34 zolty Exp $
+ * $Id: gline.c,v 1.7 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -448,9 +448,11 @@
/* and log it */
log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
- "%#C adding %s %s for %s, expiring at %Tu: %s", sptr,
+ "%#C adding %s %s for %s%s%s, expiring at %Tu: %s", sptr,
flags & GLINE_LOCAL ? "local" : "global",
- flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", userhost,
+ flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", user,
+ flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : "@",
+ flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : host,
expire + TSoffset, reason);
/* make the gline */
@@ -666,7 +668,8 @@
Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
-
+ if (!GlineIsActive(gline))
+ continue;
return gline;
}
else {
@@ -683,7 +686,8 @@
continue;
}
}
- return gline;
+ if (GlineIsActive(gline))
+ return gline;
}
/*
* No Glines matched
Index: ircd-ircdev/ircd/ircd_features.c
diff -u ircd-ircdev/ircd/ircd_features.c:1.6 ircd-ircdev/ircd/ircd_features.c:1.7
--- ircd-ircdev/ircd/ircd_features.c:1.6 Fri May 21 08:39:34 2004
+++ ircd-ircdev/ircd/ircd_features.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: ircd_features.c,v 1.6 2004/05/21 15:39:34 zolty Exp $
+ * $Id: ircd_features.c,v 1.7 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -344,6 +344,7 @@
F_B(HIS_STATS_z, 0, 1, 0),
F_B(HIS_WHOIS_SERVERNAME, 0, 1, 0),
F_B(HIS_WHOIS_IDLETIME, 0, 1, 0),
+ F_B(HIS_WHOIS_LOCALCHAN, 0, 1, 0),
F_B(HIS_WHO_SERVERNAME, 0, 1, 0),
F_B(HIS_WHO_HOPCOUNT, 0, 1, 0),
F_B(HIS_BANWHO, 0, 1, 0),
Index: ircd-ircdev/ircd/ircd_relay.c
diff -u ircd-ircdev/ircd/ircd_relay.c:1.4 ircd-ircdev/ircd/ircd_relay.c:1.5
--- ircd-ircdev/ircd/ircd_relay.c:1.4 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/ircd_relay.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: ircd_relay.c,v 1.4 2004/05/21 15:39:35 zolty Exp $
+ * $Id: ircd_relay.c,v 1.5 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -109,7 +109,7 @@
assert(0 != name);
assert(0 != text);
- if (0 == (chptr = FindChannel(name))) {
+ if (*name == '&' || 0 == (chptr = FindChannel(name))) {
/*
* XXX - do we need to send this back from a remote server?
*/
@@ -135,7 +135,7 @@
assert(0 != name);
assert(0 != text);
- if (0 == (chptr = FindChannel(name)))
+ if (*name == '&' || 0 == (chptr = FindChannel(name)))
return;
/*
* This first: Almost never a server/service
Index: ircd-ircdev/ircd/listener.c
diff -u ircd-ircdev/ircd/listener.c:1.3 ircd-ircdev/ircd/listener.c:1.4
--- ircd-ircdev/ircd/listener.c:1.3 Sun Feb 22 08:11:42 2004
+++ ircd-ircdev/ircd/listener.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: listener.c,v 1.3 2004/02/22 16:11:42 zolty Exp $
+ * $Id: listener.c,v 1.4 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -350,11 +350,12 @@
listener = make_listener(port, vaddr);
+ set_listener_mask(listener, mask);
+ listener->hidden = is_hidden;
+ listener->server = is_server;
+
if (inetport(listener)) {
listener->active = 1;
- set_listener_mask(listener, mask);
- listener->hidden = is_hidden;
- listener->server = is_server;
listener->next = ListenerPollList;
ListenerPollList = listener;
}
Index: ircd-ircdev/ircd/m_away.c
diff -u ircd-ircdev/ircd/m_away.c:1.2 ircd-ircdev/ircd/m_away.c:1.3
--- ircd-ircdev/ircd/m_away.c:1.2 Sun Feb 22 08:11:42 2004
+++ ircd-ircdev/ircd/m_away.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_away.c,v 1.2 2004/02/22 16:11:42 zolty Exp $
+ * $Id: m_away.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -141,7 +141,7 @@
/*
- * m_away - generic message handler template
+ * m_away - generic message handler
* - Added 14 Dec 1988 by jto.
*
* parv[0] = sender prefix
@@ -171,7 +171,7 @@
}
/*
- * ms_away - server message handler template
+ * ms_away - server message handler
* - Added 14 Dec 1988 by jto.
*
* parv[0] = sender prefix
Index: ircd-ircdev/ircd/m_kill.c
diff -u ircd-ircdev/ircd/m_kill.c:1.2 ircd-ircdev/ircd/m_kill.c:1.3
--- ircd-ircdev/ircd/m_kill.c:1.2 Thu Apr 22 10:37:18 2004
+++ ircd-ircdev/ircd/m_kill.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_kill.c,v 1.2 2004/04/22 17:37:18 zolty Exp $
+ * $Id: m_kill.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -161,7 +161,7 @@
}
/*
- * ms_kill - server message handler template
+ * ms_kill - server message handler
*
* NOTE: IsServer(cptr) == true;
*
@@ -226,7 +226,7 @@
}
/*
- * mo_kill - oper message handler template
+ * mo_kill - oper message handler
*
* NOTE: IsPrivileged(sptr), IsAnOper(sptr) == true
* IsServer(cptr), IsServer(sptr) == false
Index: ircd-ircdev/ircd/m_notice.c
diff -u ircd-ircdev/ircd/m_notice.c:1.2 ircd-ircdev/ircd/m_notice.c:1.3
--- ircd-ircdev/ircd/m_notice.c:1.2 Thu Apr 22 10:37:18 2004
+++ ircd-ircdev/ircd/m_notice.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_notice.c,v 1.2 2004/04/22 17:37:18 zolty Exp $
+ * $Id: m_notice.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -147,7 +147,7 @@
}
/*
- * ms_notice - server message handler template
+ * ms_notice - server message handler
*/
int ms_notice(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
{
Index: ircd-ircdev/ircd/m_ping.c
diff -u ircd-ircdev/ircd/m_ping.c:1.4 ircd-ircdev/ircd/m_ping.c:1.5
--- ircd-ircdev/ircd/m_ping.c:1.4 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/m_ping.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_ping.c,v 1.4 2004/05/21 15:39:35 zolty Exp $
+ * $Id: m_ping.c,v 1.5 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -230,7 +230,7 @@
*/
/*
- * ms_ping - server message handler template
+ * ms_ping - server message handler
*/
int ms_ping(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
{
Index: ircd-ircdev/ircd/m_pong.c
diff -u ircd-ircdev/ircd/m_pong.c:1.2 ircd-ircdev/ircd/m_pong.c:1.3
--- ircd-ircdev/ircd/m_pong.c:1.2 Thu Apr 22 10:37:18 2004
+++ ircd-ircdev/ircd/m_pong.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_pong.c,v 1.2 2004/04/22 17:37:18 zolty Exp $
+ * $Id: m_pong.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -97,7 +97,7 @@
#include <stdlib.h>
/*
- * ms_pong - server message handler template
+ * ms_pong - server message handler
*
* parv[0] = sender prefix
* parv[1] = origin
Index: ircd-ircdev/ircd/m_privmsg.c
diff -u ircd-ircdev/ircd/m_privmsg.c:1.2 ircd-ircdev/ircd/m_privmsg.c:1.3
--- ircd-ircdev/ircd/m_privmsg.c:1.2 Thu Apr 22 10:37:18 2004
+++ ircd-ircdev/ircd/m_privmsg.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_privmsg.c,v 1.2 2004/04/22 17:37:18 zolty Exp $
+ * $Id: m_privmsg.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*/
/*
@@ -143,7 +143,7 @@
}
/*
- * ms_privmsg - server message handler template
+ * ms_privmsg - server message handler
*/
int ms_privmsg(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
{
Index: ircd-ircdev/ircd/m_topic.c
diff -u ircd-ircdev/ircd/m_topic.c:1.3 ircd-ircdev/ircd/m_topic.c:1.4
--- ircd-ircdev/ircd/m_topic.c:1.3 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/m_topic.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_topic.c,v 1.3 2004/05/21 15:39:35 zolty Exp $
+ * $Id: m_topic.c,v 1.4 2004/11/17 11:45:50 zolty Exp $
*
*/
@@ -108,12 +108,16 @@
from = sptr;
member = find_channel_member(sptr, chptr);
- /* if +n and not @'d, return an error and ignore the topic */
+ /* if +t and not @'d, return an error and ignore the topic */
if ((chptr->mode.mode & MODE_TOPICLIMIT) != 0 && (!member || !IsChanOp(member)))
{
send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname);
return;
}
+ if (!client_can_send_to_channel(sptr, chptr, 1)) {
+ send_reply(sptr, ERR_CANNOTSENDTOCHAN, chptr->chname);
+ return;
+ }
if (member && IsDelayedJoin(member))
RevealDelayedJoin(member);
/* Note if this is just a refresh of an old topic, and don't
@@ -125,7 +129,7 @@
ircd_strncpy(chptr->topic, topic, TOPICLEN);
ircd_strncpy(chptr->topic_nick, cli_name(from), NICKLEN);
chptr->topic_time = ts ? ts : TStime();
- /* Fixed in 2.10.11: Don't propergate local topics */
+ /* Fixed in 2.10.11: Don't propagate local topics */
if (!IsLocalChannel(chptr->chname))
sendcmdto_serv_butone(sptr, CMD_TOPIC, cptr, "%H %Tu %Tu :%s", chptr,
chptr->creationtime, chptr->topic_time, chptr->topic);
@@ -192,7 +196,7 @@
}
/*
- * ms_topic - generic message handler
+ * ms_topic - server message handler
*
* parv[0] = sender prefix
* parv[1] = channel
Index: ircd-ircdev/ircd/m_version.c
diff -u ircd-ircdev/ircd/m_version.c:1.2 ircd-ircdev/ircd/m_version.c:1.3
--- ircd-ircdev/ircd/m_version.c:1.2 Thu Apr 22 10:37:18 2004
+++ ircd-ircdev/ircd/m_version.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_version.c,v 1.2 2004/04/22 17:37:18 zolty Exp $
+ * $Id: m_version.c,v 1.3 2004/11/17 11:45:50 zolty Exp $
*/
/*
@@ -119,7 +119,7 @@
}
/*
- * mo_version - generic message handler
+ * mo_version - oper message handler
*
* parv[0] = sender prefix
* parv[1] = servername
Index: ircd-ircdev/ircd/m_wallchops.c
diff -u ircd-ircdev/ircd/m_wallchops.c:1.3 ircd-ircdev/ircd/m_wallchops.c:1.4
--- ircd-ircdev/ircd/m_wallchops.c:1.3 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/m_wallchops.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_wallchops.c,v 1.3 2004/05/21 15:39:35 zolty Exp $
+ * $Id: m_wallchops.c,v 1.4 2004/11/17 11:45:50 zolty Exp $
*/
/*
@@ -141,7 +141,7 @@
if (parc < 3 || !IsUser(sptr))
return 0;
- if ((chptr = FindChannel(parv[1]))) {
+ if (*parv[1] != '&' && (chptr = FindChannel(parv[1]))) {
if (client_can_send_to_channel(sptr, chptr, 0)) {
sendcmdto_channel_butone(sptr, CMD_WALLCHOPS, chptr, cptr,
SKIP_DEAF | SKIP_BURST | SKIP_NONOPS,
Index: ircd-ircdev/ircd/m_wallvoices.c
diff -u ircd-ircdev/ircd/m_wallvoices.c:1.3 ircd-ircdev/ircd/m_wallvoices.c:1.4
--- ircd-ircdev/ircd/m_wallvoices.c:1.3 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/m_wallvoices.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_wallvoices.c,v 1.3 2004/05/21 15:39:35 zolty Exp $
+ * $Id: m_wallvoices.c,v 1.4 2004/11/17 11:45:50 zolty Exp $
*/
/*
@@ -141,7 +141,7 @@
if (parc < 3 || !IsUser(sptr))
return 0;
- if ((chptr = FindChannel(parv[1]))) {
+ if (*parv[1] != '&' && (chptr = FindChannel(parv[1]))) {
if (client_can_send_to_channel(sptr, chptr, 0)) {
sendcmdto_channel_butone(sptr, CMD_WALLVOICES, chptr, cptr,
SKIP_DEAF | SKIP_BURST | SKIP_NONVOICES,
Index: ircd-ircdev/ircd/m_whois.c
diff -u ircd-ircdev/ircd/m_whois.c:1.7 ircd-ircdev/ircd/m_whois.c:1.8
--- ircd-ircdev/ircd/m_whois.c:1.7 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/m_whois.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: m_whois.c,v 1.7 2004/05/21 15:39:35 zolty Exp $
+ * $Id: m_whois.c,v 1.8 2004/11/17 11:45:50 zolty Exp $
*/
/*
@@ -156,6 +156,14 @@
if (acptr != sptr && IsZombie(chan))
continue;
+
+ /* Don't show local channels when HIS is defined, unless it's a
+ * remote WHOIS --ULtimaTe_
+ */
+ if (IsLocalChannel(chptr->chname) && (parc == 2) &&
+ feature_bool(FEAT_HIS_WHOIS_LOCALCHAN) && (acptr != sptr) &&
+ !IsAnOper(sptr))
+ continue;
if (len+strlen(chptr->chname) + mlen > BUFSIZE - 5)
{
Index: ircd-ircdev/ircd/parse.c
diff -u ircd-ircdev/ircd/parse.c:1.7 ircd-ircdev/ircd/parse.c:1.8
--- ircd-ircdev/ircd/parse.c:1.7 Tue Nov 16 09:58:47 2004
+++ ircd-ircdev/ircd/parse.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: parse.c,v 1.7 2004/11/16 17:58:47 zolty Exp $
+ * $Id: parse.c,v 1.8 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -495,7 +495,7 @@
{
MSG_GLINE,
TOK_GLINE,
- 0, MAXPARA, MFLG_SLOW, 0, NULL,
+ 0, MAXPARA, 0, 0, NULL,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_unregistered, m_gline, ms_gline, mo_gline, m_ignore }
},
Index: ircd-ircdev/ircd/s_bsd.c
diff -u ircd-ircdev/ircd/s_bsd.c:1.4 ircd-ircdev/ircd/s_bsd.c:1.5
--- ircd-ircdev/ircd/s_bsd.c:1.4 Sun Feb 22 08:11:42 2004
+++ ircd-ircdev/ircd/s_bsd.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: s_bsd.c,v 1.4 2004/02/22 16:11:42 zolty Exp $
+ * $Id: s_bsd.c,v 1.5 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -234,7 +234,7 @@
*/
static int connect_inet(struct ConfItem* aconf, struct Client* cptr)
{
- static struct sockaddr_in sin;
+ static struct sockaddr_in sin, *locaddr = 0;
IOResult result;
assert(0 != aconf);
assert(0 != cptr);
@@ -270,9 +270,17 @@
* explicitly bind it, it will default to IN_ADDR_ANY and we lose
* due to the other server not allowing our base IP --smg
*/
- if (feature_bool(FEAT_VIRTUAL_HOST) &&
- bind(cli_fd(cptr), (struct sockaddr*) &VirtualHost,
- sizeof(VirtualHost))) {
+ if (aconf->origin.s_addr != INADDR_NONE) {
+ memset(&sin, 0, sizeof(sin));
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = aconf->origin.s_addr;
+ locaddr = &sin;
+ } else if (feature_bool(FEAT_VIRTUAL_HOST))
+ locaddr = &VirtualHost;
+
+ if (locaddr &&
+ bind(cli_fd(cptr), (struct sockaddr*) locaddr,
+ sizeof(struct sockaddr_in))) {
report_error(BIND_ERROR_MSG, cli_name(cptr), errno);
close(cli_fd(cptr));
cli_fd(cptr) = -1;
Index: ircd-ircdev/ircd/s_conf.c
diff -u ircd-ircdev/ircd/s_conf.c:1.5 ircd-ircdev/ircd/s_conf.c:1.6
--- ircd-ircdev/ircd/s_conf.c:1.5 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/s_conf.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: s_conf.c,v 1.5 2004/05/21 15:39:35 zolty Exp $
+ * $Id: s_conf.c,v 1.6 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -246,6 +246,8 @@
*/
void lookup_confhost(struct ConfItem *aconf)
{
+ char *tmp, *tmp2;
+
if (EmptyString(aconf->host) || EmptyString(aconf->name)) {
Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
aconf->host, aconf->name));
@@ -255,6 +257,15 @@
* Do name lookup now on hostnames given and store the
* ip numbers in conf structure.
*/
+ if ((tmp = strchr(aconf->host, '/'))) {
+ *(tmp++) = '\0';
+ aconf->origin.s_addr = inet_addr(aconf->host);
+ tmp2 = aconf->host;
+ DupString(aconf->host, tmp);
+ free(tmp2);
+ } else
+ aconf->origin.s_addr = INADDR_NONE;
+
if (IsDigit(*aconf->host)) {
/*
* rfc 1035 sez host names may not start with a digit
@@ -949,15 +960,13 @@
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
}
- else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+ else if ((agline = gline_lookup(cptr, 0))) {
/*
* find active glines
* added a check against the user's IP address to find_gline() -Kev
*/
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
}
- else
- agline = 0; /* if a gline was found, it was inactive */
if (deny)
return -1;
Index: ircd-ircdev/ircd/s_err.c
diff -u ircd-ircdev/ircd/s_err.c:1.7 ircd-ircdev/ircd/s_err.c:1.8
--- ircd-ircdev/ircd/s_err.c:1.7 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/s_err.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: s_err.c,v 1.7 2004/05/21 15:39:35 zolty Exp $
+ * $Id: s_err.c,v 1.8 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -835,7 +835,7 @@
/* 395 */
{ 0 },
/* 396 */
- { RPL_HOSTHIDDEN, "%s.%s :is now your hidden host", "396" },
+ { RPL_HOSTHIDDEN, "%s :is now your hidden host", "396" },
/* 397 */
{ 0 },
/* 398 */
Index: ircd-ircdev/ircd/s_user.c
diff -u ircd-ircdev/ircd/s_user.c:1.6 ircd-ircdev/ircd/s_user.c:1.7
--- ircd-ircdev/ircd/s_user.c:1.6 Fri May 21 08:39:35 2004
+++ ircd-ircdev/ircd/s_user.c Wed Nov 17 03:45:50 2004
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: s_user.c,v 1.6 2004/05/21 15:39:35 zolty Exp $
+ * $Id: s_user.c,v 1.7 2004/11/17 11:45:50 zolty Exp $
*
*/
#include "config.h"
@@ -1107,8 +1107,7 @@
/* ok, the client is now fully hidden, so let them know -- hikari */
if (MyConnect(cptr))
- send_reply(cptr, RPL_HOSTHIDDEN, cli_user(cptr)->account,
- feature_str(FEAT_HIDDEN_HOST));
+ send_reply(cptr, RPL_HOSTHIDDEN, cli_user(cptr)->host(<
/*
* Go through all channels the client was on, rejoin him
Index: ircd-ircdev/ircd/test/ircd_chattr.0.dat
diff -u ircd-ircdev/ircd/test/ircd_chattr.0.dat:1.1.1.1 ircd-ircdev/ircd/test/ircd_chattr.0.dat:1.2
--- ircd-ircdev/ircd/test/ircd_chattr.0.dat:1.1.1.1 Mon Sep 8 03:34:31 2003
+++ ircd-ircdev/ircd/test/ircd_chattr.0.dat Wed Nov 17 03:45:50 2004
@@ -7,7 +7,7 @@
IsCntrl: \0\1\2\3\4\5\6\a\b\t\n\v\f\r\e\f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f
IsChannelChar: \0\1\2\3\4\5\6\b\t\n\v\f\r\e\f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f!"#$%&'()*+-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\7f\80\81\82\83\84\85\86\87\88\89\8a\8b\8c\8d\8e\8f\90\91\92\93\94\95\96\97\98\99\9a\9b\9c\9d\9e\9f\a1\a2\a3\a4\a5\a6\a7\a8\a9\aa\ab\ac\ad\ae\af\b0\b1\b2\b3\b4\b5\b6\b7\b8\b9\ba\bb\bc\bd\be\bf\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\ca\cb\cc\cd\ce\cf\d0\d1\d2\d3\d4\d5\d6\d7\d8\d9\da\db\dc\dd\de\df\e0\e1\e2\e3\e4\e5\e6\e7\e8\e9\ea\eb\ec\ed\ee\ef\f0\f1\f2\f3\f4\f5\f6\f7\f8\f9\fa\fb\fc\fd\fe\ff
IsChannelLower: \c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\ca\cb\cc\cd\ce\cf\d0\d1\d2\d3\d4\d5\d6\d8\d9\da\db\dc\dd\de
-IsChannelPrefix: #&+
+IsChannelPrefix: #&
IsNickChar: -0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
IsUserChar: '-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\ca\cb\cc\cd\ce\cf\d0\d1\d2\d3\d4\d5\d6\d8\d9\da\db\dc\dd\de\e0\e1\e2\e3\e4\e5\e6\e7\e8\e9\ea\eb\ec\ed\ee\ef\f0\f1\f2\f3\f4\f5\f6\f8\f9\fa\fb\fc\fd\fe
IsHostChar: -.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~
Index: ircd-ircdev/tools/crypter
diff -u ircd-ircdev/tools/crypter:1.2 ircd-ircdev/tools/crypter:1.3
--- ircd-ircdev/tools/crypter:1.2 Sun Feb 22 08:14:25 2004
+++ ircd-ircdev/tools/crypter Wed Nov 17 03:45:51 2004
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# IRC-Dev IRCD - An advanced and innovative IRC Daemon, tools/crypter
#
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# $Id: crypter,v 1.2 2004/02/22 16:14:25 zolty Exp $
+# $Id: crypter,v 1.3 2004/11/17 11:45:51 zolty Exp $
#
#From Sean Batt se...@co...
@@ -37,7 +37,7 @@
@saltset = ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '.', '/');
umask(0077);
-open ($ircdout, ">/tmp/ircd.conf.tmp") || die "open $!";
+open ($ircdout, ">$tmpfile") || die "open $!";
while ($text = <>) {
#if its not an "O" line we can ignore it
@@ -52,5 +52,6 @@
close ($ircdin);
print "/bin/cp ",$tmpfile," ",$ircdconf,"\n";
(fork()==0) ? exec("/bin/cp", $tmpfile, $ircdconf) : wait;
+print "",$ircdconf," has been crypted successfully!\n";
#unlink($tmpfile);
----------------------- End of diff -----------------------
|
