PERFORCE change 106730 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=106730

Change 106730 by rwatson at rwatson_sesame on 2006/09/26 15:49:36

	Re-integ trustedbsd_priv regression tree, forcing merge of expanded
	$FreeBSD$ missed in last integ.

Affected files ...

.. //depot/projects/trustedbsd/priv/tools/regression/priv/Makefile#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/main.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/main.h#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_acct.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_adjtime.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_clock_settime.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_io.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_kenv_set.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_kenv_unset.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_proc_setlogin.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_proc_setrlimit.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sched_rtprio.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sched_setpriority.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_settimeofday.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sysctl_write.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_admin.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_chown.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_chroot.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_clearsugid.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_extattr_system.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhopen.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhstat.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhstatfs.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_generation.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_getfh.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_read_write.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_setgid.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_stickyfile.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_madv_protect.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_mlock.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_munlock.c#3 integrate
.. //depot/projects/trustedbsd/priv/tools/regression/priv/test_utimes.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/priv/tools/regression/priv/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/priv/Makefile,v 1.1 2006/09/13 09:05:39 rwatson Exp $
 #
 
 PROG=	main

==== //depot/projects/trustedbsd/priv/tools/regression/priv/main.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/main.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/main.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/main.h,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 #define	UID_ROOT	0

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_acct.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_acct.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_adjtime.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_adjtime.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_clock_settime.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_clock_settime.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_io.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_io.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_kenv_set.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_kenv_set.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_kenv_unset.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_kenv_unset.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_proc_setlogin.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_proc_setlogin.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_proc_setrlimit.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_proc_setrlimit.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sched_rtprio.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sched_rtprio.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sched_setpriority.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sched_setpriority.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_settimeofday.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_settimeofday.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_sysctl_write.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sysctl_write.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_admin.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_admin.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_chown.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chown.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_chroot.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chroot.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_clearsugid.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_clearsugid.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_extattr_system.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_extattr_system.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhopen.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhopen.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhstat.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhstat.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_fhstatfs.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhstatfs.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_generation.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_generation.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_getfh.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_getfh.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_read_write.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_read_write.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_setgid.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_setgid.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vfs_stickyfile.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_stickyfile.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_madv_protect.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_madv_protect.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_mlock.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_mlock.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/priv_vm_munlock.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_munlock.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/tools/regression/priv/test_utimes.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/test_utimes.c,v 1.1 2006/09/13 09:05:39 rwatson Exp $
  */
 
 /*