Commit Graph

27 Commits

Author SHA1 Message Date
christos
a58881f52e resolve conflicts 2006-02-05 16:28:55 +00:00
christos
1fa8cb34f1 revert dplog changes. 2005-09-21 16:28:03 +00:00
rpaulo
c37aa2f852 Move the prototype for dplog() outside of the #ifdef DEBUG and avoid a
warning.
2005-09-20 18:07:04 +00:00
rpaulo
32f8c84662 Merge am-utils 6.1.2.1. 2005-09-20 17:57:44 +00:00
rpaulo
80fbfa7fec Import of am-utils 6.1.2.1. 2005-09-20 17:12:54 +00:00
christos
70a4c9e35e Resolve conflicts. 2005-04-23 18:38:17 +00:00
christos
b689db021c from ftp.am-utils.org 2005-04-23 18:07:47 +00:00
jmc
496146dda9 Work around the fact opaque_t gets defined by sys/properties.h and could be
pulled in via MD includes from sys/param.h.
2004-11-28 11:15:26 +00:00
christos
ccc24aa67e fix merge botches. 2004-11-27 01:39:50 +00:00
christos
763bdaa346 Resolve conflicts. 2004-11-27 01:24:35 +00:00
christos
f8d5cae651 from 20040916 from ftp.am-utils.org 2004-11-27 01:00:29 +00:00
markd
0179239c99 xlatecookie option wasn't working as MNTTAB_OPT_XLATECOOKIE wasn't defined.
patch will be in am-utils 6.1

OK'd by christos
2003-07-29 12:11:29 +00:00
itojun
1b6fd89dfb use bounded string ops as much as possible. 2003-07-15 09:01:15 +00:00
christos
1a6788bb65 resolve conflicts. 2003-03-09 01:38:38 +00:00
christos
e1af53e09a Import am-utils 6.1b2 2003-03-09 01:12:05 +00:00
christos
af6faffab0 add full prototypes 2002-11-29 23:14:04 +00:00
christos
14b02a1cfc resolve conflicts. 2002-11-29 23:06:22 +00:00
christos
866a560342 import latest am-utils. 2002-11-29 22:57:11 +00:00
itojun
2cc8b1799d detect endianness correctly by using BYTE_ORDER. 2002-05-30 14:48:44 +00:00
veego
fc85452e83 Resolve conflicts from the import of am-utils 6.0.6. 2001-05-13 18:06:57 +00:00
veego
de9d6f0e6a 2nd import of am-utils 6.0.6.
This time after running the amd2netbsd script.
2001-05-13 17:49:57 +00:00
veego
a8af3357f8 Import am-utils 6.0.6 2001-05-13 17:32:48 +00:00
wiz
fb6c42da67 Re-integrate most changes done to amd in its old location (mostly
FORMAT_AUDIT related, and nits). (Thanks for the reminder, Jason!)
2000-11-20 03:19:33 +00:00
wiz
0d632f7ea0 Merge changes to previous version and some NetBSD tag differences. 2000-11-20 00:02:56 +00:00
wiz
8a09ffd10e Import of am-utils-6.0.4 source for reachover build.
Changes: quoted RCS Ids in all files, added NetBSD's own in most,
and removed some easily regenerated files in doc/.
(amd2netbsd script will follow soon.)
2000-11-19 23:42:08 +00:00
dogcow
17fd16762b pull up christos's amd patches that didn't make it into 6.0.3
(derived from diff'ing am-utils 6.0.1s10 and basesrc/usr.sbin/amd)
2000-06-16 02:10:12 +00:00
dogcow
fda6698809 Import of am-utils-6.0.3 virgin source, with the following changes:
"$Id: blah$" => "Id: blah" (as well as for $Header:$) for all files
 "$NetBSD: $" added to the top of all .c and .h files
2000-06-07 00:52:18 +00:00