Commit Graph

171 Commits (2b46420b3678a2f3e81bc775021400ab9710c7cd)

Author SHA1 Message Date
James Lee e296ec92ea more uninitalized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
HD Moore 6885ffa48f Improvements to the SSL TCP Server mixin
git-svn-id: file:///home/svn/framework3/trunk@7409 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:13:25 +00:00
HD Moore 34d76a72e0 Fixes #462. Handle proxy errors like regular socket errors. This can lead to missing results in tests, so we may need to add special proxy exception checks to the scanner mixin
git-svn-id: file:///home/svn/framework3/trunk@7352 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:36:06 +00:00
HD Moore 075b8c5fa4 Fixes #434. Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
HD Moore 5e137e92fd Fixes #381. To scan for TLSv1 only services, set SSLVersion TLS1
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:48:15 +00:00
kris b75ef037c3 more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc)
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 17:24:33 +00:00
HD Moore a17d96a1ab Remove the last usage of ReadWriteLock in the Socket class. Fixes #383
git-svn-id: file:///home/svn/framework3/trunk@7182 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 09:24:36 +00:00
kris efe44ba6b5 bleh.. a bit of tabs vs spaces
git-svn-id: file:///home/svn/framework3/trunk@7171 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-16 18:27:18 +00:00
HD Moore 5be5a20ba7 fixes #285. Corrects SSL init to be after proxies, fixes issues with 1.9.1 compatibility and SOCKS support
git-svn-id: file:///home/svn/framework3/trunk@7070 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 15:36:30 +00:00
HD Moore 303e4eab71 Enable broadcast support for all datagram sockets, remove the broadcast parameter entirely.
git-svn-id: file:///home/svn/framework3/trunk@6780 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:24:46 +00:00
HD Moore bab394fa8f Typo fix - thanks Robin Wood!
git-svn-id: file:///home/svn/framework3/trunk@6779 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:11:11 +00:00
HD Moore 9068b9a133 Adds the Broadcast parameter to the Rex::Socket class, allows udp/ip sockets to send to broadcast addresses
git-svn-id: file:///home/svn/framework3/trunk@6778 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 13:19:31 +00:00
kris c83e84f2d1 fix Rex::Socket::SubnetWalker num_ips; off by one
git-svn-id: file:///home/svn/framework3/trunk@6760 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:39:30 +00:00
kris 913181b16a factor out some code
git-svn-id: file:///home/svn/framework3/trunk@6759 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 21:45:52 +00:00
HD Moore f7a7a528be Moer ruby 1.9.1 fixes for msfpescan
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places.
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
kris 4e0bc60ce1 just use alias
git-svn-id: file:///home/svn/framework3/trunk@6207 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:49:50 +00:00
kris a49c339a9a Use CRLF in http proxy request for some stringent servers
git-svn-id: file:///home/svn/framework3/trunk@6206 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:29:15 +00:00
kris c60077bb1c Revamp/fix-up http proxying by using Rex to parse the response (instead of
really strict matching)


git-svn-id: file:///home/svn/framework3/trunk@6182 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 14:48:18 +00:00
James Lee fd435b48d9 http proxy support patch from Frederik Braun
git-svn-id: file:///home/svn/framework3/trunk@6181 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 06:32:06 +00:00
kris 6777023871 Notify handlers of socket creation for bare raw IP and TCP server sockets
git-svn-id: file:///home/svn/framework3/trunk@6149 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:27:37 +00:00
kris 8c8370e9b9 Notify handlers of before and after socket creation events for raw IP
git-svn-id: file:///home/svn/framework3/trunk@6148 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:15:33 +00:00
kris a61baaa1eb deleting broken/useless timed_read()
git-svn-id: file:///home/svn/framework3/trunk@6110 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 17:46:23 +00:00
kris 754c1c5711 Add 127.0.0.1 -> ::1 conversion for IPv4-addressed IPv6 sockets
git-svn-id: file:///home/svn/framework3/trunk@6072 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 18:42:55 +00:00
kris a0aa29bb18 typos
git-svn-id: file:///home/svn/framework3/trunk@6054 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 07:47:37 +00:00
kris 2d1ae98917 Convert 'Retries' and 'Timeout' values to integers if given
git-svn-id: file:///home/svn/framework3/trunk@6053 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 05:04:49 +00:00
kris cdcf5cf1fd add a few key descriptions
git-svn-id: file:///home/svn/framework3/trunk@6024 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 09:33:16 +00:00
kris 84b6d9daf4 remove extra (server-only) setsockopt(SO_REUSEADDR)
git-svn-id: file:///home/svn/framework3/trunk@6023 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 08:02:53 +00:00
kris bfc23d2886 use self.peerhost (which could use 'PeerAddr') instead of 'PeerHost'
git-svn-id: file:///home/svn/framework3/trunk@6021 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:54:22 +00:00
kris 560f2df2dd fix PeerAddr
git-svn-id: file:///home/svn/framework3/trunk@6020 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:50:04 +00:00
HD Moore 71c5175a85 This patch introduces a really basic RPC service. It is still a long way from its final version
git-svn-id: file:///home/svn/framework3/trunk@5991 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 22:09:34 +00:00
HD Moore 616491a552 Play nice with ruby implementations without readline and openssl
git-svn-id: file:///home/svn/framework3/trunk@5895 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 22:47:21 +00:00
HD Moore 250848ac5c Handle windows error on broadcast addresses
git-svn-id: file:///home/svn/framework3/trunk@5886 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 07:41:07 +00:00
HD Moore 81347ba308 Fix ENONET for BSD
git-svn-id: file:///home/svn/framework3/trunk@5885 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:19:44 +00:00
HD Moore e9b3919ace Normalize exceptions across socket libraries
git-svn-id: file:///home/svn/framework3/trunk@5879 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:11:40 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
James Lee 43886f3697 typo fix, thanks Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5702 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 23:24:52 +00:00
HD Moore e341e46f6b Remove debugging comment
git-svn-id: file:///home/svn/framework3/trunk@5688 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 13:33:09 +00:00
HD Moore 37d9c3db1d Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore 1fa95d6050 This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore 947dad1f45 Expose the sslctx to the caller
git-svn-id: file:///home/svn/framework3/trunk@5639 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 05:12:43 +00:00
HD Moore bd7e616fe3 Need another red bull...
git-svn-id: file:///home/svn/framework3/trunk@5604 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:23:54 +00:00
HD Moore 09c1b1d0fc This fixes raw socket support for FreeBSD, NetBSD, BSDi, and Mac OS X. Thanks LibNET!
git-svn-id: file:///home/svn/framework3/trunk@5603 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:15:35 +00:00
HD Moore c6930f79f1 consistency fixes
git-svn-id: file:///home/svn/framework3/trunk@5596 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 06:04:51 +00:00
HD Moore bb1db8253a Raw socket mode that should work for 'everyone'
git-svn-id: file:///home/svn/framework3/trunk@5595 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 05:05:32 +00:00
HD Moore cef76df19c Raw socket support for BSD systems
git-svn-id: file:///home/svn/framework3/trunk@5594 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 04:59:11 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-)
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:03:59 +00:00
James Lee 8800372e46 initial commit of browser_autopwn;
revamp php payloads;
socks5 for IPv6 (untested)



git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
James Lee 8a009c5b48 initial support for SOCKS5
git-svn-id: file:///home/svn/framework3/trunk@5537 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 22:55:38 +00:00
HD Moore 1ea29ba8f0 Fixes #218. Updates the http password capture module. Removes a bogus makefile from the tree
git-svn-id: file:///home/svn/framework3/trunk@5452 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:34:52 +00:00
HD Moore 7349c32ec9 Ignore exceptions during shutdown()
git-svn-id: file:///home/svn/framework3/trunk@5419 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-14 21:11:57 +00:00
HD Moore df67cb42f9 Dont use ipv6 sockets for unconnected udp on freebsd
git-svn-id: file:///home/svn/framework3/trunk@5278 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-06 21:51:07 +00:00
HD Moore 621849beaf One more bad exception to fix
git-svn-id: file:///home/svn/framework3/trunk@5114 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:58:26 +00:00
HD Moore 7498562eb5 Add proxy support to HTTP mixin using modules. Fix socks proxy support.
git-svn-id: file:///home/svn/framework3/trunk@5113 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:44:44 +00:00
HD Moore 65cfd287e5 Improvements to the SSL socket support in Rex, fixes #102, and a HTTP client response parsing bug
git-svn-id: file:///home/svn/framework3/trunk@4851 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-03 20:01:29 +00:00
HD Moore 664363d7bd One more fix for IPv6 support, this should fix things up for OS X
git-svn-id: file:///home/svn/framework3/trunk@4827 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:50:16 +00:00
HD Moore 83a8ece022 This patch adds IPv6 support to most feartures of the framework. The major missing component is IPv6-enabled payloads.
git-svn-id: file:///home/svn/framework3/trunk@4814 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-29 23:43:39 +00:00
HD Moore 4d1c274387 Merging all of the auxilliary/scanner related features
git-svn-id: file:///home/svn/framework3/trunk@4749 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 06:27:39 +00:00
HD Moore f925120ddd Wifi updates
git-svn-id: file:///home/svn/framework3/trunk@4129 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 21:45:28 +00:00
Spoon M d89ac6478c more meterp decoupling
git-svn-id: file:///home/svn/framework3/trunk@3836 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-21 22:50:27 +00:00
HD Moore d3b9cf1b20 Added rerun command to auxiliary
Fixed range_walker to allow multiple ranges
Version scanner now mostly works



git-svn-id: file:///home/svn/framework3/trunk@3824 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-13 00:08:40 +00:00
HD Moore c5542fd347 Major reworking of the recon stuff, there is a new mixin called Auxiliary::Scanner that
supports per-range, per-host, and per-batch requests. The reporting stuff has been moved
into a new mixin for it. The old recon stuff was pulled out and sample modules for the
scanner mixin were added. Almost time to re-import skape's old recon foo using Scanner :-)




git-svn-id: file:///home/svn/framework3/trunk@3820 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 08:31:38 +00:00
HD Moore ebf46cf535 Fixes for IPv6 compatibility
git-svn-id: file:///home/svn/incoming/trunk@3656 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:02:58 +00:00
bmc df49cfabb0 * add SSL TCP server support, using runtime generated/signed keys
* add HTTPS support

note, SSL service tests don't work.  Right now, the tests just bail early.  The
client spins forever trying to get data.  When the client & server are in
seperate processes, this isn't a problem.  A threaded test implementation is
closer, as data sent from the client gets to the server just fine.


git-svn-id: file:///home/svn/incoming/trunk@3616 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 18:49:00 +00:00
bmc c2c01a2d9e * use full path to the const, since in odd situations, the const isn't in scope. (WTF?)
git-svn-id: file:///home/svn/incoming/trunk@3513 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 20:24:45 +00:00
bmc f3ae631d59 tabify
git-svn-id: file:///home/svn/incoming/trunk@3488 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-01 18:42:14 +00:00
bmc 8d2582dffa use a slightly different port than other tests
git-svn-id: file:///home/svn/incoming/trunk@3483 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 22:11:36 +00:00
bmc f76becf428 * make the connection failure use 1 instead of 0, since many OSs bitch differentlly about port 0 than other ports
git-svn-id: file:///home/svn/incoming/trunk@3476 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 18:49:08 +00:00
HD Moore c1b9129bca A couple more assertions in the tcp_server test suite.
Added template for the winamp pls overflow (unc computer name)


git-svn-id: file:///home/svn/incoming/trunk@3474 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 17:25:44 +00:00
bmc be31eead6f * client and server (once accepted) should have the same functionality. so, make the tests do that.
git-svn-id: file:///home/svn/incoming/trunk@3473 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 17:12:51 +00:00
HD Moore 5661598ef3 Addign read function >>
git-svn-id: file:///home/svn/incoming/trunk@3472 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 16:37:41 +00:00
bmc 9193668e9d * use a different port than the UDP tests, as to allow running the tests in parallel
git-svn-id: file:///home/svn/incoming/trunk@3471 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 15:47:47 +00:00
HD Moore b4ad4a5d75 Tabs vs Spaces
git-svn-id: file:///home/svn/incoming/trunk@3453 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:33:08 +00:00
bmc 6927b64028 * comment out sync on close for the SSL connection, since it was causing an infinite recursion when calling close
git-svn-id: file:///home/svn/incoming/trunk@3412 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-20 19:04:17 +00:00
HD Moore 737a1cb711 Pass socket context to child sockets from server, pass context from http mixin to socket
git-svn-id: file:///home/svn/incoming/trunk@3402 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 04:35:44 +00:00
HD Moore 7a26ec55bf Proxy chaining patch from bmc
git-svn-id: file:///home/svn/incoming/trunk@3244 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-18 02:19:21 +00:00
HD Moore 88658064df /usr/bin/ruby vs /usr/bin/env ruby
git-svn-id: file:///home/svn/incoming/trunk@3242 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-17 06:46:23 +00:00
HD Moore 557153e01c Code from Brian Caswell
git-svn-id: file:///home/svn/incoming/trunk@3210 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 06:08:40 +00:00
HD Moore 9340ecdeab IIS exploits ported
Added on_new_session callback and session_created? flag to exploit
Fixed socket fd leak in Comm::Local


git-svn-id: file:///home/svn/incoming/trunk@3135 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-27 18:42:44 +00:00
HD Moore 7403e8bf23 Mssql code!
git-svn-id: file:///home/svn/incoming/trunk@3122 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 11:16:36 +00:00
Matt Miller fc9376d385 enhanced http server crap
git-svn-id: file:///home/svn/incoming/trunk@3063 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 02:02:10 +00:00
Matt Miller cbbce06ee0 fix for multiple exploit
git-svn-id: file:///home/svn/incoming/trunk@3046 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-18 00:26:19 +00:00
HD Moore 16c5e232f5 Addition of get_once() in io::stream, rewritten recv code for smb/dcerpc, error handling in exploit mixins
git-svn-id: file:///home/svn/incoming/trunk@3042 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-16 17:56:07 +00:00
Matt Miller 855bd6625c fix
git-svn-id: file:///home/svn/incoming/trunk@3041 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-16 15:00:13 +00:00
Matt Miller fc42fef941 exploits now pass context when creating sockets
git-svn-id: file:///home/svn/incoming/trunk@3034 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:25:23 +00:00
Matt Miller 2de92a0d4b support for registering comm event handlers
git-svn-id: file:///home/svn/incoming/trunk@3032 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 20:33:55 +00:00
Matt Miller 95f8210853 major doc update
git-svn-id: file:///home/svn/incoming/trunk@3029 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 05:22:13 +00:00
Matt Miller e1603ee25f fix for test suite bug and fix for SSL option being evaluated wrong
git-svn-id: file:///home/svn/incoming/trunk@3028 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-14 18:48:21 +00:00
Matt Miller d0a66d9ec1 route integration into the ui
git-svn-id: file:///home/svn/incoming/trunk@3017 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-08 18:00:17 +00:00
Matt Miller da05fa0415 somewhat gracefully handle missing ossl, fix missing method
git-svn-id: file:///home/svn/incoming/trunk@3014 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-03 04:43:19 +00:00
Matt Miller 6a5870ddcd updated comments to be more uniformed in class definition
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:49:45 +00:00
Matt Miller 1739c934c9 subnet walker action
git-svn-id: file:///home/svn/incoming/trunk@2977 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-27 04:14:02 +00:00
Matt Miller ccd1e8f10a payload info can now be target specific
git-svn-id: file:///home/svn/incoming/trunk@2923 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 07:12:32 +00:00
Matt Miller 6f6924e001 meterpreter comm session implemented, untested
git-svn-id: file:///home/svn/incoming/trunk@2920 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 05:59:44 +00:00
Matt Miller 14e39004de switch board integrated
git-svn-id: file:///home/svn/incoming/trunk@2919 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 05:48:45 +00:00
Matt Miller 3320bc9f0d integrated switch board routing singleton
git-svn-id: file:///home/svn/incoming/trunk@2917 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 05:43:06 +00:00
Matt Miller 550080bcfb refactored socket api a bit, expect bugs
git-svn-id: file:///home/svn/incoming/trunk@2915 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-27 05:31:48 +00:00
Matt Miller 48516ed1ec fix?
git-svn-id: file:///home/svn/incoming/trunk@2884 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 18:35:53 +00:00