Commit Graph

1315 Commits

Author SHA1 Message Date
christos
1edf903634 Import pppd-2.4.4 2006-06-29 21:46:38 +00:00
christos
295eac6574 make the gototab unsigned int 2006-06-26 17:58:25 +00:00
christos
80f0134faf - widen gototab so NCHARS states fits.
- don't allocate more space than we need.
From Aleksey Cheusov
2006-06-26 13:10:47 +00:00
christos
a504bbc8d8 Don't forget to free gototab[i]; pointed out by Aleksey Cheusov 2006-06-25 22:37:45 +00:00
mrg
5609a371c9 make MKCRYPTO=no work again. 2006-06-25 03:02:19 +00:00
christos
ab7ad9579e PR/33392: Aleksey Cheusov: Incorrect matching due to hard-coded limit in
number of states. Adapted from patch supplied.
2006-06-22 21:25:14 +00:00
kardel
d66ddb6f9c use the version that is now in ntp-stable (4.2.2 release branch) 2006-06-18 22:48:51 +00:00
kardel
7d46a5bb55 NetBSD Coverity CID 3804: avoid file pointer leak 2006-06-18 21:35:57 +00:00
kardel
50fd338dac NetBSD Coverity CID 3799: overrun static array (off by one) fixed 2006-06-18 21:30:19 +00:00
kardel
e1a3a74084 NetBSD Coverity CID 3797: bad return code check for open(2) fixed
(!fd replaced with fd < 0)
2006-06-18 21:25:13 +00:00
kardel
b58f2a229e NetBSD Coverity CID 3796: possible NULL deref 2006-06-18 21:20:35 +00:00
kardel
d58917ea1c cope with situations where interface are UP and bound to
INADDR_ANY - ntpd will ignore those interfaces
(bug 637 @bugs.ntp.isc.org)
2006-06-17 12:11:55 +00:00
christos
b7414305ba Update the manual section 2006-06-14 16:23:46 +00:00
christos
3e2e64af97 Regen 2006-06-14 16:22:54 +00:00
christos
826ade140d Use /dev/tty if possible and only fall back to stdin/stderr if that is not
available like getpass(3) does.
2006-06-14 16:17:01 +00:00
christos
2e91d940da PR/33724: Scott Ellis: Building a release with MKINET6=no stops in libisc due
to compiler warnings. Fixed misplaced and miscommented #endif
2006-06-13 22:36:36 +00:00
christos
f503e58dd8 PR/33723: Arthur Townsend: file command doesn't show 'executable' for
statically linked sun3 exec
2006-06-13 22:20:20 +00:00
christos
d8cec01f6f PR/33722: Scott Presnell: pppd 2.4.3 active-filter functions botched 2006-06-13 22:12:37 +00:00
kardel
d5b727f28d correct pointer advances broken by previous fix 2006-06-13 21:03:53 +00:00
kardel
3dfb395215 sort out pointer types - found & fix by jmmv 2006-06-12 10:46:19 +00:00
kardel
b51cdf6b08 fix pointer deref - found by jmmv 2006-06-12 10:45:27 +00:00
kardel
8704ff927b import and integrate NTP 4.2.2 2006-06-11 19:34:07 +00:00
kardel
9c52afaf31 Import ntp 4.2.2 2006-06-11 14:57:12 +00:00
agc
2b1d5a0345 :g/%i/s//%d/gc
Also make a first stab at implementing persistent reserve in SCSI command.
2006-05-31 19:53:13 +00:00
chap
5d80ae61bf Clarify that to avoid ioctl(SIOCGNATS): Input/output error, ipf must be
enabled (ipf -E) before ipnat is used; this detail is automated by the
rc scripts, but not by ipnat itself. ipf's author agrees this is a doc
bug.

Closes PR kern/33409.
2006-05-29 16:09:46 +00:00
agc
c52b27c275 Bump version number for the portability fix, and the dynamic number of
sessions.
2006-05-27 21:29:32 +00:00
agc
36fad19155 Rather than hardcoding the maximum number of sessions that a target can
serve simultaneously to DEFAULT_TARGET_MAX_SESSIONS, add a -s argument to
iscsi-target(8) to specify the maximum number of sessions.

Also bump default from 4 to 16.
2006-05-27 21:21:04 +00:00
agc
6dff2af424 Include another header file - should make this compile on platforms where
arpa/inet.h does not include netinet/in.h automatically.

Some people do just make life harder for themselves.
2006-05-27 16:00:05 +00:00
chap
baa41845e1 Remove statement (incorrect as of ISC release 3.0.3) that the next-server
value defaults to the server address. (This statement has been removed in
ISC release 3.0.4.)

Closes PR bin/33565.
2006-05-26 19:22:03 +00:00
agc
2fa516b2eb Rewrite the way report_luns() works, after suspicion by Matt Green, and
following Dan Carosone's suggestion of the uint64_t array.

Abstract a bit more from the HTOBE64() macro intrigue, for platforms
like Solaris/x86 which have fun in this part.

Tested only with little-endian initiators for now.

Bump version to 20060526.
2006-05-26 16:34:43 +00:00
agc
8a1a8b8c5c Include compat.h for the definition of uuid_t, in the case where we don't
have it from <uuid.h>
2006-05-25 19:41:06 +00:00
mrg
5f6c58ab32 apply a few casts to quieten GCC4. 2006-05-25 09:04:37 +00:00
rpaulo
b28216dab7 Resolve conflicts for wpa_supplicant 0.4.9 import. 2006-05-25 04:07:22 +00:00
rpaulo
ed48ac28e7 Import of WPA supplicant 0.4.9 2006-05-25 04:01:24 +00:00
rpaulo
62355884c5 Import of hostapd 0.4.9 2006-05-25 03:53:38 +00:00
he
c6974f26a9 Use the value-returning variants of the 64-bit endian macros instead
of the argument-tweaking variants (e.g. htobe64 instead of HTOBE64).
2006-05-22 20:48:08 +00:00
christos
663ee5bb90 Coverity CID 2956: Avoid NULL deref. 2006-05-21 17:41:20 +00:00
christos
f84c1e59e0 Coverity CID 2958: Avoid NULL deref. 2006-05-21 17:39:10 +00:00
christos
a7631b82f6 Coverity CID 2974: Check for negative before assigning to unsigned variable 2006-05-21 17:35:23 +00:00
christos
884667d071 Coverity CID 3491, 3492: Plug memory leaks. 2006-05-21 17:32:23 +00:00
christos
555b8edb2d Coverity CID 3493: Comment out dead code. 2006-05-21 17:26:08 +00:00
christos
d159dc82e4 Coverity CID 3494: Plug memory leak. 2006-05-21 17:23:36 +00:00
agc
e32a776a5a Adjust the data VPD returns, to work around a problem in the Cisco
initiator (used on Solaris 10 Update 1) - the initiator demands that a
UUID is returned, so give it one.

Add autoconf glue for that, and a compat uuid_create(3) and
uuid_to_string(3).

This still spews a lot of output via the target's syslog, but persevere,
since it does actually make the target work with the Solaris initiator:

	solaris10# format
	Searching for disks...done


	AVAILABLE DISK SELECTIONS:
	       0. c1d0 <DEFAULT cyl 29728 alt 2 hd 64 sec 63>
		  /pci@0,0/pci-ide@1f,1/ide@0/cmdk@0,0
	       1. c2t5d0 <DEFAULT cyl 96 alt 2 hd 64 sec 32>
		  /iscsi/disk@0000iqn.1994-04.org.netbsd.iscsi-target%3Atarget00001,0
	Specify disk (enter its number): ^D
	solaris10# df -k /mnt
	Filesystem            kbytes    used   avail capacity  Mounted on
	/dev/dsk/c2t5d0s0      91407    1041   81226     2%    /mnt
	solaris10# uname -a
	SunOS solaris10 5.10 Generic_118844-26 i86pc i386 i86pc
	solaris10#
2006-05-21 09:26:37 +00:00
mrg
995cc7365d initialise tmp_clock() for GCC4. 2006-05-20 19:22:36 +00:00
drochner
65f32e5703 Make the optimizer use unsigned numbers as the kernel does.
While it is not agreed on that purely unsigned arithmetics is nice,
different behaviour of optimized and unoptimized code is less desirable.
2006-05-17 17:48:36 +00:00
christos
e4162ca0f8 XXX: GCC uninitialized. 2006-05-14 23:36:01 +00:00
christos
be1c3e616c XXX: GCC uninitialized. 2006-05-14 02:37:46 +00:00
christos
653a86901d XXX: GCC uninitialized 2006-05-14 02:10:41 +00:00
christos
e75e0ea2a7 another XXX: GCC uninitialized variable. 2006-05-14 01:31:14 +00:00
christos
9da0166ffa Another uninitialized variables XXX: GCC 2006-05-14 01:30:00 +00:00
christos
af2ae0aa2f Initialize rdataset. 2006-05-14 01:18:41 +00:00
christos
386c6259af Coverity CID 3497: Don't try to set the day/month if we did not get them
from the clock.
2006-05-13 23:55:23 +00:00
christos
19a2d0dbea Coverity CID 3197: Don't leak fp. 2006-05-13 22:50:24 +00:00
mrg
d1e102b605 match u_char * with u_char[]. 2006-05-11 09:29:39 +00:00
mrg
3394a47b32 move is_zone initialisation earlier to avoid a GCC warning. 2006-05-11 09:28:45 +00:00
mrg
0fa82c2792 move the extern for clktypes[]'s somewhere it's type is defined. 2006-05-11 00:11:25 +00:00
mrg
ebd6722e04 ctl_trap[] is not public so don't extern it. 2006-05-11 00:10:54 +00:00
mrg
0eaf0f8b7c #include <sys/param.h> since we want to check __NetBSD_Version__. 2006-05-11 00:08:44 +00:00
mrg
084c052803 quell GCC 4.1 uninitialised variable warnings.
XXX: we should audit the tree for which old ones are no longer needed
after getting the older compilers out of the tree..
2006-05-10 21:53:14 +00:00
skrll
a9f4c28a3d Fix a bunch of cast lvalues. 2006-05-10 06:24:02 +00:00
mrg
0c37c63edc change (mostly) int to socklen_t. GCC 4 doesn't like that int and
socklen_t are different signness.
2006-05-09 20:18:05 +00:00
kardel
e01a907378 NetBSD 22 CID 3049,3075: safeguard against (unlikely to impossible) NULL deref 2006-05-04 08:24:05 +00:00
tron
63cb4a87e2 Cast precision argument for sprintf() to int to fix build problems
on 64-bit platforms.
2006-05-02 10:09:18 +00:00
kardel
70ff37328f handle NULL return from d2i_X509() - NetBSD Run 21 Coverity CID 2979 2006-05-02 09:24:19 +00:00
christos
3e168a2a10 Use the sizeof the field instead of the #define constant. Fixes off-by-one
error.
2006-05-01 18:40:02 +00:00
uwe
ee952d9fc0 Use be64toh/htobe64 instead of upper-case versions.
Thanks to lint that caught this on big-endian arches.  Little-endian
compiled, but I guess that converting your loop counter into
big-endian inside the loop is not exactly what you want to do.
2006-04-30 01:07:59 +00:00
christos
70a262c03c Coverity CID 785: Prevent NULL pointer dereference if an appropriate group
is not found.
2006-04-28 19:49:13 +00:00
agc
62b10a5c9c Rather than hardcoding 8 LUNs per disk, use the number for the disc. 2006-04-26 20:31:43 +00:00
agc
84fba20a22 Use the correct opcode for the WRITE6 SCSI command 2006-04-26 20:29:56 +00:00
pavel
f705cb5488 We do not support pfsync, so:
- remove xrefs to pfsync(4)
- remove the no-sync keyword from pf.conf(5)
- add a note to pf(4).

Approved by Peter Postma.
2006-04-26 18:14:19 +00:00
pavel
e3b35bceeb The "group" keyword is not supported in NetBSD, so:
- add a CAVEATS section to pf(4) and note it
- in the description in pf.conf(5) say it is unsupported
- remove it from the grammar in pf.conf(5).

Approved by Peter Postma.
2006-04-26 17:55:33 +00:00
tron
27048c613e Add missing "const" keywords to match declarations in "pcap.h". 2006-04-26 09:24:33 +00:00
agc
000a68021a + Some minor formatting cleanup in the header files.
+ Properly pad the names with spaces (with thanks to Bill Studenmund)
+ Use the official T10 vendor name, "NetBSD".
+ Minor cleanup in the INQUIRY command
+ Rather than just punting on the REPORT LUNs SCSI command, emulate it
properly.  This change makes the target work with the Solaris initiator:

	AVAILABLE DISK SELECTIONS:
	       0. c1d0 <DEFAULT cyl 29728 alt 2 hd 64 sec 63>
		  /pci@0,0/pci-ide@1f,1/ide@0/cmdk@0,0
	       1. c2t5d0 <DEFAULT cyl 97 alt 2 hd 64 sec 32>
		  /iscsi/disk@0000iqn.1994-04.org.netbsd.iscsi-target%3Atarget00001,0
	Specify disk (enter its number): 1
2006-04-24 21:59:03 +00:00
elad
7cc919d464 fix typo. pr 33344. forwarded to paulus at samba dot org. 2006-04-23 19:01:08 +00:00
pavel
1cca0f0250 correct a typo: configruation -> configuration 2006-04-20 08:37:33 +00:00
darrenr
0df9b5fe68 ipf -Z returns junk and/or can cause a panic (seen on solaris.) 2006-04-18 12:40:49 +00:00
agc
339a11eb23 Bump version to 20060417 for the Mac OS X build fixes (thanks, Jason) 2006-04-18 06:52:59 +00:00
thorpej
e82413c3cf disk_read() / disk_write(): Make the temporary pointer a uint8_t *, rather
than a char *.  Eliminates a GCC4 warning.
2006-04-17 16:58:31 +00:00
thorpej
0c7787e9ae Let MD5Update() take a void *, rather than a uint8_t *. Gets rid of a
GCC 4 warning.
2006-04-17 16:49:16 +00:00
thorpej
01de58d459 Test HAVE_STDINT_H and bring in <stdint.h> if defined. 2006-04-17 16:45:02 +00:00
thorpej
57de6c70c3 Pull in config.h to get the definition of HAVE_STDINT_H 2006-04-17 16:44:42 +00:00
thorpej
7dd6393f48 Check for <libkern/OSByteOrder.h>. If it exists, use it to get the
OSSwapBigToHostInt64() definition for HTOBE64().  This now builds on
Mac OS X 10.4.6.
2006-04-17 16:30:00 +00:00
agc
f27a3c2c6b Commit regenerated config.h so that the correct version strings are picked
up for NetBSD.
2006-04-16 17:19:50 +00:00
agc
7a2241d682 Regenerate with new version number (20060416) 2006-04-15 23:45:30 +00:00
agc
4819a3749d Fix two other bugs which would manifest themselves on architectures which
aren't quite as forgiving as i386 - when using a 16 bit value, use 16 bit
alignment6, not 32 bit. Makes the NetBSD iSCSI target function perfectly
with the Microsoft initiator when run on Solaris 9 on Sparc.
2006-04-15 23:44:08 +00:00
agc
147705130b Bump version number to 20060415 for the bug-fix on big-endian Solaris
platforms.
2006-04-15 08:48:42 +00:00
agc
975cee31c1 Fix a bug found when running the NetBSD iSCSI target on big-endian (i.e.
Sparc) Solaris hosts - check that the stored username is not NULL before
freeing it.

Some minor formatting cleanup.
2006-04-15 08:46:23 +00:00
rpaulo
f2fdc155a3 stdlib.h and stdio.h should be in crypto.c not common.h 2006-04-13 19:07:08 +00:00
rpaulo
3bffa8df53 Include opensslv.h. 2006-04-12 15:40:03 +00:00
rpaulo
a20cc430b3 Include stdio.h and stdlib.h. 2006-04-12 15:39:39 +00:00
rpaulo
21617491ff information about upgrades 2006-04-12 15:22:56 +00:00
rpaulo
d70157382a Import of hostapd 0.4.8 2006-04-12 15:19:32 +00:00
rpaulo
0865712a46 resolve conflicts 2006-04-12 15:15:34 +00:00
rpaulo
6951c2edba Import of WPA supplicant 0.4.8 2006-04-12 15:07:34 +00:00
rpaulo
38619605fc Add new files from 0.4.8 that we won't need. 2006-04-10 20:43:00 +00:00
hubertf
f5ffa47293 Add missing .TP
Patch sent to tech-net@ by Patrick Welche <prlw1@newn.cam.ac.uk>
2006-04-05 18:07:30 +00:00
christos
825f80c59c Fix use after free. 2006-04-05 14:59:29 +00:00
martti
10531caa29 Removed file. 2006-04-04 16:18:56 +00:00
martti
9ea58d54bc Upgraded IPFilter to 4.1.13 2006-04-04 16:17:18 +00:00
martti
983a2072ce Import IPFilter 4.1.13 2006-04-04 16:08:18 +00:00
tls
1189bd8566 Make this locking compatible with that of the new tip/cu: we still try
the old-style UUCP locks (this is harmless, since pppd must run as root,
but should perhaps be removed later) but now also try to flock the device
node, and error out if it fails.
2006-04-03 16:16:00 +00:00
agc
9be1dc8d96 Use the correct type for the length argument to lba2cdb. 2006-04-02 10:46:47 +00:00
agc
8b20725dfb Fix a (repeated) obvious bug in the tracing functions.
Modify the return values of some boolean functions to be 1 for success, 0
for failure, rather than 0 and -1 respectively.
2006-04-02 09:36:57 +00:00
christos
8de5cf0e33 Coverity CID 2639: Fix obvious bug in loop handling. Using and freeing the
wrong pointer.
2006-04-02 01:10:39 +00:00
christos
2e0077c305 Add more coverity assertions. If this does not work, I will have to follow
a different tactic.
2006-04-02 00:53:56 +00:00
agc
cf0dd67053 Provide a bit more information in the error and warning routines - needed
since variadic macros were removed.
2006-03-31 23:22:24 +00:00
christos
46940789af Bye bye cdk. Moved via repository copy to othersrc/dist/cdk 2006-03-31 17:40:18 +00:00
christos
995a3df3f0 PR/33174: Wolfgang Stukenbrock: dhcpd fails to deliver hostnames for dynamic
ranges because it is using the wrong universe in the host lookup.
2006-03-31 17:28:50 +00:00
christos
1d00887f5d Insert coverity annotations [experimental; I don't know if those work
at the variable declaration level, but we'll see]
2006-03-29 16:40:50 +00:00
christos
f252e17155 Coverity CID 2486: Fix uninitialized variable 2006-03-29 16:09:53 +00:00
christos
85e2f53c41 Coverity CID 2786: Fix memory leak. 2006-03-29 15:44:19 +00:00
kardel
610b4c0dee dead code: removed (Coverity NetBSD CID 611) 2006-03-29 07:30:30 +00:00
kardel
d6c06e8308 fix as discussed in NTP Bug 584, Coverity NetBSD CID 1510 2006-03-29 07:19:34 +00:00
agc
2171876d1d More portability fixes, mainly for Solaris 9. 2006-03-28 20:03:30 +00:00
agc
f02decf866 Add changes to make the NetBSD iSCSI target compile and run on Solaris 9
Ultrasparc.
2006-03-27 22:26:28 +00:00
tron
7a28db2210 Fix build problem caused by last commit. 2006-03-27 10:02:37 +00:00
agc
6e1f35f92e minor cleanup in preparation for porting the NetBSD iSCSI target to Solaris 9. 2006-03-26 23:34:06 +00:00
christos
d20b033359 Coverity CID 1362: Allocate one more element to appease coverity. 2006-03-26 22:08:59 +00:00
christos
f3acb4a69b Coverity CID 1757: Don't leak memory 2006-03-26 22:04:14 +00:00
christos
4820f3f28c Coverity CID 1758: Unconfuse coverity about memory leak. 2006-03-26 22:02:59 +00:00
christos
714883262b Coverity CID 2038 2006-03-26 22:00:23 +00:00
christos
b1987e98f0 Coverity CID 2039: Plug memory leak. 2006-03-26 21:57:14 +00:00
christos
2b5f8cbcc0 Coverity CID 2042: Plug memory leak 2006-03-26 21:53:55 +00:00
christos
59ffb64e52 Coverity CID 2043: Don't leak memory 2006-03-26 21:49:01 +00:00
christos
d06f1825d5 Coverity CID 2044: Don't leak memory. 2006-03-26 21:46:25 +00:00
christos
e4dcd1072c Coverity CID 2399: Move strcpy lower, where it is actually going to be
used, inside the test of directory != NULL.
2006-03-26 21:44:05 +00:00
christos
34525befc6 Coverity CID 972: Someone confused && and || again. 2006-03-26 21:38:43 +00:00
he
ce943c094b Fix previous correctly. The "quiet" variable was not local.
Instead, the problem was declarations which followed a non-declaration
statement, which gcc 2.95 doesn't like, so reshuffle the order.
2006-03-25 21:56:29 +00:00
peter
a7819c4f5c Coverity CID 2783: Fix dereference of a freed pointer. 2006-03-25 16:06:04 +00:00
rpaulo
c43f7d959b PR 13604: detect and print correct information for 4.4BSD/NetBSD NFS
filehandles.
The heuristic may or may not be wrong, but no one replied in the
tcpdump-workers mailing list.
Extraction of the fsid information contributed by Chuck Silvers.

Discussed with Chuck Silvers.
2006-03-25 11:43:53 +00:00
he
9fb6f0e876 Don't default the type of a local variable. Fixes build for vax. 2006-03-23 19:25:09 +00:00
agc
e1d9f9cea5 First stab at implementing INQUIRY for Vital Product Data, aka Page 83
information in the Solaris initiator, with information taken from
SPC3, T10/1416-D Revision 23, from www.t10.org.

This is untested, work-in-progress.
2006-03-23 00:01:48 +00:00
christos
8d95e8aad0 Coverity CID 991: Remove useless test. 2006-03-22 04:34:49 +00:00
christos
af542fc05c Coverity CID 563: Kill SUNOS3 case; it is dead code. 2006-03-22 04:30:28 +00:00
christos
ded5be2fff Coverity CID 2746: Remove useless test. 2006-03-22 04:11:15 +00:00
christos
1174f5b4bb Coverity CID 2060: Fix memory leak. 2006-03-22 02:29:42 +00:00
agc
86caa230d8 Actually do something with the SYNC_CACHE command - use fsync_range(2) if
it's available, falling back to fsync(2) if it's not. Add the necessary
glue to the autoconf scripts.
2006-03-21 22:56:55 +00:00
agc
cbf5d4f8f5 Abstract out some common code, and place it in the utilities source.
Get rid of some #ifdef __KERNEL__ abstractions - they're not needed.
2006-03-21 21:03:14 +00:00
christos
b2f6added5 Coverity CID 577: remove dead code; minburst can never be 0 at this point. 2006-03-21 20:49:54 +00:00
christos
e46022bb52 Coverity CID 1514: Don't access static array beyond the end of it.
In this case PFTM_MAX == 20 and sizeof(pf_timeouts) / sizeof(pf_timeouts[0])
== 21, using a loop with the size of the array and checking for reaching the
end of the loop via j == PFTM_MAX does not work. Change the loop to use
PFTM_MAX as the upper bound and add an assertion in the code to make sure
that pf_timeouts is large enough. Finally remove last NULL element of the
array so that the array has 20 elements again.
2006-03-21 20:47:27 +00:00
christos
1a21d9be9f Coverity CID 2057: Don't forget to free tcpopts when you are done. 2006-03-21 20:31:56 +00:00
christos
eca1f0e01b Coverity CID 2491: Fix uninitialized reference. 2006-03-21 20:27:59 +00:00
christos
a674b513c2 Coverity CID 2738: When a symbol with a NULL name is passed, convert it to
the empty symbol.
2006-03-21 16:59:09 +00:00
kardel
a1cdcab3c8 buffer overrun: backport fix from NTP project (Coverity NetBSD Scan 8: CID 1509) 2006-03-21 11:12:13 +00:00
kardel
15dc7197ee null deref: fix another case of incomplete list handling (Coverity NetBSD Scan 8: CID 986) 2006-03-21 10:28:25 +00:00
agc
a055fd96f7 Incorporate changes from F. Senault, modified by myself to use
autoconf glue, to make the NetBSD iSCSI target build and run on
FreeBSD.
2006-03-20 20:45:07 +00:00
agc
2010c5954a Clean up, mostly to autoconf glue, to check whether syslog(3) exists or not. 2006-03-20 20:25:42 +00:00
christos
6dccf87632 Avoid overflowing static array which c == HAT. 2006-03-19 17:41:55 +00:00
kardel
dbefff2ee4 error handling: check success of open(2) - bail out early (Coverity CID 1282 NetBSD Scan 5) 2006-03-19 07:20:30 +00:00
kardel
24781071d1 null deref: complete linked list handling beginng condition (Coverity CID 986) 2006-03-19 07:02:47 +00:00