9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1407 commits 4 branches 0 tags 40 MiB
Commit graph

609 commits

Author SHA1 Message Date
Jilles Tjoelker
cdd5b26189 Remove idle time checking (auto disconnecting users idle too long). 2008-01-01 23:04:34 +01:00
Jilles Tjoelker
c4f13a6499 STATS I and TESTMASK: Show some more auth{} flags. 
flood_exempt (|), dnsbl_exempt ($), gline_exempt (_)
All these are only shown to opers.
 2008-01-01 21:54:27 +01:00
Jilles Tjoelker
f56fdec2a0 Fix a crash when connecting to a server. 2008-01-01 18:47:10 +01:00
Jilles Tjoelker
a63a1eab74 STATS I: Show spoofed auth{} blocks and ^<> flags to remote opers also. 2008-01-01 18:25:04 +01:00
Jilles Tjoelker
997613d2f3 Fix a crash after a local client exits. 2008-01-01 18:15:56 +01:00
Jilles Tjoelker
d61de0adff Remove various obsolete ConfItem statuses (types) and flags. 2008-01-01 16:06:59 +01:00
Jilles Tjoelker
7a8dcc086d Remove long obsolete comment. 2007-12-28 23:23:15 +01:00
William Pitcock
c5c2f506c1 Replace int fd; in local client object with an fde object. 2007-12-28 15:06:33 -06:00
Jilles Tjoelker
35cf4c7998 Use connect_timeout for handshakes; add snote and log when they time out. 2007-12-28 16:38:39 +01:00
Jilles Tjoelker
e2a980439e Remove code for unregistered clients from check_pings_list() 
because it is only called for lists of registered clients.
 2007-12-28 16:17:39 +01:00
Jilles Tjoelker
06b697a268 Make remote numerics to channels work. 
Note that +D clients do not get these.  This is consistent
with how ircu treats remote numerics and with how we treat
server notices from other servers, but not with how locally
generated notices and numerics are sent also to +D clients.
 2007-12-26 22:46:43 +01:00
Jilles Tjoelker
7d1f9131fb Consolidate duplicate channel mode flags tables to one. 2007-12-25 01:00:20 +01:00
Jilles Tjoelker
0b580267af Remove "<server> had been connected for <time>" snote. 
For registered servers, it is entirely redundant with the
"<server> was connected for <time>.  <traffic>" snote, and
only sent for some ways of closing; for handshakes, you
already know that it had not been connected for long.
 2007-12-24 23:29:01 +01:00
Jilles Tjoelker
f2c1b06bcf Make the other notices to snomask +b network wide. 
(with the exception of flooding on an &channel)
 2007-12-24 22:43:47 +01:00
Jilles Tjoelker
a6f4368b96 Add mass_notice oper priv, enabled by default for compatibility. 
Controls /wallops and masked notices/privmsgs.
 2007-12-24 21:47:05 +01:00
Jilles Tjoelker
095328a742 Move various flags from flags2 to flags. 2007-12-24 20:58:55 +01:00
Jilles Tjoelker
86142e83d7 Remove unused CONF_FLAGS_DO_IDENTD and FLAGS_NEEDID. 2007-12-24 20:32:41 +01:00
Jilles Tjoelker
29c55c49f2 Remove unused flag FLAGS_CHKACCESS. 2007-12-24 20:26:39 +01:00
Jilles Tjoelker
c3fed903fd Branch merge. 2007-12-24 18:24:49 +01:00
Jilles Tjoelker
420b2c9a10 Remove dot_in_ip6_addr config option. 2007-12-24 18:24:23 +01:00
William Pitcock
c1e5bc4117 comm_locate_fd(), not comm_lookup_fd(). 2007-12-22 16:30:06 -06:00
William Pitcock
5cd74a3b6c linebuf_flush(): use fde_t's. 2007-12-22 16:28:05 -06:00
William Pitcock
5893220fdc wtf mercurial, tbh. 2007-12-22 16:08:34 -06:00
William Pitcock
64513f3675 Automated merge with ssh://hg.atheme.org//hg/charybdis 2007-12-22 14:05:45 -06:00
William Pitcock
2cac65a378 Add some GNUTLS helper code. 2007-12-22 14:05:03 -06:00
Jilles Tjoelker
95d36ef54b It is ok to send 402 to local clients for any hunt_server operation. 2007-12-22 00:20:54 +01:00
Jilles Tjoelker
1ef5b43053 Require resv oper privilege to set cmode +L or +P. 2007-12-18 00:24:05 +01:00
Jilles Tjoelker
1ebe6ffc92 Add resv oper priv, enabled by default for compatibility. 2007-12-17 02:20:14 +01:00
Jilles Tjoelker
c422d2a067 Silence harmless compiler warning. 2007-12-13 00:20:06 +01:00
Jilles Tjoelker
d7f753cd3a Do not copy string passed to add_top_conf()/add_conf_item(). 
If the caller can keep a function pointer valid, they can
certainly keep a string valid.
This also fixes an error with HAVE_STRDUP undefined.
 2007-12-13 00:14:02 +01:00
Jilles Tjoelker
e8149a2c64 Make /rehash help work again. 2007-12-12 22:26:17 +01:00
Jilles Tjoelker
351078d072 Use 127.0.0.1 as nameserver if none can be found in /etc/resolv.conf. 
This agrees with bind's behaviour.
 2007-12-11 18:37:14 +01:00
Jilles Tjoelker
35f6f850b6 Remove reject entries on unkline/ungline/unxline. 
When a user is rejected, remember the hash value of the
ban mask (for klines/glines, hash value of the user part
XOR hash value of the host part) with the rejected IP;
if the kline/gline/xline is removed, remove rejects with
the same hash value also.  Note that this does not happen
for expiries; this is deliberate.
Rejects for no auth{} or dnsbl put a hash value of 0;
they cannot be removed selectively.
 2007-12-08 21:54:51 +01:00
Jilles Tjoelker
1cda7a9cb2 Change meaning of "bits" in FNV hash functions to bitlen instead of 32-bitlen. 
Do reduction like recommended by
http://www.isthe.com/chongo/tech/comp/fnv/index.html#xor-fold
 2007-12-08 19:44:18 +01:00
Jilles Tjoelker
176489286d Mention vhost in serverlog connect log message. 2007-12-06 22:45:26 +01:00
William Pitcock
43de0f45a1 Make sure the nd_dict is always created. 2007-12-03 19:37:33 -06:00
William Pitcock
9802490cbb help system rework, part 1 2007-12-03 19:35:55 -06:00
William Pitcock
b37021a45e nickdelay -> dictionary. 2007-12-03 10:59:25 -06:00
William Pitcock
3e91d7006f I was nuts when I wrote that comment, lets kill it off. 2007-12-02 15:50:54 -06:00
William Pitcock
90187f2112 It compiles, ship it. 2007-12-02 09:41:13 -06:00
William Pitcock
8ac7552983 commands and aliases go from horrible hashtable code to dictionary... try 1 2007-12-02 09:34:45 -06:00
William Pitcock
c98390004f Automated merge with ssh://hg.atheme.org//hg/charybdis 2007-12-02 09:06:50 -06:00
William Pitcock
d6bda36db1 Add irc_dictionary code. 2007-12-02 09:06:25 -06:00
Jilles Tjoelker
6f3a09ff67 Speed up /undline similarly 
- Change find_exact_conf_by_address() to work for dlines also.
- Use find_exact_conf_by_address() to find the dline and
  abort immediately if there is no such dline.
- When removing a permanent dline, remove the dline from
  the data structures instead of rehashing bans.
- Convert alternative ways to write the same dline to the
  one in the found dline. (This was changed in unkline too.)
 2007-11-30 01:14:12 +01:00
Jilles Tjoelker
4e0f14a0e8 Add find_exact_conf_by_address() to find klines etc by exact mask. 2007-11-28 23:59:49 +01:00
Jilles Tjoelker
0fdb257090 When checking if a nick resv or xline already exists, match exact not wild. 
This is important because masks containing @ or # do not
match themselves.
 2007-11-25 18:18:07 +01:00
Jilles Tjoelker
c0bc9fe39a Show opers a list of recently (<24hrs) split servers in /map. 2007-11-23 23:38:54 +01:00
Jilles Tjoelker
994544c294 Merge links_cache into scache and rework scache. 
This changes flattened /links output to disclose less
routing information and slightly increases memory "leak"
from server names that do not come back anymore.
 2007-11-23 22:11:25 +01:00
Jilles Tjoelker
66c8fdd207 Remove Server.up and Server.upid. 
Server.up is obsolete, like User.server.
Server.upid has never been really useful.
 2007-11-22 00:38:13 +01:00
William Pitcock
c88cdb0095 Get rid of User.server. 2007-11-20 06:36:55 -06:00
nenolod
0a61720ad4 [svn] - we do not need to call find_server() in the function for registering local users 2007-11-20 03:16:43 -08:00
nenolod
cc32202d96 [svn] Explain invalid username rejections to users when they are rejected. 2007-11-20 03:08:23 -08:00
jilles
832942858c [svn] Fix desyncs with very long extbans. Bans can now be upto 195 chars long. 2007-11-07 15:45:14 -08:00
jilles
5b87d08a05 [svn] allocate_channel(): no need to truncate name, its only caller already does it 
furthermore, truncating here causes an inconsistent channel name
 2007-11-07 13:45:14 -08:00
jilles
fea1ad5224 [svn] Fix a memory leak. 2007-10-27 14:56:53 -07:00
jilles
c614f4a9c9 [svn] Make EXTBAN 005 token like unreal's (, instead of :). 2007-09-09 11:59:08 -07:00
nenolod
cda8e9b8db [svn] - TS6 is always enabled now. 
There is no reason for it to not be enabled on a proper charybdis network.
 2007-08-08 23:47:26 -07:00
nenolod
fffecc26ed [svn] - better text for RPL_LOAD2HI explaining in a better way what is going on 2007-08-08 23:40:52 -07:00
jilles
2f15f871ff [svn] Make highest connection counts a bit more consistent. 2007-08-01 13:18:12 -07:00
jilles
4f3f411b34 [svn] Fix wrong line numbers in ircd.conf parser (some comments). 
from ratbox 2.2 (androsyn).
 2007-07-30 10:26:00 -07:00
jilles
fd488ac17a [svn] Use mask_match() to check bans from local clients for 
redundancy. This fixes the problem that bans like *!?@*
prevent any ban starting with *!*@ being set.
 2007-07-14 06:34:50 -07:00
jilles
df251055ca [svn] Add mask_match(), like ircu mmatch(). 
This compares two masks and returns whether the "new" is
more specific than or equal to the "old". The difference
with match() is that a '?' in "old" does not match a '*' in
"new".
 2007-07-14 06:32:18 -07:00
jilles
94d53e53a4 [svn] add_id() for local client: do not collapse() the ban mask. 
The code calling this already collapses the mask, and if
not, doing it here would cause a desync.
 2007-07-14 05:20:48 -07:00
jilles
8aba962d43 [svn] monitor: send the same message buffer to all users 
monitoring a certain nick; the target field of the
numeric becomes *, much like server notices
 2007-06-30 15:15:35 -07:00
nenolod
f80a18239d [svn] - "please report this to the ratbox developers" -> "please report this to the charybdis developers". not sure how we overlooked this for so long. 2007-06-06 09:25:21 -07:00
jilles
7d08aa8911 [svn] xline/resv wildcard checking: 
- count escaped (\) characters as one nonwild
- accept strings without wilds no matter how short they are
 2007-06-04 09:04:49 -07:00
jilles
b808adf9d3 [svn] - fold conf_connect_allowed() into accept_connection() 
- extend add_connection() so that exempt{}s apply to max unregistered
  connections per ip
from ratbox
 2007-05-18 13:31:33 -07:00
jilles
8017ad2d27 [svn] Remove s_assert in del_unknown_ip() supposedly if the ip 
cannot be found, it is not feasible to avoid that case
entirely with m_webirc.c.
 2007-05-18 12:14:18 -07:00
jilles
54015b5fea [svn] Apply ratbox flood fix. 2007-05-14 15:21:16 -07:00
jilles
1d3e262e40 [svn] Remove emptyline craq because it leaks memory on /rehash motd etc. 
from ratbox 2.2 (anfl/Androsyn)
 2007-05-02 12:56:40 -07:00
jilles
f1e35c19a7 [svn] Merge old trunk r2065,r2067: 
channel_modes(): get rid of the trailing space
also make the *pbuf check work like it should
(don't call IsMember another time if we already
gave one parameter)
simplify a bit more, update comments
 2007-04-26 16:01:16 -07:00
jilles
e2b44358a2 [svn] Move new_local_user hook, so it is possible to call 
exit_client() from it, refusing the connection.
 2007-04-15 09:54:50 -07:00
jilles
ec3fbdecd2 [svn] Only free PreClient struct when the rest of the Client 
is freed, not immediately upon exit_client(). Doing this
would cause problems with sasl's new_local_user hook
vs hooks that exit the client there.
 2007-04-15 09:49:56 -07:00
nenolod
725a6c5dc9 [svn] - 2.2 operline 2007-04-06 14:25:37 -07:00
jilles
afc20e91f7 [svn] Change code that checks maxclients limit: allow exactly 
the configured amount of non-exceed_limit clients.
Code that appeared to limit exceed_limit clients too
but less heavily removed (it was not effective because
the parentheses were wrong).
 2007-04-04 17:24:47 -07:00
jilles
23836ead45 [svn] By default, leave MAX_BUFFER fds free for log files, 
server connections, ident lookups, exceed_limit clients,
etc. Mention this in example.conf and reference.conf.
 2007-04-04 17:12:55 -07:00
jilles
1aa8ffcbfd [svn] Make the code that raises fd rlimit to hard limit work. 2007-04-03 15:25:11 -07:00
nenolod
e8a2d50da8 [svn] - some more transit to sendto_one_numeric(). 2007-04-03 03:15:39 -07:00
nenolod
885203035d [svn] - change some sendto_one() to sendto_one_numeric(). 2007-04-03 03:11:06 -07:00
nenolod
6c8cbf341b [svn] - remove x86-optimized hash code. 2007-04-03 02:37:03 -07:00
nenolod
6fcb8629ae [svn] - remove ALL braindead 2.8 I/O artifacts: MASTER_MAX, HARD_FDLIMIT, HARD_FDLIMIT_, MAXCONNECTIONS, MAX_CLIENTS, etc. 
they are ALL gone. all of this stuff is now determined at runtime via getrlimit(2).
- due to this, devpoll is broken. i'm not motivated to fix it at the moment.
 2007-04-03 02:21:31 -07:00
jilles
8d53472c4a [svn] Change copyright years in version.c.SH as in release-2.1 r3339. 2007-04-01 15:10:05 -07:00
jilles
64f2a7eb2c [svn] Merge old trunk r2077,r2079: 
- Move closing of servlink control fd to close_connection()
  instead of doing it in exit_local_server(), and make sure
  we first close the data fd and then the control fd.
- Have servlink process ready fds in order net, data, ctrl
  instead of ctrl, data, net.  This seems to fix the problem
  that squit reasons do not show up on the other side of a
  ziplink (by making it send any final SQUIT and/or ERROR
  before noticing the closed control fd).
 2007-03-29 13:03:06 -07:00
jilles
8d19a2b257 [svn] Merge old trunk r2081: 
Don't say that services cannot be killed in
ERR_ISCHANSERVICE message (given when trying
to kick or deop them), as that's not the case.
 2007-03-28 08:40:24 -07:00
jilles
42bda3f3d2 [svn] Merge old trunk r2835: 
resolver: if sendto(2) fails, try sending to the next nameserver
 2007-03-28 08:04:06 -07:00
jilles
c83cbedc0e [svn] Merge old trunk r2294: 
Zero out the varlist passed to substitution_* when rejecting DNSBL clients.
 2007-03-28 07:33:50 -07:00
jilles
4b7e690457 [svn] Don't leak auth{} spoofed ip for I-line is full notice either. 2007-03-18 07:44:24 -07:00
jilles
1ebf4db4c6 [svn] Allow /invite (but not invex) to override +r, +l, +j in 
addition to +i. As before, a restrictive mode must be in
place at /invite time for the invite to have an effect;
+r does not count as a restrictive mode if the user is
logged in; +l and +j always count as restrictive modes to
allow for cases where they would allow join at /invite
time but not when the user tries to join.
 2007-03-15 11:09:08 -07:00
jilles
307328bb13 [svn] Remove invite_ops_only, forcing it to YES. 2007-03-13 09:09:28 -07:00
jilles
0734f634d9 [svn] Move username check after xline and dnsbl checks, so it 
will not complain to opers about clients who are xlined
or blacklisted anyway (both of which silently reject).
 2007-03-06 06:07:11 -08:00
nenolod
c2d96fcbff [svn] - add config option for setting max_clients. 2007-03-05 10:58:38 -08:00
nenolod
68ff929f3d [svn] - remove get_maxrss() and all of that insecure and unsafe nonsense 2007-03-05 10:51:17 -08:00
nenolod
c961476e55 [svn] - clear up use of fd_table in ircd. 2007-03-05 09:28:27 -08:00
jilles
14e23b0e1e [svn] Fix some cases where the size argument to strlcpy() 
for usernames and hostnames is 1 too small.
 2007-03-04 17:14:46 -08:00
jilles
606384aea8 [svn] Don't leak auth{} spoofed IP addresses in +f notices. 
from ratbox (androsyn)
 2007-03-02 09:45:47 -08:00
jilles
652b8478fb [svn] Make oper_up() take +i/-i during opering up into account 
(e.g. no_oper_invis extension, +i in operator::umodes).
Remove the hack from no_oper_invis.
 2007-02-24 11:34:28 -08:00
jilles
1178125363 [svn] Put "End of Channel Quiet List" instead of 
"End of Channel Ban List" for a +q list.
Due to client restrictions the numerics for
quiet lists must be the same as for ban lists.
 2007-02-21 11:52:51 -08:00
jilles
9b6ff0c8f9 [svn] Make -logfile work again. 2007-02-11 08:54:43 -08:00
jilles
a8086a7ca0 [svn] Change handling of modularized umodes: 
- keep the bitmask reserved forever to the letter, fixing
  the problems when loading multiple umode modules,
  unloading them and then loading them in a different order
- don't allow local users to change umodes which have
  been unloaded and don't set them on new users via
  default_umodes
 2007-02-04 07:08:04 -08:00
jilles
01cebbd88e [svn] Move find_umode_slot() from libcharybdis/tools.c to src/s_user.c. 2007-02-03 17:59:38 -08:00
jilles
4d7a1ee5d1 [svn] Change two occurances like match(userinput, target_p->name) || 
match(target_p->name, userinput) to just match(userinput,
target_p->name). No client name can contain * or ? now.
 2007-01-31 17:07:42 -08:00
jilles
e26e2b1954 [svn] Do not try find_server() on a name find_client() has 
returned NULL for, as this will always return NULL
since the removal of hostmasking.
 2007-01-31 16:49:07 -08:00
jilles
f42e9cebee [svn] Remove hash_find_masked_server(), which made it possible 
to specify the full (unmasked) name of a server behind
a hostmask. As a result find_any_client() (for prefixes)
becomes equal to find_client(), so remove that too.
 2007-01-31 16:19:14 -08:00
jilles
e5d9ca18eb [svn] Remove '*' from valid server name characters. 
This makes it impossible to connect hostmasked servers.
(This support didn't work well anyway, was incompatible
with TS6 and we never masked ourselves.)
 2007-01-31 16:02:35 -08:00
jilles
63aecfb960 [svn] Change spambot, flooder and jupe joiner notices from host to orighost. 2007-01-31 15:57:18 -08:00
jilles
dd12a19c2c [svn] Include real hostname in Closing Link message for unknown 
connections that have sent USER. This is helpful for
k-lined users while not breaking server IP hiding.
 2007-01-26 10:52:11 -08:00
nenolod
5366977b4f [svn] Backport from early 3.x: 
--
nenolod     2006/09/27 16:39:14 UTC	(20060927-2178)
  Log:
  - remove "Processing connection to foobar.net" message


  Changes:	Modified:
  +0 -3		trunk/src/s_auth.c (File Modified)


nenolod     2006/09/27 16:34:26 UTC	(20060927-2176)
  Log:
  - missed the processing connection one (actually, we can probably nuke this one)


  Changes:	Modified:
  +1 -2		trunk/src/s_auth.c (File Modified)


river       2006/09/27 16:33:05 UTC	(20060927-2174)
  Log:
  get_client_name = stupid



  Changes:	Modified:
  +10 -7	trunk/modules/core/m_kill.c (File Modified)


nenolod     2006/09/27 16:32:37 UTC	(20060927-2172)
  Log:
  - remove excessive arguments


  Changes:	Modified:
  +1 -2		trunk/src/s_conf.c (File Modified)
  +1 -1		trunk/src/s_user.c (File Modified)


nenolod     2006/09/27 16:30:59 UTC	(20060927-2170)
  Log:
  - use sendto_one_notice() for on-connect notices too.


  Changes:	Modified:
  +10 -10	trunk/src/s_auth.c (File Modified)


nenolod     2006/09/27 16:27:01 UTC	(20060927-2168)
  Log:
  - use sendto_one_notice() in the core, too.


  Changes:	Modified:
  +2 -2		trunk/src/chmode.c (File Modified)
  +8 -15	trunk/src/modules.c (File Modified)
  +3 -5		trunk/src/s_conf.c (File Modified)
  +1 -2		trunk/src/s_newconf.c (File Modified)
  +20 -57	trunk/src/s_user.c (File Modified)


river       2006/09/27 16:19:25 UTC	(20060927-2166)
  Log:
  the KILL command will use get_client_name(, SHOW_IP) instead of
  target->name, and will show a more useful error for local opers



  Changes:	Modified:
  +6 -4		trunk/modules/core/m_kill.c (File Modified)


nenolod     2006/09/27 16:09:48 UTC	(20060927-2164)
  Log:
  - fix bugs in sendto_one_notice()/sendto_one_numeric() where a client identifier won't be sent to unregistered clients


  Changes:	Modified:
  +4 -2		trunk/src/send.c (File Modified)


nenolod     2006/09/27 16:05:46 UTC	(20060927-2161)
  Log:
  - back out r2159


  Changes:	Modified:
  +1 -1		trunk/include/client.h (File Modified)


nenolod     2006/09/27 16:04:05 UTC	(20060927-2159)
  Log:
  - get_id(): fall back to "*" if client has no known name


  Changes:	Modified:
  +1 -1		trunk/include/client.h (File Modified)


nenolod     2006/09/27 16:01:29 UTC	(20060927-2157)
  Log:
  - convert to sendto_one_notice().


  Changes:	Modified:
  +2 -3		trunk/unsupported/m_clearchan.c (File Modified)
  +4 -6		trunk/unsupported/m_force.c (File Modified)


nenolod     2006/09/27 15:57:11 UTC	(20060927-2155)
  Log:
  - use sendto_one_notice() in many places instead of
sendto_one(source_p, ":%s NOTICE %s :", ...);


  Changes:	Modified:
  +10 -25	trunk/extensions/example_module.c (File Modified)
  +5 -14	trunk/extensions/hurt.c (File Modified)
  +1 -2		trunk/extensions/m_42.c (File Modified)
  +7 -12	trunk/extensions/m_mkpasswd.c (File Modified)
  +1 -2		trunk/extensions/m_ojoin.c (File Modified)
  +1 -2		trunk/extensions/m_opme.c (File Modified)
  +3 -3		trunk/extensions/spy_whois_notice.c (File Modified)
  +3 -3		trunk/extensions/spy_whois_notice_global.c (File Modified)
  +3 -7		trunk/modules/core/m_die.c (File Modified)
  +2 -4		trunk/modules/core/m_kill.c (File Modified)
  +2 -2		trunk/modules/core/m_squit.c (File Modified)
  +1 -2		trunk/modules/m_challenge.c (File Modified)
  +11 -15	trunk/modules/m_connect.c (File Modified)
  +20 -28	trunk/modules/m_dline.c (File Modified)
  +2 -2		trunk/modules/m_etrace.c (File Modified)
  +11 -21	trunk/modules/m_gline.c (File Modified)
  +2 -4		trunk/modules/m_kline.c (File Modified)
  +1 -2		trunk/modules/m_rehash.c (File Modified)
  +3 -7		trunk/modules/m_restart.c (File Modified)
  +31 -45	trunk/modules/m_set.c (File Modified)
  +2 -4		trunk/modules/m_testmask.c (File Modified)
  +5 -8		trunk/modules/m_unreject.c (File Modified)
  +2 -5		trunk/modules/m_xline.c (File Modified)
--
 2007-01-24 23:23:01 -08:00
nenolod
92fb5c3175 [svn] - keyword-subst from charybdis 2.2. 2007-01-24 23:08:21 -08:00
nenolod
212380e3f4 [svn] - the new plan: 
+ branches/release-2.1 -> 2.2 base
  + 3.0 -> branches/cxxconversion
  + backport some immediate 3.0 functionality for 2.2
  + other stuff
 2007-01-24 22:40:21 -08:00