1
0
mirror of https://github.com/anope/anope.git synced 2026-07-02 20:25:44 +02:00

Merge commit 'trunk' into anopeng (1.8 updates, etc)

Conflicts:

	src/main.c
	src/mysql.c
	version.log


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1504 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-03 00:01:19 +00:00
parent a765a1155f
commit eda1fca43e
24 changed files with 7722 additions and 6691 deletions
+24 -2
View File
@@ -1,9 +1,31 @@
Anope Version SVN
Anope Version 1.8.0
-------------------
10/19 F Updated Anope Credits [ #00]
Provided by Szymek <szymek@adres.pl> - 2008
10/25 F Updated Polish language file translation. [ #00]
Provided by Kein <kein-of@yandex.ru> - 2008
10/25 F Updated Russian language file translation [#959]
Anope Version 1.7.24
--------------------
10/14 F Fixed minor error in German language file. [#958]
10/12 F Fixed language error in saset help. [ #00]
10/12 F Fixed MySQL DB routines not storing passwords properly. [#940]
10/12 F Fixed OS STATS missing HS and showing disabled clients. [#956]
10/19 F Added warning regarding combined use of MySQL and skeleton mode. [#957]
Provided by Szymek <szymek@adres.pl> - 2008
10/14 F Updated Polish language file translation. [ #00]
Provided by Han` <Han@mefalcon.org> - 2008
10/19 F Updated German language file. [ #00]
Anope Version 1.7.23b
--------------------
10/06 F Fixed issue with encrypted nick databases [ #00]
10/06 F Fixed issue with encrypted nick databases. [ #00]
Anope Version 1.7.23
--------------------
+10 -1
View File
@@ -1,4 +1,13 @@
Anope Version SVN
Anope Version 1.8.0
-------------------
** ADDED CONFIGURATION DIRECTIVES **
** MODIFIED CONFIGURATION DIRECTIVES **
** DELETED CONFIGURATION DIRECTIVES **
Anope Version 1.7.24
--------------------
** ADDED CONFIGURATION DIRECTIVES **
+12 -2
View File
@@ -1,11 +1,21 @@
Anope Version SVN
--------------------
Anope Version 1.8.0
-------------------
*** New Strings:
*** Mod Strings:
*** Del Strings:
Anope Version 1.7.24
--------------------
*** New Strings:
OPER_STATS_HOSTSERV_MEM
*** Mod Strings:
NICK_HELP_SASET_AUTOOP
*** Del Strings:
Anope Version 1.7.23b
--------------------
*** New Strings:
+5 -1
View File
@@ -1,4 +1,8 @@
Anope Version SVN
Anope Version 1.8.0
-------------------
- NONE
Anope Version 1.7.24
--------------------
- NONE
+17
View File
@@ -63,6 +63,7 @@ Table of Contents
files. What should I do?
4.4) My FreeBSD box complains about 'Shared object "nss_dns.so.1" not
found'
4.5) Anope and long (more then 30 character) nicknames.
5) ChanServ
5.1) Anope's channel mode setting doesn't work. I can't set modes with
@@ -371,6 +372,22 @@ Table of Contents
configuration file can be dangerous, so only do this if you know what you
are doing.
4.5) Anope and long (more then 30 character) nicknames.
By default anope only supports nicknames up to 30 characters (NICKLEN=30).
If your IRCd allows for longer nicknames or has been modified to do so
anope will start logging a lot of ("NICK from nonexistent nick") messages.
This is because once a user uses a nick that is too long for anope to handle,
anope loses track of the user for the remainder of the session.
It is POSSIBLE but not NOT RECOMMENDED to extend the maximum length of nicknames
anope can track, however this will also break database compatibility. DBs saved
with anope set to allow for example 40 chars cannot be read by a default anope
and vice versa. So changing the maximum nick length is only possible
when starting with fresh databases and even then the consequences of this are
UNTESTED.
In order to change the maximum internal nick length, change the NICKMAX setting
in include/config.h, recompile anope and start without databases.
5) ChanServ
+5 -3
View File
@@ -74,6 +74,8 @@ Table of Contents
* Adam Kramer <ribosome@anope.org>
* Alvaro Toledo <atoledo@keldon.org>
* Amanda Folson <amanda@anope.org>
* Andrew Berquist <vash@anope.org>
* Björn Stiddien <keeper@anope.org>
* Charles Kingsley <chaz@anope.org>
* Chris Hogben <heinz@anope.org>
@@ -89,6 +91,7 @@ Table of Contents
* Joris Vink <joris@anope.org>
* Lucas Nussbaum <lucas@lucas-nussbaum.net>
* Mark Summers <mark@goopler.net>
* Matthew Beeching <jobe@invictachat.net>
* Pieter Bootsma <geniusdex@anope.org>
* Thomas Juberg Stensås <ShadowMaster@Shadow-Realm.org>
* Trystan .S Lee <trystan@nomadirc.net>
@@ -97,12 +100,11 @@ Table of Contents
Anope Translations:
* GeniusDex <geniusdex@anope.org> (nl.l)
* Oleg Nikolaev aka Isot <isot@complife.ru> (ru.l)
* Kein <kein-of@yandex.ru> (ru.l)
* Stuff <the.stuff@gmx.de> (de.l)
* Gabriel Acevedo H. <drstein@anope.org> (es.l)
* Janos Kapitany <sarkanyka@cjbchat.hu> (hun.l)
* Mateusz Szczyrzyca <annihilator@ircnet.pl> (pl.l)
* Szymon S'wierkosz <szymek@adres.pl> (pl.l)
Anope uses the strlcat() and strlcpy() functions from OpenSSH 2.5.1p2.
These functions are copyrighted by Todd C. Miller:
+2
View File
@@ -495,6 +495,7 @@ E void helpserv(User * u, char *buf);
E void helpserv_init(void);
/**** hostserv.c ****/
E void get_hostserv_stats(long *nrec, long *memuse);
E void hostserv_init(void);
E void addHostCore(char *nick, char *vIdent, char *vhost, const char *creator, int32 tmp_time);
E char *getvIdent(char *nick);
@@ -991,6 +992,7 @@ E int db_mysql_open();
E int db_mysql_close();
E int db_mysql_query(char *sql);
E char *db_mysql_quote(char *sql);
E char *db_mysql_quote_buffer(char *sql, int size);
E int db_mysql_try(const char *fmt, ...);
E int db_mysql_save_ns_core(NickCore * nc);
E int db_mysql_save_ns_alias(NickAlias * na);
+4 -2
View File
@@ -2522,6 +2522,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d registres, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d registres, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d registres, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d registres, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3981,8 +3983,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
Limited to Services admins.
+96 -101
View File
File diff suppressed because it is too large Load Diff
+4 -2
View File
@@ -2444,6 +2444,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d records, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d records, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d records, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3817,8 +3819,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+4 -4
View File
@@ -2495,6 +2495,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d records, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d records, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d records, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3955,10 +3957,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Limited to Services admins.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+4 -4
View File
@@ -2545,6 +2545,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d enregistrements, %5d ko
OPER_STATS_BOTSERV_MEM
BotServ : %6d enregistrements, %5d ko
OPER_STATS_HOSTSERV_MEM
HostServ : %6d enregistrements, %5d ko
OPER_STATS_OPERSERV_MEM
OperServ : %6d enregistrements, %5d ko
OPER_STATS_SESSIONS_MEM
@@ -4016,10 +4018,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Limited to Services admins.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+4 -4
View File
@@ -2525,6 +2525,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d âÜóåéò, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d âÜóåéò, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d âÜóåéò, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3983,10 +3985,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Limited to Services admins.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+4 -2
View File
@@ -2489,6 +2489,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d bejegyzés, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d bejegyzés, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d bejegyzés, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3901,8 +3903,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
Limited to Services admins.
+4 -2
View File
@@ -2456,6 +2456,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ: %6d records, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ: %6d records, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ: %6d records, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3865,8 +3867,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
Limited to Services admins.
+4 -2
View File
@@ -2502,6 +2502,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d records, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d records, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d records, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3908,8 +3910,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+4277 -3700
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -2467,6 +2467,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d registros, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d registros, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d registros, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d registros, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3883,10 +3885,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Limited to Services admins.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+3122 -2848
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -2519,6 +2519,8 @@ OPER_STATS_CHANSERV_MEM
ChanServ : %6d kayýt, %5d kB
OPER_STATS_BOTSERV_MEM
BotServ : %6d kayýt, %5d kB
OPER_STATS_HOSTSERV_MEM
HostServ : %6d records, %5d kB
OPER_STATS_OPERSERV_MEM
OperServ : %6d kayýt, %5d kB
OPER_STATS_SESSIONS_MEM
@@ -3976,10 +3978,8 @@ NICK_HELP_SASET_AUTOOP
Syntax: SASET nickname AUTOOP {ON | OFF}
Sets whether the given nickname will be opped automatically.
Set to ON to allow ChanServ to op you automatically when joining
channels.
Limited to Services admins.
Set to ON to allow ChanServ to op the given nickname
automatically when joining channels.
NICK_HELP_SASET_LANGUAGE
Syntax: SASET nickname LANGUAGE number
+9 -2
View File
@@ -364,9 +364,16 @@ int do_stats(User * u)
get_chanserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_CHANSERV_MEM, count,
(mem + 512) / 1024);
get_botserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
if (s_BotServ) {
get_botserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
(mem + 512) / 1024);
}
if (s_HostServ) {
get_hostserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count,
(mem + 512) / 1024);
}
get_operserv_stats(&count, &mem);
notice_lang(s_OperServ, u, OPER_STATS_OPERSERV_MEM, count,
(mem + 512) / 1024);
+30
View File
@@ -38,6 +38,36 @@ void moduleAddHostServCmds(void)
/*************************************************************************/
/**
* Return information on memory use.
* Assumes pointers are valid.
**/
void get_hostserv_stats(long *nrec, long *memuse)
{
long count = 0, mem = 0;
int i;
HostCore *hc;
for (hc = head; hc; hc = hc->next) {
count++;
mem += sizeof(*hc);
if (hc->nick)
mem += strlen(hc->nick) + 1;
if (hc->vIdent)
mem += strlen(hc->vIdent) + 1;
if (hc->vHost)
mem += strlen(hc->vHost) + 1;
if (hc->creator)
mem += strlen(hc->creator) + 1;
}
*nrec = count;
*memuse = mem;
}
/*************************************************************************/
/**
* HostServ initialization.
* @return void
+1 -1
View File
@@ -454,7 +454,7 @@ void load_ns_dbase(void)
int ver, i, j, c;
NickAlias *na, **nalast, *naprev;
NickCore *nc, **nclast, *ncprev;
int failed = 0, len;
int failed = 0;
uint16 tmp16;
uint32 tmp32;
char *s, *pass;
+72
View File
@@ -13,6 +13,78 @@ VERSION_BUILD=""
# $Log$
#
# BUILD : 1.8.0 (1489)
# BUGS :
# NOTES : Anope 1.8.0-rc1
#
# BUILD : 1.7.24 (1488)
# BUGS : 959
# NOTES : Updated russian language file. Update provided by Kein.
#
# BUILD : 1.7.24 (1487)
# BUGS :
# NOTES : Updated polish language file. Update provided by Syzmek.
#
# BUILD : 1.7.24 (1486)
# BUGS :
# NOTES : Fixed Changes from my last commit.
#
# BUILD : 1.7.24 (1485)
# BUGS :
# NOTES : Update Anope Credits
#
# BUILD : 1.7.24 (1484)
# BUGS :
# NOTES : Development Framework
#
# BUILD : 1.7.24 (1483)
# BUGS :
# NOTES : 1.7.24 Release
#
# BUILD : 1.7.23 (1482)
# BUGS :
# NOTES : Added entry to the FAQ regarding anopes max nicklength.
#
# BUILD : 1.7.23 (1481)
# BUGS : 957
# NOTES : Added a warning message in the logs regarding the combined usage of MySQL and skeleton mode.
#
# BUILD : 1.7.23 (1480)
# BUGS :
# NOTES : Updated german language file. Update provided by Han`.
#
# BUILD : 1.7.23 (1479)
# BUGS : 958
# NOTES : Fixed minor German langfile errors.
#
# BUILD : 1.7.23 (1478)
# BUGS :
# NOTES : updated langfile for pl.l
#
# BUILD : 1.7.23 (1477)
# BUGS : 956
# NOTES : Fixed OS STATS missing HostServ and showing disabled optional client(s).
#
# BUILD : 1.7.23 (1476)
# BUGS :
# NOTES : Fixed fuckup in earlier commit message... No more multitasking for me..
#
# BUILD : 1.7.23 (1475)
# BUGS :
# NOTES : Fixed compile warning in nickserv.c.
#
# BUILD : 1.7.23 (1474)
# BUGS :
# NOTES : Added missing SVN tag to version string.
#
# BUILD : 1.7.23 (1473)
# BUGS : 940
# NOTES : Rewrote MySQL password storing and loading to properly handle hashes. Note that Anope should not be started with UseRDB if the MySQL DB was dumped by an older version.
#
# BUILD : 1.7.23 (1472)
# BUGS :
# NOTES : Fixed language error in SASET AUTOOP help.
#
# BUILD : 1.7.23 (1471)
# BUGS :
# NOTES : Development Framework