PERFORCE change 79184 for review

Robert Watson rwatson at FreeBSD.org
Wed Jun 29 20:03:07 GMT 2005


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

Change 79184 by rwatson at rwatson_paprika on 2005/06/29 20:02:46

	Integrate OpenBSM copyright tweaks into TrustedBSD audit3 branch.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#2 (text+ko) ====

@@ -2,9 +2,12 @@
  * @APPLE_LICENSE_HEADER_START@
  *
  * Copyright (c) 1999-2004 Apple Computer, Inc.
- * Copyright (c) 2005 Robert N. M. Watson
+ * Copyright (c) 2005 SPARTA, Inc.
  * All Rights Reserved.
  *
+ * This code was developed in part by Robert N. M. Watson, Senior Principal
+ * Scientist, SPARTA, Inc.
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#3 (text+ko) ====

@@ -1,8 +1,11 @@
 /*
  * Copyright (c) 2004, Apple Computer, Inc.
- * Copyright (c) 2005 Robert N. M. Watson
+ * Copyright (c) 2005 SPARTA, Inc.
  * All rights reserved.
  *
+ * This code was developed in part by Robert N. M. Watson, Senior Principal
+ * Scientist, SPARTA, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#3 (text+ko) ====

@@ -1,8 +1,11 @@
 /*
  * Copyright (c) 2004, Apple Computer, Inc.
- * Copyright (c) 2005 Robert N. M. Watson
+ * Copyright (c) 2005 SPARTA, Inc.
  * All rights reserved.
  *
+ * This code was developed in part by Robert N. M. Watson, Senior Principal
+ * Scientist, SPARTA, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#3 (text+ko) ====

@@ -1,8 +1,11 @@
 /*
  * Copyright (c) 2004, Apple Computer, Inc.
- * Copyright (c) 2005 Robert N. M. Watson
+ * Copyright (c) 2005 SPARTA, Inc.
  * All rights reserved.
  *
+ * This code was developed in part by Robert N. M. Watson, Senior Principal
+ * Scientist, SPARTA, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list