Commit Graph

1742 Commits

Author SHA1 Message Date
aymeric 9c8d0a73f9 these files are for diagnosing catalog files, they can even be generated by our
Makefiles if necessary
2008-06-05 20:09:37 +00:00
aymeric 3544edc560 remove all the other generated catalogs, too 2008-06-05 20:02:12 +00:00
aymeric 6905204bec the english catalog is automatically generated 2008-06-05 19:58:45 +00:00
joerg 3dfb9ffd6b Merge e28f0a8f857fad837ac78a93921873361d60747c and
c46587eb3d02a4750d0aaf6e7a0a19f24b3d7fa8:
Correctly handle ARP replies and fix a pointer misuse.
2008-05-26 21:13:59 +00:00
joerg 9e007bef18 Merge ebdbc57c7f54b27fd8d472cb357c0b533b9a0c2e:
Fix compilation.
2008-05-26 19:53:56 +00:00
joerg 7f64fd9bf9 Pull in 4c8ba2435551fdffc65c1830befe2d5abe04221a:
Fix a signal race when daemonising.
2008-05-26 19:42:35 +00:00
joerg b26c8099ce Resolve conflicts. 2008-05-25 19:18:49 +00:00
joerg fb288ada0d Import libarchive-2.5.4b:
- bsdtar is using the hardlink resolver code from libarchive now,
  making it generate correct links for newc format
- fix a number of non-exploitable integer and buffer overflows
- SIGINFO/SIGUSR1 support for bsdtar
- bsdtar -s support
- better mtree support, it should now be able to handle the full syntax
  of NetBSD's mtree
- handle extraction of archives where hardlink and linked to entry don't
  agree on the permission (base.tgz has such entries for systat)
2008-05-25 19:14:31 +00:00
christos f7e42af424 PR/38737: cheusov at tut dot by: Don't build the character class table
starting at 0, because will always be treated as the empty string DuH!
2008-05-25 16:28:25 +00:00
christos 2699db69d7 remove things we don't use. 2008-05-25 14:54:52 +00:00
christos 4459d9696e update to 20070501 2008-05-25 14:51:49 +00:00
christos 200d206cea from: http://cm.bell-labs.com/cm/cs/awkbook/index.html 2008-05-25 13:51:11 +00:00
joerg 8eeb8277e5 Import dhcpcd 4.0.0-beta5.
dhcpcd is a small DHCP client, supporting most, if not all, features of
dhclient.  It is much smaller (1/6 of the size on amd64), but still
supports many of the more advanced modern RFCs like IPv4LL (RFC 3927),
Classless Static Routes (RFC 3442) and Node-specific Client Identifiers
(RFC 4361).  It was written by Roy Marpled, partly in reply to the
discussion of the DHCP client Sommer of Code project.
2008-05-24 19:37:41 +00:00
lukem d974160208 Add missing prototypes.
(I don't know why am-utils doesn't use header files for public prototypes)
2008-05-22 14:22:28 +00:00
aymeric 00a7af4852 add a cast to make this file compile on amd64 2008-05-21 16:02:30 +00:00
aymeric a3887e9573 . include <sys/stropts.h> only if !defined(__NetBSD__)
. use I_PUSH only if it is defined as a preprocessor macro because we
  don't have it
2008-05-20 17:55:05 +00:00
aymeric f8f1a54d4c provide the emulation of DB4 with our DB1.
The relevant parts are completely broken or absent in the official release
of nvi
2008-05-20 17:53:18 +00:00
aymeric 2d56ffaa39 . add curly braces around structured elements of an array
. de-K&R prototype of lcmp()
2008-05-20 17:52:10 +00:00
aymeric fce4fb65c7 include vi_auto.h only if USE_DB4_LOGGING so as not to pull in all the
DB4 logging-related data structures which we don't emulate
2008-05-20 17:38:19 +00:00
aymeric 23de6174f3 iconv()'s second argument is const char **, not char ** 2008-05-20 17:37:04 +00:00
aymeric 4c86bf8605 . continue instructions for update a bit
. remove catalog/english.base and common/options_def.h from the imported sources
2008-05-20 17:05:40 +00:00
aymeric ec041c82dd remove these files: we generate them ourselves 2008-05-20 16:58:59 +00:00
darrenr 2f5a5e95ad Pullup IPFilter 4.1.29 from the vendor branch to HEAD.
See src/dist/ipf/HISTORY for a list of bug fixes since 4.1.23 (although
a few are already in NetBSD)
2008-05-20 07:08:06 +00:00
darrenr 675eb13106 Import IPFilter 4.1.29 to the vendor branch 2008-05-20 06:43:46 +00:00
martti 3a717a15fc Added instructions how I've updated IPF. This should make it easier for anyone
to upgrade our in-tree IPF to the latest version...
2008-05-18 18:19:05 +00:00
aymeric 96bc64d20f Re-import nvi sources, this time based on the distributed tar ball, after
going through the new nvi2netbsd script
2008-05-18 14:29:31 +00:00
aymeric 799e82abba new file to help import nvi into NetBSD. Derived from amd2netbsd.
Adds the following:
. tries to be "space safe" in the file names (untested)
. handle a couple more RCS ids being used by nvi
. handle properly several RCS ids on one line (happens in nvi)

... and of course adapt everything to nvi
2008-05-18 14:16:09 +00:00
aymeric 4d6922cd09 import nvi 1.81.6 verbatim, untouched from the git tree 2008-05-16 18:03:01 +00:00
dyoung f72063f0c8 Note NSF support. 2008-05-15 04:16:00 +00:00
wiz 4c5d505382 Fix typos. 2008-05-13 12:46:14 +00:00
joerg 81815c3c8f Merge after libarchive-2.5.3b update. 2008-05-11 13:10:07 +00:00
joerg 842030a811 Import libarchive-2.5.3b:
- fix bugs in link resolver, mostly affecting bsdcpio [from NetBSD]
- fix bsdcpio -p for hardlinks
- correctness improvements for directory name handling with ustar format
- handle empty filenames correctly
- allow bsdtar -r and -T to be used together as well as --format with -r
and -u.
2008-05-11 13:05:35 +00:00
jmmv f768eb7c67 Drop files removed (most of them were renamed) in atf-0.5. 2008-05-01 15:26:16 +00:00
jmmv ffe8204c6b Import ATF 0.5
Changes in this release:

* Clauses 3 and 4 of the BSD license used by the project were dropped.
  All the code is now under a 2-clause BSD license compatible with the
  GNU General Public License (GPL).

* Added a C-only binding so that binary test programs do not need to be
  tied to C++ at all.  This binding is now known as the atf-c library.

* Renamed the C++ binding to atf-c++ for consistency with the new atf-c.

* Renamed the POSIX shell binding to atf-sh for consistency with the new
  atf-c and atf-c++.

* Added a -w flag to test programs through which it is possible to specify
  the work directory to be used.  This was possible in prior releases by
  defining the workdir configuration variable (-v workdir=...), but was a
  conceptually incorrect mechanism.

* Test programs now preserve the execution order of test cases when they
  are given in the command line.  Even those mentioned more than once are
  executed multiple times to comply with the user's requests.
2008-05-01 15:22:19 +00:00
agc b2da2cdd81 Implement the SCSI MODE_SENSE_10 command - helps quieten an error seen by
Jeff Rizzo with the Studio Networks initiator.

This is WIP - more SCSI commands will be handled in the next commit.
2008-04-30 20:28:30 +00:00
martin 11a6dbe728 Convert TNF licenses to new 2 clause variant 2008-04-30 13:10:46 +00:00
martin 3028e483e4 Convert to new 2 clause license 2008-04-29 06:53:00 +00:00
martin ce099b4099 Remove clause 3 and 4 from TNF licenses 2008-04-28 20:22:51 +00:00
joerg 289d04bffd Fix a bug in the linkresolver for tar format. When linkresolver is done,
the entry belongs to the caller, so don't keep a reference to it and use
the local copy for inode comparision.
2008-04-25 15:04:21 +00:00
apb 436bad5beb Rewrite the code that tried to canonicalise a path. Fixes a problem
in which "/wherever/src.2/../tools" was incorrectly changed to
"/wherever/src./tools" instead of the desired "/wherever/tools".

It's not clear to me that this script has any business trying to do this
sort of rewriting (and there's no guarantee that "/wherever/foo/.." and
"/wherever" both refer to the same place), but at least the new code
tries to be more careful than the old code.
2008-04-20 12:57:40 +00:00
agc a769917eda Fix for "raid0 devices don't accept extents of different sizes" from
Jeff Rizzo
2008-04-11 08:22:37 +00:00
joerg 2522c71658 Merge libarchive-2.5.0b. 2008-03-30 05:19:00 +00:00
joerg 3c19999f8f Import libarchive-2.5.0b:
- bsdpcio and bsdtar support more of the nbpax options
- linkify interface can handle all the known hardlink resolution
  strategies
- mtree support extended, now it can almost process METALOG directly
- compress(1)-like write support
- fix gname/uname mixup
2008-03-30 05:06:00 +00:00
ragge a24df7ca50 Include sys/param.h before file.h, to avoid redefinition of MIN. 2008-03-29 09:40:41 +00:00
adrianp 8714d5ea9f Reflect that this is the manpage for 1.0.5 not 1.0.4 2008-03-23 16:53:25 +00:00
christos 4453aa15bd Fix compilation, from Kurt Schreiner 2008-03-18 17:35:36 +00:00
christos 797a81839f adjust for 1.0.5 2008-03-18 14:58:41 +00:00
christos cc69789779 merge conflicts 2008-03-18 14:47:07 +00:00
christos 4a6adca94a from http://www.bzip.org 2008-03-18 14:41:44 +00:00
wiz 08186da791 Fix download-vulnerability-list's -c option. From Jim Bernard in PR 38231. 2008-03-13 08:38:24 +00:00
joerg aa88e6d9cd Use the correct file descriptor variable. 2008-03-07 23:28:17 +00:00
joerg d0ff209a7d Import libarchive-2.4.13.
Major new features:
- work-in-progress cpio frontend
- much less data copying when handling uncompressed archives
- fix bugs for handling very large archives
- support for more zip archives and some of the self-extracting ones
2008-02-26 14:46:02 +00:00
mellon 3265aaf1d6 Get rid of a spurious dereference in DHCPRELEASE. 2008-02-26 05:03:29 +00:00
lukem 5c77352330 Fix a groff warning.
Whilst here, improve the markup somewhat.
2008-02-26 00:09:38 +00:00
joerg fdea345c9b pkg_install-20080223 2008-02-22 22:16:37 +00:00
joerg e30cd2c074 pkg_install-20080222 2008-02-22 16:14:57 +00:00
matt c27877a59b progname is const char *, not char * 2008-02-20 18:24:22 +00:00
matt 05ec472001 constify a few arrays 2008-02-20 18:23:50 +00:00
matt 273fa51a4d progname is defined as const char *, not char * 2008-02-20 18:21:39 +00:00
matt e0eafe6e38 infile is const char *, not char * 2008-02-20 18:20:21 +00:00
matt ccfd1d4480 errbuf is [], not *. 2008-02-20 18:19:18 +00:00
matt cd1870ce29 Make hostapd_drivers const. 2008-02-20 18:17:53 +00:00
matt 28dacb0e3a Fix a new bugs that -combine found 2008-02-20 18:16:09 +00:00
ragge 9c40de1cfe PCC 0.9.9-080210 2008-02-10 20:04:50 +00:00
joerg d32599e755 Import pkg_install-20080208 2008-02-07 23:42:16 +00:00
agc 5025457bc5 Update the autoconf glue to version 20080207 of the portable NetBSD
iSCSI initiator and target.
2008-02-07 19:12:26 +00:00
agc c00abf65a9 Changes to make the iSCSI initiator have a chance of building on
other platforms - include ${PREFIX}/include when compiling, and
${PREFIX}/lib when linking.

Fill out the dependency information correctly.
2008-02-07 19:10:52 +00:00
agc 02806300b2 If we're doing discovery, and the TSIH cannot be found, set it to
the disk number held in the session parameters - avoid using a negative
index to the array of target disks.
2008-02-07 19:09:02 +00:00
joerg 54735ec484 Merge commit 8c0dad4904474016c373573414c8e16ba51e88ad from upstream:
Fixed EAPOL not to end up in infinite loop with dynamic WEP keys
2008-02-06 18:30:47 +00:00
jmmv f2a0ff428b Remove files that disappeared in atf-0.4. 2008-02-04 20:26:03 +00:00
jmmv f6f54bd63a Import of ATF 0.4
Changes in this release:

* Added two new manual pages, atf-c++-api and atf-sh-api, describing the
  C++ and POSIX shell interfaces used to write test programs.

* Added a pkg-config file, useful to get the flags to build against the
  C++ library or to easily detect the presence of ATF.

* Added a way for test cases to require a specific architecture and/or
  machine type through the new 'require.arch' and 'require.machine'
  meta-data properties, respectively.

* Added the 'timeout' property to test cases, useful to set an upper-bound
  limit for the test's run time and thus prevent global test program stalls
  due to the test case's misbehavior.

* Added the atf-exec(1) internal utility, used to execute a command after
  changing the process group it belongs to.

* Added the atf-killpg(1) internal utility, used to kill process groups.

* Multiple portability fixes.  Of special interest, full support for SunOS
  (Solaris Express Developer Edition 2007/09) using the Sun Studio 12 C++
  compiler.

* Fixed a serious bug that prevented atf-run(1) from working at all under
  Fedora 8 x86_64.  Due to the nature of the bug, other platforms were
  likely affected too.
2008-02-04 20:21:48 +00:00
joerg 777b7d39b8 pkg_install-20080202 2008-02-03 21:21:30 +00:00
mrg 313548c7c8 fix a MKCRYPTO=no bug - default_memalloc()/default_memfree() are
defined static but not used.
2008-02-03 04:07:34 +00:00
christos a94d934365 Remove __PIC__ because on mips __PIC__ is used to indicate that the pic abi
is used, and it is set even in the absence of -fpic or -fPIC. Thanks to
tsutsui@ for the explanation.
2008-01-31 20:07:46 +00:00
joerg 7a9167c057 pkg_install-20080126 2008-01-27 14:11:27 +00:00
christos ce19c44682 merge conflicts. Unfortunately openpam changed from $P4 -> $Id so there will
be RCS screwage in the next import.
2008-01-27 01:22:55 +00:00
christos 70f2fdca0b from www.openpam.org 2008-01-27 00:54:36 +00:00
christos 550ce95799 Moved to dist/wpa since now hostapd and wpa_supplicant share a lot of code. 2008-01-26 21:55:00 +00:00
christos 648919655f Bring in our patches. 2008-01-26 21:47:23 +00:00
christos 97277a1a6d mention how to upgrade. 2008-01-26 21:46:03 +00:00
christos 0c6f1a5abe Import hostapd 2008-01-26 21:42:09 +00:00
christos 71731f44f8 Import new wpa_supplicant code 2008-01-26 21:38:31 +00:00
dyoung 099d1a6a37 #include <stdbool.h> for bool, instead of typedeffing our own. 2008-01-21 20:47:38 +00:00
christos 0f85ac800d Fix segmentation fault with printf("%*"); from Jukka Salmi 2008-01-21 17:18:06 +00:00
christos 4e783482fa Fix off-by-one buffer overflow. VU#203611, CVE-2008-0122 2008-01-18 16:20:57 +00:00
agc d77f56d46b Add documentation on setting up the iSCSI target, and on how to use the
NetBSD iSCSI initiator together with cgd to provide encrypted iSCSI
storage.
2008-01-06 11:00:49 +00:00
agc cbc63dde2a Thanks to Mark Foster for the reference to the Wiki page where he tracks
the interoperation between the NetBSD iSCSI target and the Linux
open-iscsi initiator.

Add details about inter-operation with the NetBSD iSCSI initiator.

Add dates to all entries.

Add last updated date to the COMPATIBILITY file.
2007-12-24 15:48:40 +00:00
joerg 39ac827c19 Import pkg_install-20071224 2007-12-24 00:03:04 +00:00
agc bfdff00bed Regenerate autoconf files for the portable version 2007-12-21 13:06:03 +00:00
agc 7683937c60 Peter Eisch: CentOS lacks strlcat(3), so use snprintf(3) to crack the
nut.
2007-12-20 23:17:05 +00:00
agc daa7a94cfb When defining extents, the new keyword "size" can be used in the place
of the physical size of the regular file. This is useful for presenting
ISO images to initiators, as in the following:

	In /etc/iscsi/targets:
	# present an ISO image
	extent2         /usr/sets/20071214/release/iso/i386cd.iso 0 size
	target2         ro      extent2         any

	% priv /etc/rc.d/iscsi_target restart
	Stopping iscsi_target.
	Starting iscsi_target.
	Reading configuration from `/etc/iscsi/targets'
	target0:rw:any
		extent0:/tmp/iscsi-target0:0:104857600
	target1:rw:any
		extent1:/tmp/iscsi-target1:0:52428800
	target2:ro:any
		extent2:/usr/sets/20071214/release/iso/i386cd.iso:0:354906112
	DISK: 1 logical unit (204800 blocks, 512 bytes/block), type iscsi fs
	DISK: LUN 0: 100 MB disk storage for "target0"
	DISK: 1 logical unit (102400 blocks, 512 bytes/block), type iscsi fs
	DISK: LUN 0: 50 MB disk storage for "target1"
	DISK: 1 logical unit (693176 blocks, 512 bytes/block), type iscsi fs
	DISK: LUN 0: 338 MB readonly disk storage for "target2"
	TARGET: TargetName is iqn.1994-04.org.netbsd.iscsi-target
	%

Please note that the NetBSD initiator can mount (via vnd) an iSCSI target
presented in this manner. The Microsoft iSCSI initiator sees the read-only
target as a normal SCSI disk, and fails (not surprisingly) to initialize
the disk. It's now possible to make ISO images available via iSCSI, and
NetBSD will DTRT.

In read-only targets, don't attempt to seek to the last block and rewrite
it, it may not work.

Don't assign 8 MB of unused space for use in each iSCSI disk - just use
1MB, which will be enough for the scatter gather iovecs.

Get rid of some dead code.
2007-12-18 20:31:50 +00:00
agc f327aec7bc Update portable version of the iSCSI software to 20071218, to
include various minor build fixes.
2007-12-18 11:19:06 +00:00
agc bb94308fd7 Pre-define HAVE_CONFIG_H for the portable autoconf-ed version as well. 2007-12-17 12:29:05 +00:00
agc 1e49aaff48 clean up a dependency on a file which has been removed 2007-12-17 12:05:35 +00:00
agc 8d29cd66d3 Do some rudimentary bounds checking on arguments passed in from
external functions.
2007-12-11 19:57:58 +00:00
agc 75a8f5acf1 Bump the number of targets that the initiator can handle to 16 (from 1). 2007-12-11 08:49:12 +00:00
lukem 49c8589969 Also escape $Header tags. 2007-12-11 03:34:59 +00:00
agc 87c66df218 Remove a debug printf from the initiator code now that we have a real
discovery mode in the initiator.
2007-12-10 23:06:45 +00:00
agc a3d56a1b30 Update to version 20071209, to include new initiator "discovery only"
option, the iqn alias configuration option, and the different md5
routines which are being used.
2007-12-09 09:38:48 +00:00
agc 7d25996b8b Add prototypes for initiator_get_targets() and initiator_set_target_name(). 2007-12-09 09:33:35 +00:00
agc 4ed8885f3b Move the iSCSI code over to use the endian neutral md5 code,
originally from Poul-Henning Kamp, as found in pkgsrc/pkgtools/digest.
This should address some of the MD5 problems that are being seen on
some hosts at login time.

Re-run autoconf, autoheader and configure.
2007-12-09 09:21:03 +00:00
agc df4b4cffe4 Add support in the target for specifying the target IQN (iSCSI Qualified
Name) in the targets configuration file.

Now an entry of the form:
target0=iqn.binky rw extent0 any

will mean that target0 gets presented with the iqn of "iqn.binky".
This can be useful for shorter aliases for IQNs. With thanks to Peter
Eisch for the idea.

Note that the target's base IQN can still be set with the -t parameter
to iscsi-target.
2007-12-09 09:16:42 +00:00
agc d2f1aa150b Get rid of some files which aren't used. 2007-12-09 09:09:02 +00:00
oster b99a3154c6 Add bits needed by my last changes to iscsifs.c (oops! :( ). In
particular, initialize the target name properly in g_target, and add
functions for setting the target name and retrieving a list of
available targets.

Thanks to agc for catching this.
2007-12-08 15:20:24 +00:00
agc 06a857cac5 Add some definitions necessary for building on busybox thanks to Peter
Eisch, update to version 20071206, and run autoconf and autoheader
again to regenerate the version information.
2007-12-06 00:08:05 +00:00
agc 6febf18c31 Quieten gcc - remove an extraneous ',' after the last element in an
enumerated type.
2007-12-05 07:23:03 +00:00
oster 2b8d2018cc Set "lun = sess->d" early on (but not too early), and allow multiple
targets to now work correctly.  XXX: This will need to be re-visited
at some point, and fixed properly.

Commit requested by: agc
2007-12-04 16:25:37 +00:00
wiz 6ffc795bbf New sentence, new line. Add comma in enumeration. 2007-12-03 18:19:08 +00:00
agc 6436d01687 Update autoconf parts to 20071130 to pick up two fixes:
md5 endian fix for Big Endian platforms

Greg Oster's impressively found fix for parameter negotiation
2007-11-30 09:56:32 +00:00
oster 1aad397ee0 We have 4 cases here: rx_answer, tx_answer, rx_offer, and tx_offer.
When determining what to put in to param->negotiated, it is *NOT*
sufficient to just pick one of offer_tx or offer_rx -- we may need to
use answer_rx or answer_tx as the negotiated parameter.  Failure to
pay attention to which case we are handling means we will occasionally
get "old parameter values" stuffed into responses, resulting in
obscure behavior (such as getting luns mixed up after a normal
connection is made) that is very difficult to replicate.
2007-11-30 00:33:34 +00:00
agc 23c77f8d12 Do runtime detection of machine's endianness, rather than relying on a cpp
macro which was never changed. This is the QAD fix, longer term we will
move to use native md5 routines if available.

Should go some way to fixing authentication problems when using an
initiator and target of different endianness.
2007-11-28 16:46:38 +00:00
agc 9e8e283ee9 Update the portable version to 20071122, via autoconf.
Only change is that the target returns MAXLBA in a READ_CAPACITY command
response, and the initiator adds one to it to find out the size.
2007-11-22 22:56:20 +00:00
agc 516da92e13 Add some more definitions which will be needed in the future. 2007-11-22 22:51:09 +00:00
agc fe6dd62563 Note to self - document in comments the reasons for doing certain things.
Revert Max LBA calculation when returning the Maximum LBA from the target
to the iinitiator, following an email conversation with Jonathan Kollasch,
who points out a number of things:

+ the NetBSD scsipi driver reads the value returned by the drive and adds
one to it, so that standard SCSI drives return the 0-based Max LBA in a
READ CAPACITY command.

+ it is up to the initiator to add 1 to the Max LBA to find out the size
of the LUN (Jonathan verified this by using the UNH iSCSI initiator on
to a NetBSD target)

+ an analogous change to the NetBSD initiator (revision 1.4 of
iscsifs.c) is needed.
2007-11-18 23:52:19 +00:00
agc 445a5e5f36 Bump version to 20071114, to include the iSCSI initiator in the portable
version.
2007-11-14 20:05:52 +00:00
agc f56debaab1 Rationalise this completely for the portable GNU autoconf version (which
is not used by the NetBSD reachover framework).

Get rid of the misplaced bin directory during the build phase, it's not
necessary.

Add commands to build the NetBSD iSCSI initiator.
2007-11-14 20:00:06 +00:00
agc e99d7af118 Add some commented out code (not enabled yet) to deal with MODE_SENSE_10
SCSI commands.

No functional change.
2007-11-14 19:58:06 +00:00
agc 7f7c78c76b Rename include/util.h to include/iscsiutil.h to avoid a nameclash
with /usr/include/util.h.
2007-11-12 23:25:40 +00:00
pavel cac90c847b Mention the ipf mode in more places, xref pf.conf(5) or ipnat.conf(5)
when speaking about the configuration file commands. Bump date.
2007-11-12 17:14:28 +00:00
pavel 7fa608457b Do not use ntohs() on TCP ports passed to the NAT lookup ioctl, apparently
they are expected in network order. Makes the proxy in ipf mode actually
work (but tested only on NetBSD 3.0).
2007-11-12 17:05:13 +00:00
jmmv 866b001ea5 Import of ATF 0.3
Initial import of the Automated Testing Framework, version 0.3, a project
that provides a framework to easily implement test cases for the NetBSD
operating system and some tools to run them and generate reports with the
results.

Note that this is just the framework (libraries and tools), which is and
will be maintained externally.  The tests themselves will come later, will
be put under the 'tests' hierarchy and will be managed exclusively under
the NetBSD CVS tree given that they are tied to the operating system.

The work done until version 0.1 was sponsored by the Google Summer of Code
2007 program and mentored by martin@.
2007-11-12 14:50:50 +00:00
agc d880ffcdf0 In READ_CAPACITY, send back the size of the LUN, not the maximum LBA,
which is zero-based.

Problem reported by, and fix verified by, Greg Oster. Thanks, Greg!
2007-11-06 15:59:10 +00:00
tls 642c01f5cd Mollify NetBSD's lint (which brokenly doesn't define __STDC__ and thus
picks up a bogus assert() macro from assert.h) by not putting double
quotes too close to macro using assert().
2007-11-04 22:02:35 +00:00
joerg 9db95c28e5 Import of pkg_install-20071103.
- reject absolute names in +CONTENT
- fix size issues with pkg_add -u and buffer handling
- print file name of failed renames in pkgdb during pkg_add -u
- remove warning when running pkg_add as non-root
- remove more traces of master/slave mode
- update URLs for new ftp.netbsd.org layout
- make warning of broken symlinks separate from warning for non-existant
  files
- FETCH_PRE_ARGS option for download-vulnerability-list
- print only base package name in FILE_NAME for pkg_info -X
- don't leak memory in Dewey, it is called a lot more often now and
  makes a difference
- just allocate in vfcexec and free, don't bother caching the exec
  buffer
- remove some FTP debugging code
- make more allocation errors in the pkgdb iteration code fatal
- glob patterns and simple patterns are checked for being version-free
  as well
- try harder to get setgid permissions correctly when extracting as
  non-root
- fix waitpid to correctly handle EINTR
2007-11-03 14:14:12 +00:00
agc 2f510db93e Recognise the word "lun" as a synonym for "target" in the configuration
file - allows us to export luns as well as targets, which should reduce
some confusion when presenting storage to external entities.
2007-11-03 09:44:06 +00:00
gdt e6599a52d6 Change buffer for SIOCGIFCONF usage from 2048 to 32768. Because the
code to retry on SIOCGIFCONF not returning all interfaces is broken,
this unreasonably large buffer should handle the case of a machine
with lots of (usually virtual) interfaces.  dhcpd 4 uses a different
method to get interface configuration, so this kludge should go away
on upgrade.

Fix based on understanding of the code, but has been compile-tested
only, to address failure report received from Michael Graff.
2007-10-31 15:26:51 +00:00
ragge 4ce08a9bc7 Import of current (today) pcc. 2007-10-27 14:43:28 +00:00
agc d7728ae0d3 Update to version 20071025
Pay closer attention to the TSIH value that is assigned by the target -
rather than a simple (session id + 1) value, which cycles after 16 sessions
are used, use a central counter, and increment that whenever a TSIH is
apportioned. This fixes some problems for me with multiple targets being
ignored, and only the first target being used. Tested with the Microsoft
initiator, and the embryonic NetBSD initiator.

Use more enumerated types, rather than cpp definitions.

Use enumerated types also in preference to magic numbers.

In the iSCSI test harness, use the -t argument to specify a disk target
exported by the NetBSD iSCSI target. This allows us to test for the
situation outlined above.

Add my copyright to the test harness - there's no Intel code left anymore.

Modify the way initiator login and logout information is presented to the
user. This is only of concern to people who use this with the target in
non-detached (non-daemon) mode.

Get rid of the MODE_SENSE_10 and MODE_SELECT_10 cases in the disk switch,
since they do not return responses in the correct format yet.
2007-10-26 18:36:45 +00:00
agc 06e992a132 Correct the name of the AIX 5.3 initiator reporter (where known) 2007-10-26 18:19:36 +00:00
he 555e1d5a74 Remove a superfluous test, wcrtomb() cannot return (size_t)-2.
Pointed out by Aleksey Cheusov.
2007-10-25 22:22:41 +00:00
christos ba0aca47b0 PR/37205: Aleksey Cheusov: nawk: a number of open files is limited to very
small constant. Make the array of files dynamically allocated.
2007-10-25 15:12:03 +00:00
he 50d663aa6a Add support for multibyte charsets in the "tolower" and "toupper" awk
functions.  Code contributed by Aleksey Cheusov in PR#36394, and slightly
tweaked for closer-to-KNF conventions by me.  Also slightly improved checks
of error returns.
2007-10-25 14:44:49 +00:00
he c6b19d4d1d Bring back the fix in revision 1.6, apparently accidentally lost
during last merge, to allow escape of a newline in string literals.
2007-10-25 14:40:33 +00:00
he 917131a2cf When checking for the length of the user name, check against the size
of the correct field.  Fix provided by Bernhard Moellemann in PR#37137.
2007-10-16 15:37:32 +00:00
agc a7eecfa1f4 Add a file containing information about NetBSD iSCSI target compatibility
with various different initiators.

Any more information gratefully received (either positive or negative).
2007-10-14 11:01:21 +00:00
mrg 862626dd09 two new hacks:
- include <stdbool.h> so bool is available _KERNEL for sys/condvar.h
- include <sys/mutex.h> before defining _KERNEL so it won't try to
  include <machine/intr.h> which isn't available to userland.

fixes builds on sparc64.
2007-10-09 01:23:20 +00:00
agc 7bc5694f64 Fix an off-by-511 error, pointed out by Andrey Yakovlev 2007-09-26 12:01:49 +00:00
agc 7dcbb17115 Bump version of the NetBSD iSCSI target to 20070925.
+ fix a reported problem with newer versions of FreeBSD which require
a block of data to be read and written, rather than a single byte.

+ add support for Extended Inquiry Data VPD Page (0x86), reported to be
necessary to interoperate with the AIX initiator.

+ add preliminary support for the Write and Verify SCSI operation (0x2e).
2007-09-25 22:16:58 +00:00
agc 91566c8774 As part of the initial checks to se ethat a writable disk really is
writable, do the touch(1) dance with 512 bytes of information, rather
than just a single byte - the single byte read and write causes
problems on newer versions of FreeBSD, I am informed.  Patch from
Andrey Yakovlev, cleaned up to compile by myself.

Add support for Extended Inquiry Data VPD Page (0x86), reported to be
necessary to interoperate with the AIX initiator.

Add preliminary support for the Write and Verify SCSI operation (0x2e).
2007-09-25 22:15:00 +00:00
agc f22b6d776c Add a utility function to copy the target information to the caller - used
in the initiator functionality to keep a track of the target details.
2007-09-25 22:09:51 +00:00
agc bfe5c01baa fix formatting in a comment 2007-09-25 22:08:10 +00:00
abs 275c9bb94a Comment out some references to compat.o until ragge can update - now we
build
2007-09-20 14:21:39 +00:00
abs 244d23f931 At core's request import ragge's current pcc-070920.tgz into src/dist/pcc
http://www.ludd.ltu.se/~ragge/pcc/

This is based on the original Portable C Compiler by S. C. Johnson,
written in the late 70's. Even though much of the compiler has been
rewritten, some of the basics still remain.

The goal of pcc is to produce a  small, simple, fast and understandable
C99 compiler under a BSD licence.
2007-09-20 13:08:44 +00:00
agc 4e1fbeb934 Might as well define MODE_SELECT_6 and MODE_SELECT_10 too before too
many people get violent.
2007-09-19 23:28:15 +00:00
agc 6a20fc2b13 Preliminary support for MODE_SELECT_{6,10} and MODE_SENSE_10.
Committed now because some high priority fixes are about to come down
the line.
2007-09-19 19:54:09 +00:00
martti abde7e33e0 Fixed IPF bug #1767831
ipflog() & ipmon ignore IPv6 extension headers
2007-09-17 18:02:21 +00:00
drochner 13434589bc free the temporary path string if the fallback to an unversioned
plugin module fails
2007-09-14 17:57:39 +00:00
gdt f77e123027 Follow NetBSD's interpretation of the interface to SIOCGIFCONF: the
next ifreq is sizeof(struct ifreq) after the current one unless the
sockaddr is bigger than the union in ifreq that holds it.

In the original 4.4BSD code, this interpretation results in the same
behavior as the "is the sockaddr bigger than struct sockaddr", because
sizeof(struct sockaddr) and sizeof(ifc->ifr_ifru) are the same.

Add comments pointing out problems in the 'need bigger buffer' code,
and copying excessive amounts of data.
2007-09-13 11:56:41 +00:00
cube c725329722 Remove 3rd clause and my name from all the licences which were only in my
name.
2007-09-10 10:35:51 +00:00
martti 61078fef5f Revert to previous, it was not working for me correctly... 2007-09-10 06:28:38 +00:00
martti fcbc8c046f Fixed IPF bug #1767831
ipflog() & ipmon ignore IPv6 extension headers

Patch fetched from the SourceForge bug report.
2007-09-10 06:12:02 +00:00
agc e0ef0e5000 Welcome to version 20070908 - multiple targets bug fix. 2007-09-08 09:52:20 +00:00
agc c11d4df578 Resurrect the port number argument to the iSCSI test harness. 2007-09-08 09:44:24 +00:00
agc b35bda38e1 Cosmetic change to a long line
Don't reset the target session's idea of the disk id whenever input is received.
2007-09-02 18:50:49 +00:00
agc 028ef264bb Only give the AI_NUMERICSERV hint to getaddrinfo() if it's defined. 2007-09-02 18:48:45 +00:00
apb 22d0439909 In setfval(), ensure that arithmetic never yields a negative zero
result.  Now {echo | awk '{print -1 * 0}'} prints "0" instead of "-0".

Fixes PR 36831.  Discussed in tech-userlevel.
2007-08-28 15:23:13 +00:00
joerg eeb69d2fa6 Import pkg_install-20070821. 2007-08-23 15:19:12 +00:00
ghen 45f483d712 Remove CVS $Log$ tag, this got problematic when pulled up to netbsd-4. 2007-08-21 13:17:24 +00:00
kardel 9e20ecb745 track upcoming fix for NTP-Bug 889 (avoid calling malloc()
during SIGIO handling)
2007-08-18 13:18:23 +00:00
kardel a097fb65eb pick up upcoming fixes from NTP-Bug 885 2007-08-18 09:56:13 +00:00
kardel 55ae27e368 revert a local fix - not necessary any more
created and tested by drochner@
2007-08-18 05:48:46 +00:00
agc 4b38cf6082 Use AI_NUMERICSERV as a flag to getaddrinfo() when trying to find the
correct service - allows us to bind to the correct port, and not the
iSCSI control port.

Update version to 20070815, and re-run autoconf and autoheader.
2007-08-16 06:25:16 +00:00
joerg 50c788c748 Import pkg_install-20070814. 2007-08-14 22:59:50 +00:00
agc 6396470148 + re-activate code to set port number in the iSCSI target
+ if the attempt to getaddrinfo() on (host,port) fails, try various
	combinations of (host,service)
+ clean up lint
+ set sess->d when we get traffic in, rather than just at iSCSI login
2007-08-14 18:52:48 +00:00
joerg 06a05a37cc Import pkg_install-20070804: Fix ordering in pkg_order. 2007-08-08 22:38:48 +00:00
joerg 64a91fda89 Import libarchive-2.2.6 2007-08-06 12:25:33 +00:00
joerg 255da49526 pkg_install-20070802 2007-08-03 13:58:16 +00:00
joerg ed52b7dc34 Import libarchive-2.2.5.
Only the library, tar, the test suites for each and the NEWS are
imported, the rest is not used or currently not useful.

Patches for an aliasing violation and a ctype interface violation
are included, they are scheduled to be part of the next release.
2007-07-29 16:35:09 +00:00
drochner c6de8226b0 Back out local NetBSD change (range check to avoid buffer overflow),
to reduce diffs to upstream.
This is superseded by another check (TCHECK2) introduced upstream.
2007-07-28 16:09:14 +00:00
drochner 87eb08c4d6 Back out local NetBSD change (attempt to handle FDDI padding), to reduce
diffs to upstream.
This turns out to be a no-op, and it shouldn't be here at all because
the DEC/NetBSD specific FDDI padding is dealt with in libpcap already.
2007-07-28 16:07:32 +00:00
drochner 624d9b0e79 Back out local NetBSD change (typecast to void*), to reduce diffs to
upstream.
Appears unnecessary to me (source and target are unsigned char*) and
compiles w/o for me.
2007-07-28 16:04:44 +00:00
drochner 427fb19923 Back out local NetBSD changes (removal of _U_ which expands to
attribute(unused)), to reduce diffs to upstream.
While that is ugly, we have the _U_ left in at other places.
2007-07-28 16:02:17 +00:00
drochner 68aa07a617 Back out local NetBSD change (addition of #include files), to reduce
diffs to upstream.
Compiles fine without for me, and there is no CVS commit message
telling why it should be necessary.
2007-07-28 15:59:39 +00:00
plunky 55e2ff23b1 fix build for the "USE_INET6=no" case, the two variables 'nxt' and 'len32'
are only used in the inet6 code.
2007-07-26 18:15:12 +00:00
dogcow 1ad9ad78c6 fix compilation on 64-bit platforms by avoiding spurious EXTRACT_32BITS 2007-07-25 06:31:32 +00:00
christos 5b94024b59 Import bind 9.4.1-P1
2206.   [security]      "allow-query-cache" and "allow-recursion" now
                        cross inherit from each other.

                        If allow-query-cache is not set in named.conf then
                        allow-recursion is used if set, otherwise allow-query
                        is used if set, otherwise the default (localnets;
                        localhost;) is used.

                        If allow-recursion is not set in named.conf then
                        allow-query-cache is used if set, otherwise allow-query
                        is used if set, otherwise the default (localnets;
                        localhost;) is used.

                        [RT #16987]

2203.   [security]      Query id generation was cryptographically weak.
                        [RT # 16915]

2202.   [security]      The default acls for allow-query-cache and
                        allow-recursion were not being applied. [RT #16960]

2193.   [port]          win32: BINDInstall.exe is now linked statically.
                        [RT #16906]

2192.   [port]          win32: use vcredist_x86.exe to install Visual
                        Studio's redistributable dlls if building with
                        Visual Stdio 2005 or later.
2007-07-24 23:52:54 +00:00
christos 92b1ea3abe Import bind 9.4.1-P1 2007-07-24 23:32:11 +00:00
drochner 2e9d41b4db merge in NetBSD changes 2007-07-24 12:41:07 +00:00
drochner 7ef8b6e9b2 avoid a pointer signedness warning 2007-07-24 11:55:13 +00:00
drochner d8f5b90097 merged tcpdump-3.9.7 2007-07-24 11:53:36 +00:00
drochner 57e6a30fe7 import tcpdump-3.9.7 (after running the tcpdump2netbsd script and
defusing NetBSD id strings used as reference)
2007-07-24 11:42:50 +00:00
rumble 23622f237e Ensure that the special host token '*SMBSERVER' is not automatically
hyphenated, as this can lead to some confusion (e.g.: '*SMB-SERVER' isn't
valid).

(Thanks Wiz!)
2007-07-21 22:41:09 +00:00
drochner adf4078381 Fix a possible integer overflow in buffer length calculation due to
insufficient check of snprintf()'s return value, see gentoo bug #184815.
The exploit provided appearently doesn't trigger the overflow in
NetBSD; this might be due to different error return behavior of snprintf
implementations, or due to the fact that out tcpdump is still 3.8.3
while the bug was reported against 3.9.x. The fix looks correct in any
case.
The exploit caused an endless loop at another place instead, due
to an obvious bug, so fix this too.
Also apply another patch which was applied to the 3.8 branch upstream
but never released: rev. 1.72.2.5, infinite loop protection for ldp and bgp

We should update tcpdump to 3.9.x.
2007-07-20 17:12:37 +00:00
christos 8f80c199b2 remove uucp references; from Anon-Ymous 2007-07-18 18:36:57 +00:00
joerg 700b744d72 Remove files accidently commited in first import of pkg_install 2007-07-18 14:27:12 +00:00
joerg 764d59fb69 Import fix for the download-vulnerability-list script forgotten
in the original merge and remove a created file accidently added.
2007-07-18 14:23:32 +00:00
joerg d243200850 Import of pkg_install-20070715 from pkgsrc.
This is part one of moving the authoritive version from
src/usr.sbin/pkg_install to pkgsrc/pkgtools/pkg_install/files.

Discussed with and agreed by: jlam@, agc@, adrianp@
Raised issue to and not objected by: core@
2007-07-16 13:01:43 +00:00
dsl 71edd4968d Add new 'data_len' parameter to mount(). 2007-07-14 16:03:05 +00:00
kardel d370a3332c sync with release 2007-07-06 21:20:25 +00:00
kardel d7d9fc60cc sync with release / removes debug NULL deref 2007-07-06 21:19:33 +00:00
kardel db56afd343 compile fix for amd64 2007-06-24 19:39:06 +00:00
kardel 9238104d09 resolve merge conflicts of 4.2.4p2 import 2007-06-24 16:55:11 +00:00
kardel d3063e9f3c Import ntp 4.2.4p2 2007-06-24 15:47:02 +00:00
agc ad9b63f6fb Move my own code from a 4 clause to a 3 clause licence. 2007-06-16 23:13:25 +00:00
martin c77a3f5aad Upgraded IPFilter to v4.1.23 2007-06-16 10:52:24 +00:00
martin 03f2531d69 Import IPFilter 4.1.23 2007-06-16 10:33:08 +00:00
agc bcf774971d Re-generate autoconf parts.
No change to NetBSD distribution, since it is made using reachover Makefiles.
2007-06-16 10:02:23 +00:00
agc e6bf177ae1 Apply the fix from PR 36354, from yamt.
yamt's reading of RFC 3720 is correct (see section 12.10, InitialR2T).

The desired transfer length in the initial ready to transmit
negotiation should not include any immediate data.
2007-06-15 19:57:30 +00:00
pooka 86146f9e2e put LP64 SIZE_T_MAX on a diet: 17 f's is too much, trim it down to 16 2007-06-14 19:26:17 +00:00
pooka 549f6b16d1 Make this match the distributing by removing some extra goo that was
added a few years back when battling AM_MAINTAINER_MODE and has been
lugged around ever since.

from adrianp
2007-06-14 19:10:54 +00:00
christos 6f5be32dbf print millis too. 2007-06-09 19:52:36 +00:00
christos 419556ce9d Instead of printing the priority, print the time before each message which
is more useful.
2007-06-09 17:10:59 +00:00
pooka 9afe6367b3 crunch cornflakes 2007-06-07 11:32:44 +00:00
pooka 40ad27db84 file 4.21. bugfixes 2007-06-07 11:24:27 +00:00
martti fff7fd04df s/iplattach/ipfattach/ and s/ipldetach/ipfdetach/ 2007-06-04 12:38:58 +00:00
christos f84135414c don't make bogus assumptions about struct alignment. 2007-05-31 02:58:10 +00:00
tls 67fcd29261 Do not include internal header files from libpcap without setting the
feature-test macros they use.  Really, of course, this code should not
include such header files at all.
2007-05-28 11:55:19 +00:00
cube 62e0f430f0 p needs to be const. [hi christos!] 2007-05-28 00:39:00 +00:00
tls ac016a7fc2 Changes required for FORTIFY_SOURCE: don't rely on #define read (etc.)
before system header file inclusion magically causing what "read" is
#defined to to pick up a read-like prototype.  For sanity's sake, put
prototypes for revolting trace_mr stuff in their own header file (instead
of nowhere at all and using the trick referenced above).
2007-05-27 16:27:57 +00:00
martti 657382d62b Added missing .TP 2007-05-23 05:18:45 +00:00
christos 67f0e23f0f coverity CID 4418: Don't call strlen() with NULL. 2007-05-16 20:53:49 +00:00
martin 6718c86598 Merge IP-Filter 4.1.22 2007-05-15 22:52:20 +00:00
martin 29fd0d9db1 Import IPFilter 4.1.22 2007-05-15 22:26:02 +00:00
dyoung e096ddfc8a Document state policy flags for 'nat' and 'rdr' rules. 2007-05-10 23:03:22 +00:00
dyoung f7748bc6aa pfctl: extend pf.conf(5) syntax. Let the operator supply an optional
"state lock" flag (if-bound, gr-bound, floating) at the end of a
NAT rule.  The new syntax is backwards-compatbile with the old
syntax.

PF (kernel): change the macro BOUND_IFACE() to the inline function
bound_iface(), and add a new argument, the applicable NAT rule.
Use both the flags on the applicable filter rule and on the applicable
NAT rule to decide whether or not to bind a state to the interface
or the group where it is created.
2007-05-10 22:30:54 +00:00
christos 2d0d2fc81d merge conflicts 2007-05-01 22:15:12 +00:00
christos 5f9b8877e1 Import bind 9.4.1 2007-05-01 21:51:06 +00:00
martti 872147fef7 Upgraded IPFilter to 4.1.20 2007-05-01 19:08:03 +00:00
martti 68eb121d73 Import IPFilter 4.1.20 2007-05-01 19:00:58 +00:00
dsl 8767590c76 On amd64 U_QUAD_T is (probably) 'unsigned long', but "%qd" expects to see
a "long long" - giving a compilation warning.
Check for the presence of PRIu64 and use that in preference.
Adjust code to avoid multiple printf() calls.
Use unsigned format specifiers in all cases.
2007-04-21 11:16:53 +00:00
dogcow 65febf04fc fix build on arches with chars that're by default unsigned.
(patch supplied by martin.)
2007-04-16 02:36:24 +00:00
martin 8ebafcc992 Update IPFilter to version 4.1.19 2007-04-14 20:34:18 +00:00
martin 993d757ec6 Import IPFilter 4.1.19 2007-04-14 20:17:19 +00:00
christos 99a3390caf Coverity CID/4421: Add extra check for NULL before deref. 2007-04-04 21:40:48 +00:00
ghen 94364b1084 Resolve conflicts. 2007-03-30 19:40:47 +00:00
ghen cc483ecacb Import bind-9.4.0. 2007-03-30 19:15:20 +00:00
christos a5346961e8 use memcpy instead of strlcpy because we want to truncate the string. 2007-03-27 01:29:44 +00:00
joerg cc1b813618 Don't segfault during decoding of unlimited strings in PPPoE. 2007-03-24 23:20:12 +00:00
dogcow f790a123d5 unbork openssl import borkage. 2007-03-07 03:18:53 +00:00
pooka 000760c6d5 make print format specifiers match types printed 2007-03-04 21:50:43 +00:00
jnemeth 9f5aa7f07f fallout from caddr_t -> void * change 2007-03-04 20:04:14 +00:00
pooka 7a41045ba4 squelch gcc warnings 2007-03-04 15:25:10 +00:00
pooka 17dbe768ca apply conflict therapy for 4.20 import 2007-03-04 15:22:07 +00:00
pooka 67e9db49c9 file 4.20, contains fixes to the magic parser, new syntax and a
buffer overflow fix
2007-03-04 14:54:42 +00:00
dogcow 53d226486b An incredibly grody hack to save a few more precious bytes: in dhclient,
don't include the unknown-{nn,mm} strings ifdef SMALL.
2007-03-01 01:02:33 +00:00
matt 75a9720952 #include <machine/lock.h> before _KERNEL is defined to bypass
lossage when including it when _KERNEL is defined in userland.
2007-02-20 15:40:08 +00:00
dyoung 2d212326ef Use the new ifnet->if_output signature, the one with a const
argument, when __NetBSD__Version >= 499001100.
2007-02-18 04:01:27 +00:00
dogcow 51701d90f7 constify struct sockaddr for no_output and write_output, due to if.h 1.122 2007-02-18 03:22:03 +00:00
christos f987814949 include <types.h> 2007-01-30 18:12:48 +00:00
christos 03f10a71aa provide non-atomic versions so that things compile for now. 2007-01-30 00:46:52 +00:00
christos fd07b4b277 handle resolv_mt.h 2007-01-27 23:02:37 +00:00
christos d7aeceb511 deal with base64.c 2007-01-27 22:28:22 +00:00
christos 4455b59ff4 Use __inline consistently so that we avoid unused warnings. 2007-01-27 21:30:22 +00:00
christos 4674124bb1 resolve conflicts 2007-01-27 21:24:09 +00:00
christos c1a4ad93e3 Import bind-9.4.0-rc2 from ftp.isc.org 2007-01-27 21:02:43 +00:00
kardel 24e8b498bd track NTP bug 768: opening of bcast if, misleading error message 2007-01-27 09:02:38 +00:00
kardel 8acf6049c0 Use the portable version to declare the type of the length argument
for the recv*() functions. Fix queued with the NTP project.
2007-01-21 07:59:31 +00:00
kardel 54a07e0f01 PR/25482
reinstate NTP html pages (sans gif's/img tags).
The important man pages are now generated by autogen and
thus match again the code again.
2007-01-20 16:50:29 +00:00
kardel 9e57eb45fe track ntp bug #760 - support DYNAMIC flags in async resolver 2007-01-13 11:41:05 +00:00
agc b734ab10f3 Use the proper tracing functionality 2007-01-11 22:59:53 +00:00