Module Name:	src
Committed By:	lukem
Date:		Fri Jul 23 06:12:16 UTC 2004

Modified Files:
	src/etc: security

Log Message:
Merge /etc/mtree/special & /etc/mtree/special.local using "mtree -M".
This allows users to override mtree/special entries in mtree/special.local,
which is useful if you've replaced a directory with a symlink (for example).
This effectively makes $check_mtree_follow_symlinks=YES pointless, but
I'm retaining that for compatibility reasons.

Fix bug in generation of $MPBYUID (used "/^+/" instead of "/^\+/" as a regex),
which has existed for a long time but only failed with our awk; GNU awk seems
to have permitted this.  (This meant that the duplicate UID check was broken
when using our awk.)

Rename some temp files to more accurately reflect their purpose, to
aid debugging.


To generate a diff of this commit:
cvs rdiff -r1.90 -r1.91 src/etc/security

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.