Commit Graph

10 Commits

Author SHA1 Message Date
David E. O'Brien
aa1670f3e4 Put stock 6.1.5 file into HEAD. 2007-12-05 16:57:05 +00:00
Martin Blapp
472c8565d6 Resolve conflicts for am-utils-6.0-10p1 (am-utils-6.0-20040513)
import:

- Fix typo in amd/nfs_prot_svc.c
- Manpage change in scripts/amd.conf.5
- Remove unneeded configure files
- Remove unneeded m4/macros
2004-07-06 13:16:49 +00:00
Martin Blapp
0974e17d43 Resolve conflicts. 2003-09-02 15:42:57 +00:00
David E. O'Brien
9b58188bdc sys_nerr should come from standard headers -- not from a coder's guess
of what is right.
2002-05-09 00:41:18 +00:00
David E. O'Brien
c0d59ba0ab We are returning to the stock (6.0.7) file now.
+ The rev 1.4 addition was taken from a snapshot previous to 6.0.7, so
  it is included in 6.0.7.
+ The vendor sources are now POSIX [me harder] compliant.
2001-09-02 18:22:46 +00:00
David E. O'Brien
ce802deb8d Fix conflicts. 1999-09-15 05:45:17 +00:00
David E. O'Brien
2500e9a905 Don't getopt -M option and don't process it unless ENABLE_AMQ_MOUNT is on.
Obtained from:	am-utils-6.0.1s11
1999-08-25 20:06:03 +00:00
David E. O'Brien
b8f96520e5 Fix conflicts. 1999-01-13 20:04:00 +00:00
David E. O'Brien
274bbe3187 * Check getopt()'s return with -1, not EOF
* protect a few potential buffer overflows

Obtained from:	NetBSD
1998-08-23 22:52:09 +00:00
David E. O'Brien
ab38884b94 Virgin import of AMD (am-utils) v6.0a16 1998-08-23 22:07:21 +00:00