diff --git a/ChangeLog b/ChangeLog
index 21786f1d..8fae2ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+nenolod 2007/08/09 06:40:52 UTC (20070809-3548)
+ Log:
+ - better text for RPL_LOAD2HI explaining in a better way what is going on
+
+
+ Changes: Modified:
+ +1 -2 trunk/src/messages.tab (File Modified)
+
+
jilles 2007/08/01 20:52:54 UTC (20070801-3546)
Log:
Also rerun autoheader, for solaris ports changes.
diff --git a/doc/example.conf b/doc/example.conf
index 84575e22..c3d5e652 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
* Copyright (C) 2002-2005 ircd-ratbox development team
* Copyright (C) 2005-2006 charybdis development team
*
- * $Id: example.conf 3482 2007-05-27 05:35:06Z nenolod $
+ * $Id: example.conf 3550 2007-08-09 06:47:26Z nenolod $
*
* See reference.conf for more information.
*/
@@ -30,7 +30,6 @@
serverinfo {
name = "hades.arpa";
- use_ts6 = yes;
sid = "42X";
description = "charybdis test server";
network_name = "AthemeNET";
diff --git a/doc/reference.conf b/doc/reference.conf
index c2b98ae5..6241d310 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
*
* Written by ejb, wcampbel, db, leeh and others
*
- * $Id: reference.conf 3482 2007-05-27 05:35:06Z nenolod $
+ * $Id: reference.conf 3550 2007-08-09 06:47:26Z nenolod $
*/
/* IMPORTANT NOTES:
@@ -82,16 +82,11 @@ serverinfo {
/* name: the name of our server */
name = "hades.arpa";
- /* use ts6: whether we want to use the TS6 protocol to other servers
- * or not.
- */
- use_ts6 = yes;
-
/* sid: the unique server id of our server. This must be three
* characters long. The first character must be a digit [0-9], the
* remaining two chars may be letters [A-Z] or digits [0-9].
*
- * This must be specified even if use_ts6 is set to no.
+ * This parameter must be specified for the server to start.
*/
sid = "42X";
diff --git a/doc/sgml/oper-guide/config.sgml b/doc/sgml/oper-guide/config.sgml
index 1dba228a..0163a435 100644
--- a/doc/sgml/oper-guide/config.sgml
+++ b/doc/sgml/oper-guide/config.sgml
@@ -42,7 +42,6 @@ loadmodule "text";
serverinfo {
name = "text";
- use_ts6 = boolean;
sid = "text";
description = "text";
network_name = "text";
@@ -66,15 +65,6 @@ serverinfo {
-
- use_ts6
-
-
- A boolean which defines whether or not you want to use the new TS6 protocol, which provides
- many improvements over the old protocol, TS5, which is used in Hyperion.
-
-
-
sid
diff --git a/include/s_conf.h b/include/s_conf.h
index 9e7dab2f..846d2fe2 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_conf.h 3460 2007-05-18 20:31:33Z jilles $
+ * $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $
*/
#ifndef INCLUDED_s_conf_h
@@ -289,7 +289,6 @@ struct server_info
char *network_name;
char *network_desc;
int hub;
- int use_ts6;
struct sockaddr_in ip;
#ifdef IPV6
struct sockaddr_in6 ip6;
diff --git a/include/serno.h b/include/serno.h
index d77c22a1..a7266bfa 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070801-3546"
+#define SERNO "20070809-3548"
diff --git a/modules/m_pass.c b/modules/m_pass.c
index 1cfe2844..d26e640a 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_pass.c 1291 2006-05-05 19:00:19Z jilles $
+ * $Id: m_pass.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
@@ -45,7 +45,7 @@ struct Message pass_msgtab = {
};
mapi_clist_av1 pass_clist[] = { &pass_msgtab, NULL };
-DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 1291 $");
+DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $");
/*
* m_pass() - Added Sat, 4 March 1989
@@ -86,7 +86,7 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
/* kludge, if we're not using ts6, dont ever mark a server
* as TS6 capable, that way we'll never send them TS6 data.
*/
- if(ServerInfo.use_ts6 && parc == 5 && atoi(parv[3]) >= 6)
+ if(parc == 5 && atoi(parv[3]) >= 6)
{
/* only mark as TS6 if the SID is valid.. */
if(IsDigit(parv[4][0]) && IsIdChar(parv[4][1]) &&
diff --git a/src/newconf.c b/src/newconf.c
index 98b831f0..8c1e52b5 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1,5 +1,5 @@
/* This code is in the public domain.
- * $Id: newconf.c 3446 2007-05-14 22:21:16Z jilles $
+ * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
@@ -1910,7 +1910,6 @@ static struct ConfEntry conf_serverinfo_table[] =
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
{ "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
- { "use_ts6", CF_YESNO, NULL, 0, &ServerInfo.use_ts6 },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },
{ "name", CF_QSTRING, conf_set_serverinfo_name, 0, NULL },
diff --git a/src/s_conf.c b/src/s_conf.c
index 6d452c4d..2db0c872 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_conf.c 3446 2007-05-14 22:21:16Z jilles $
+ * $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
@@ -737,7 +737,6 @@ set_default_conf(void)
memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
ServerInfo.specific_ipv6_vhost = 0;
#endif
- ServerInfo.use_ts6 = YES;
/* Don't reset hub, as that will break lazylinks */
/* ServerInfo.hub = NO; */
diff --git a/src/s_serv.c b/src/s_serv.c
index 43276b74..d33afa24 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_serv.c 3542 2007-08-01 20:18:12Z jilles $
+ * $Id: s_serv.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
@@ -1049,15 +1049,8 @@ server_estab(struct Client *client_p)
*/
if(!EmptyString(server_p->spasswd))
{
- /* kludge, if we're not using TS6, dont ever send
- * ourselves as being TS6 capable.
- */
- if(ServerInfo.use_ts6)
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- else
- sendto_one(client_p, "PASS %s :TS",
- server_p->spasswd);
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ server_p->spasswd, TS_CURRENT, me.id);
}
/* pass info to new server */
@@ -1724,12 +1717,8 @@ serv_connect_callback(int fd, int status, void *data)
*/
if(!EmptyString(server_p->spasswd))
{
- if(ServerInfo.use_ts6)
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- else
- sendto_one(client_p, "PASS %s :TS",
- server_p->spasswd);
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ server_p->spasswd, TS_CURRENT, me.id);
}
/* pass my info to the new server */