6534052 Many source files use SCCS %G% keyword as copyright year

Contributed by Richard Lowe <richlowe@richlowe.net>

86 files changed, 217 insertions, 240 deletions

diff --git a/usr/src/cmd/agents/Makefile.vars b/usr/src/cmd/agents/Makefile.vars
index a99e513c7b..9cefc9dd7f 100644
--- a/usr/src/cmd/agents/Makefile.vars
+++ b/usr/src/cmd/agents/Makefile.vars
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #ident	"%Z%%M%	%I%	%E% SMI"
 
 BIN		= bin$(TARGET_ARCH)
diff --git a/usr/src/cmd/agents/snmp/parser/parse.c b/usr/src/cmd/agents/snmp/parser/parse.c
index a04cca320a..9a53024ef9 100644
--- a/usr/src/cmd/agents/snmp/parser/parse.c
+++ b/usr/src/cmd/agents/snmp/parser/parse.c
@@ -1,4 +1,6 @@
-/* Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+/*
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
diff --git a/usr/src/cmd/ldap/common/dtest.c b/usr/src/cmd/ldap/common/dtest.c
index 1c0d5cf85a..47fe932c82 100644
--- a/usr/src/cmd/ldap/common/dtest.c
+++ b/usr/src/cmd/ldap/common/dtest.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/cmd/ldap/common/etest.c b/usr/src/cmd/ldap/common/etest.c
index d05f8821d8..bd48878d1d 100644
--- a/usr/src/cmd/ldap/common/etest.c
+++ b/usr/src/cmd/ldap/common/etest.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/cmd/ldap/common/idtest.c b/usr/src/cmd/ldap/common/idtest.c
index 62dac585da..b018a3d810 100644
--- a/usr/src/cmd/ldap/common/idtest.c
+++ b/usr/src/cmd/ldap/common/idtest.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/cmd/ldap/common/ldaptest.c b/usr/src/cmd/ldap/common/ldaptest.c
index 938e69a59f..66f18bc2ad 100644
--- a/usr/src/cmd/ldap/common/ldaptest.c
+++ b/usr/src/cmd/ldap/common/ldaptest.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/cmd/ldap/common/tmpltest.c b/usr/src/cmd/ldap/common/tmpltest.c
index a4376b6e7f..aa9c62ce21 100644
--- a/usr/src/cmd/ldap/common/tmpltest.c
+++ b/usr/src/cmd/ldap/common/tmpltest.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/ber/Version.c b/usr/src/lib/libldap4/ber/Version.c
index ef2e13b7b8..7a984d75eb 100644
--- a/usr/src/lib/libldap4/ber/Version.c
+++ b/usr/src/lib/libldap4/ber/Version.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/ber/bprint.c b/usr/src/lib/libldap4/ber/bprint.c
index 08edc423a1..05923b7ded 100644
--- a/usr/src/lib/libldap4/ber/bprint.c
+++ b/usr/src/lib/libldap4/ber/bprint.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/ber/i18n.c b/usr/src/lib/libldap4/ber/i18n.c
index 0f57fe06f6..04170c17ab 100644
--- a/usr/src/lib/libldap4/ber/i18n.c
+++ b/usr/src/lib/libldap4/ber/i18n.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/Version.c b/usr/src/lib/libldap4/common/Version.c
index e55944caec..c3fa7df517 100644
--- a/usr/src/lib/libldap4/common/Version.c
+++ b/usr/src/lib/libldap4/common/Version.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/abandon.c b/usr/src/lib/libldap4/common/abandon.c
index 63a1660dd7..71345186c7 100644
--- a/usr/src/lib/libldap4/common/abandon.c
+++ b/usr/src/lib/libldap4/common/abandon.c
@@ -1,9 +1,8 @@
 
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
- *
-*/
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
diff --git a/usr/src/lib/libldap4/common/add.c b/usr/src/lib/libldap4/common/add.c
index 5cb1c67c51..ce3e357b6f 100644
--- a/usr/src/lib/libldap4/common/add.c
+++ b/usr/src/lib/libldap4/common/add.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
diff --git a/usr/src/lib/libldap4/common/addentry.c b/usr/src/lib/libldap4/common/addentry.c
index 1c946c7971..f1f0582560 100644
--- a/usr/src/lib/libldap4/common/addentry.c
+++ b/usr/src/lib/libldap4/common/addentry.c
@@ -1,9 +1,7 @@
 
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
diff --git a/usr/src/lib/libldap4/common/bind.c b/usr/src/lib/libldap4/common/bind.c
index c51cddeb1c..7c5d783f2c 100644
--- a/usr/src/lib/libldap4/common/bind.c
+++ b/usr/src/lib/libldap4/common/bind.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/cache.c b/usr/src/lib/libldap4/common/cache.c
index 5fc2b33561..977e4c6d02 100644
--- a/usr/src/lib/libldap4/common/cache.c
+++ b/usr/src/lib/libldap4/common/cache.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
diff --git a/usr/src/lib/libldap4/common/charset.c b/usr/src/lib/libldap4/common/charset.c
index d2866746af..e1c9b9d9be 100644
--- a/usr/src/lib/libldap4/common/charset.c
+++ b/usr/src/lib/libldap4/common/charset.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/cldap.c b/usr/src/lib/libldap4/common/cldap.c
index 4dc4402111..809fa4cce7 100644
--- a/usr/src/lib/libldap4/common/cldap.c
+++ b/usr/src/lib/libldap4/common/cldap.c
@@ -1,8 +1,6 @@
- /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+/*
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/compare.c b/usr/src/lib/libldap4/common/compare.c
index 49a05a5feb..8202580a7b 100644
--- a/usr/src/lib/libldap4/common/compare.c
+++ b/usr/src/lib/libldap4/common/compare.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/controls.c b/usr/src/lib/libldap4/common/controls.c
index bd95409eeb..fb61e5e56c 100644
--- a/usr/src/lib/libldap4/common/controls.c
+++ b/usr/src/lib/libldap4/common/controls.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/delete.c b/usr/src/lib/libldap4/common/delete.c
index 107151d0a3..287abd8ac8 100644
--- a/usr/src/lib/libldap4/common/delete.c
+++ b/usr/src/lib/libldap4/common/delete.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/disptmpl.c b/usr/src/lib/libldap4/common/disptmpl.c
index ce5cb6e3b4..ea2413c990 100644
--- a/usr/src/lib/libldap4/common/disptmpl.c
+++ b/usr/src/lib/libldap4/common/disptmpl.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/dsparse.c b/usr/src/lib/libldap4/common/dsparse.c
index ab0aeefb36..c14af4e3ea 100644
--- a/usr/src/lib/libldap4/common/dsparse.c
+++ b/usr/src/lib/libldap4/common/dsparse.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/error.c b/usr/src/lib/libldap4/common/error.c
index 804b9b1637..bbf01622f0 100644
--- a/usr/src/lib/libldap4/common/error.c
+++ b/usr/src/lib/libldap4/common/error.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/extensions.c b/usr/src/lib/libldap4/common/extensions.c
index c04bed0e26..247ad2baa5 100644
--- a/usr/src/lib/libldap4/common/extensions.c
+++ b/usr/src/lib/libldap4/common/extensions.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/extop.c b/usr/src/lib/libldap4/common/extop.c
index 9cc61d0705..a299b1dd61 100644
--- a/usr/src/lib/libldap4/common/extop.c
+++ b/usr/src/lib/libldap4/common/extop.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/free.c b/usr/src/lib/libldap4/common/free.c
index e85db6b3e9..a9d4bd0675 100644
--- a/usr/src/lib/libldap4/common/free.c
+++ b/usr/src/lib/libldap4/common/free.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/friendly.c b/usr/src/lib/libldap4/common/friendly.c
index 70b76902c8..1142722970 100644
--- a/usr/src/lib/libldap4/common/friendly.c
+++ b/usr/src/lib/libldap4/common/friendly.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/getattr.c b/usr/src/lib/libldap4/common/getattr.c
index dee90abda1..26f7b064f2 100644
--- a/usr/src/lib/libldap4/common/getattr.c
+++ b/usr/src/lib/libldap4/common/getattr.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/getdn.c b/usr/src/lib/libldap4/common/getdn.c
index 0c64236a6a..d0cb89a213 100644
--- a/usr/src/lib/libldap4/common/getdn.c
+++ b/usr/src/lib/libldap4/common/getdn.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/getentry.c b/usr/src/lib/libldap4/common/getentry.c
index 078e8aaa80..346f23e9a8 100644
--- a/usr/src/lib/libldap4/common/getentry.c
+++ b/usr/src/lib/libldap4/common/getentry.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/getmsg.c b/usr/src/lib/libldap4/common/getmsg.c
index 01c524688e..abd8da6e47 100644
--- a/usr/src/lib/libldap4/common/getmsg.c
+++ b/usr/src/lib/libldap4/common/getmsg.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc.  
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/getref.c b/usr/src/lib/libldap4/common/getref.c
index 25600cda24..ded453a038 100644
--- a/usr/src/lib/libldap4/common/getref.c
+++ b/usr/src/lib/libldap4/common/getref.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/getvalues.c b/usr/src/lib/libldap4/common/getvalues.c
index cd7da43926..b516af78fc 100644
--- a/usr/src/lib/libldap4/common/getvalues.c
+++ b/usr/src/lib/libldap4/common/getvalues.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/kbind.c b/usr/src/lib/libldap4/common/kbind.c
index 167eab8d58..5cc6928eca 100644
--- a/usr/src/lib/libldap4/common/kbind.c
+++ b/usr/src/lib/libldap4/common/kbind.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/modify.c b/usr/src/lib/libldap4/common/modify.c
index 44fa519efb..4fb1d6c775 100644
--- a/usr/src/lib/libldap4/common/modify.c
+++ b/usr/src/lib/libldap4/common/modify.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/modrdn.c b/usr/src/lib/libldap4/common/modrdn.c
index b1ec5a93ac..3a7e1593f1 100644
--- a/usr/src/lib/libldap4/common/modrdn.c
+++ b/usr/src/lib/libldap4/common/modrdn.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/referral.c b/usr/src/lib/libldap4/common/referral.c
index 80b2444526..173ee2cfe6 100644
--- a/usr/src/lib/libldap4/common/referral.c
+++ b/usr/src/lib/libldap4/common/referral.c
@@ -1,6 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/regex.c b/usr/src/lib/libldap4/common/regex.c
index a8e247bf40..1e2a00bbb9 100644
--- a/usr/src/lib/libldap4/common/regex.c
+++ b/usr/src/lib/libldap4/common/regex.c
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/rename.c b/usr/src/lib/libldap4/common/rename.c
index b7f530adb5..3a754df30d 100644
--- a/usr/src/lib/libldap4/common/rename.c
+++ b/usr/src/lib/libldap4/common/rename.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/saslbind.c b/usr/src/lib/libldap4/common/saslbind.c
index eede4b1599..ba8b5b4c3d 100644
--- a/usr/src/lib/libldap4/common/saslbind.c
+++ b/usr/src/lib/libldap4/common/saslbind.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/sbind.c b/usr/src/lib/libldap4/common/sbind.c
index 4ae8b354cc..086459b142 100644
--- a/usr/src/lib/libldap4/common/sbind.c
+++ b/usr/src/lib/libldap4/common/sbind.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/sort.c b/usr/src/lib/libldap4/common/sort.c
index d26afb5200..881fe01510 100644
--- a/usr/src/lib/libldap4/common/sort.c
+++ b/usr/src/lib/libldap4/common/sort.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/sortctrl.c b/usr/src/lib/libldap4/common/sortctrl.c
index 22dd53e527..d21a01e33f 100644
--- a/usr/src/lib/libldap4/common/sortctrl.c
+++ b/usr/src/lib/libldap4/common/sortctrl.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc.
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:
diff --git a/usr/src/lib/libldap4/common/srchpref.c b/usr/src/lib/libldap4/common/srchpref.c
index 4cdd9e491a..c8a5f3d205 100644
--- a/usr/src/lib/libldap4/common/srchpref.c
+++ b/usr/src/lib/libldap4/common/srchpref.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/ufn.c b/usr/src/lib/libldap4/common/ufn.c
index b2548d2482..37c9ed3138 100644
--- a/usr/src/lib/libldap4/common/ufn.c
+++ b/usr/src/lib/libldap4/common/ufn.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/unbind.c b/usr/src/lib/libldap4/common/unbind.c
index fc96ab2e37..7c1fe8a333 100644
--- a/usr/src/lib/libldap4/common/unbind.c
+++ b/usr/src/lib/libldap4/common/unbind.c
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/common/utils.c b/usr/src/lib/libldap4/common/utils.c
index e3652ac275..922e648ab7 100644
--- a/usr/src/lib/libldap4/common/utils.c
+++ b/usr/src/lib/libldap4/common/utils.c
@@ -1,6 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/common/version.c b/usr/src/lib/libldap4/common/version.c
index bfc8680612..de22e03f02 100644
--- a/usr/src/lib/libldap4/common/version.c
+++ b/usr/src/lib/libldap4/common/version.c
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/common/vlistctrl.c b/usr/src/lib/libldap4/common/vlistctrl.c
index 53335f4490..779df251d0 100644
--- a/usr/src/lib/libldap4/common/vlistctrl.c
+++ b/usr/src/lib/libldap4/common/vlistctrl.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc.
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:
diff --git a/usr/src/lib/libldap4/include/avl.h b/usr/src/lib/libldap4/include/avl.h
index c0742f5d9d..b7487c5d61 100644
--- a/usr/src/lib/libldap4/include/avl.h
+++ b/usr/src/lib/libldap4/include/avl.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Portions Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/cdefs.h b/usr/src/lib/libldap4/include/cdefs.h
index 2805136d64..34b6b955d8 100644
--- a/usr/src/lib/libldap4/include/cdefs.h
+++ b/usr/src/lib/libldap4/include/cdefs.h
@@ -1,8 +1,6 @@
 /*
- *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
- *
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/include/ch_malloc.h b/usr/src/lib/libldap4/include/ch_malloc.h
index 650d4ba856..3f955511b5 100644
--- a/usr/src/lib/libldap4/include/ch_malloc.h
+++ b/usr/src/lib/libldap4/include/ch_malloc.h
@@ -1,7 +1,6 @@
 /*
- *
- * Copyright %G% Sun Microsystems, Inc. All Rights Reserved
- *
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/include/charray.h b/usr/src/lib/libldap4/include/charray.h
index b28a91a7f4..4ec4088719 100644
--- a/usr/src/lib/libldap4/include/charray.h
+++ b/usr/src/lib/libldap4/include/charray.h
@@ -1,7 +1,6 @@
 /*
- *
- * Copyright %G% Sun Microsystems, Inc. All Rights Reserved
- *
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/include/client_door.h b/usr/src/lib/libldap4/include/client_door.h
index 2aefe3d7f0..e1ac925fa1 100644
--- a/usr/src/lib/libldap4/include/client_door.h
+++ b/usr/src/lib/libldap4/include/client_door.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/entry.h b/usr/src/lib/libldap4/include/entry.h
index 460b8e9e30..81320b9bd1 100644
--- a/usr/src/lib/libldap4/include/entry.h
+++ b/usr/src/lib/libldap4/include/entry.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/fe.h b/usr/src/lib/libldap4/include/fe.h
index 4e2772ec14..1842a77352 100644
--- a/usr/src/lib/libldap4/include/fe.h
+++ b/usr/src/lib/libldap4/include/fe.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/hsearch.h b/usr/src/lib/libldap4/include/hsearch.h
index 4de0fcfb75..32721aedca 100644
--- a/usr/src/lib/libldap4/include/hsearch.h
+++ b/usr/src/lib/libldap4/include/hsearch.h
@@ -1,8 +1,6 @@
 /*
- *
- * Copyright Sun Microsystems, Inc.  
- * All Rights Reserved
- *
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 
diff --git a/usr/src/lib/libldap4/include/ldapconfig.h b/usr/src/lib/libldap4/include/ldapconfig.h
index 9179d3744b..c197c3c33c 100644
--- a/usr/src/lib/libldap4/include/ldapconfig.h
+++ b/usr/src/lib/libldap4/include/ldapconfig.h
@@ -1,8 +1,7 @@
-
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  * File chamged to fit with Sun Standards
  *
diff --git a/usr/src/lib/libldap4/include/ldif.h b/usr/src/lib/libldap4/include/ldif.h
index 4b16486440..4eddf63095 100644
--- a/usr/src/lib/libldap4/include/ldif.h
+++ b/usr/src/lib/libldap4/include/ldif.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/log.h b/usr/src/lib/libldap4/include/log.h
index 6936fd99f3..038f0564e3 100644
--- a/usr/src/lib/libldap4/include/log.h
+++ b/usr/src/lib/libldap4/include/log.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/include/lthread.h b/usr/src/lib/libldap4/include/lthread.h
index 851e6f1c83..cbafb7fec8 100644
--- a/usr/src/lib/libldap4/include/lthread.h
+++ b/usr/src/lib/libldap4/include/lthread.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/portable.h b/usr/src/lib/libldap4/include/portable.h
index 7f11d7892a..5405fa8765 100644
--- a/usr/src/lib/libldap4/include/portable.h
+++ b/usr/src/lib/libldap4/include/portable.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/regex.h b/usr/src/lib/libldap4/include/regex.h
index ff6ff2b9ce..175a851878 100644
--- a/usr/src/lib/libldap4/include/regex.h
+++ b/usr/src/lib/libldap4/include/regex.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/sec.h b/usr/src/lib/libldap4/include/sec.h
index cabf2bfff5..11d94760cc 100644
--- a/usr/src/lib/libldap4/include/sec.h
+++ b/usr/src/lib/libldap4/include/sec.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/lib/libldap4/include/ssl.h b/usr/src/lib/libldap4/include/ssl.h
index aa4edcaf2d..bd0c860a3a 100644
--- a/usr/src/lib/libldap4/include/ssl.h
+++ b/usr/src/lib/libldap4/include/ssl.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * This is a dummy header file for SSL
diff --git a/usr/src/lib/libldap4/include/sysexits-compat.h b/usr/src/lib/libldap4/include/sysexits-compat.h
index 18b11bdca1..0e5e37e3d7 100644
--- a/usr/src/lib/libldap4/include/sysexits-compat.h
+++ b/usr/src/lib/libldap4/include/sysexits-compat.h
@@ -1,7 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/include/thq.h b/usr/src/lib/libldap4/include/thq.h
index 31822c417c..d503a8a3c8 100644
--- a/usr/src/lib/libldap4/include/thq.h
+++ b/usr/src/lib/libldap4/include/thq.h
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 
diff --git a/usr/src/lib/libldap4/misc/ldapfilter.conf b/usr/src/lib/libldap4/misc/ldapfilter.conf
index 5daa86d232..b4ff650125 100644
--- a/usr/src/lib/libldap4/misc/ldapfilter.conf
+++ b/usr/src/lib/libldap4/misc/ldapfilter.conf
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/misc/ldapfriendly b/usr/src/lib/libldap4/misc/ldapfriendly
index 40e9ed5481..ab99342985 100644
--- a/usr/src/lib/libldap4/misc/ldapfriendly
+++ b/usr/src/lib/libldap4/misc/ldapfriendly
@@ -1,6 +1,7 @@
 #
 #
-# Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+# Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/misc/ldapsearchprefs.conf b/usr/src/lib/libldap4/misc/ldapsearchprefs.conf
index 2aca07183e..47df5b422e 100644
--- a/usr/src/lib/libldap4/misc/ldapsearchprefs.conf
+++ b/usr/src/lib/libldap4/misc/ldapsearchprefs.conf
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/misc/ldaptemplates.conf b/usr/src/lib/libldap4/misc/ldaptemplates.conf
index 55400b96ff..6a88c70ad6 100644
--- a/usr/src/lib/libldap4/misc/ldaptemplates.conf
+++ b/usr/src/lib/libldap4/misc/ldaptemplates.conf
@@ -1,6 +1,7 @@
 /*
  *
- * Portions Copyright %G% Sun Microsystems, Inc. All Rights Reserved
+ * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
diff --git a/usr/src/lib/libldap4/sec/cram_md5.c b/usr/src/lib/libldap4/sec/cram_md5.c
index 4b92efbfc6..948e17c246 100644
--- a/usr/src/lib/libldap4/sec/cram_md5.c
+++ b/usr/src/lib/libldap4/sec/cram_md5.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc.
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:
diff --git a/usr/src/lib/libldap4/sec/secutil.c b/usr/src/lib/libldap4/sec/secutil.c
index 7d1658d0f9..5e2902a2b3 100644
--- a/usr/src/lib/libldap4/sec/secutil.c
+++ b/usr/src/lib/libldap4/sec/secutil.c
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright %G% Sun Microsystems, Inc. 
- * All Rights Reserved
+ * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  *
  *
  * Comments:   
diff --git a/usr/src/pkgdefs/SUNWmibii/Makefile b/usr/src/pkgdefs/SUNWmibii/Makefile
index 31c6c9033e..42d102e5a0 100644
--- a/usr/src/pkgdefs/SUNWmibii/Makefile
+++ b/usr/src/pkgdefs/SUNWmibii/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../Makefile.com
diff --git a/usr/src/pkgdefs/SUNWmibii/postinstall b/usr/src/pkgdefs/SUNWmibii/postinstall
index d05cbc47aa..5475236372 100644
--- a/usr/src/pkgdefs/SUNWmibii/postinstall
+++ b/usr/src/pkgdefs/SUNWmibii/postinstall
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
diff --git a/usr/src/pkgdefs/SUNWmibii/preinstall b/usr/src/pkgdefs/SUNWmibii/preinstall
index 19c86312d8..69f1d3819c 100644
--- a/usr/src/pkgdefs/SUNWmibii/preinstall
+++ b/usr/src/pkgdefs/SUNWmibii/preinstall
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 #	preinstall script for package: SUNWmibii
 #
diff --git a/usr/src/pkgdefs/SUNWmibii/preremove b/usr/src/pkgdefs/SUNWmibii/preremove
index 06dda53147..f4549fe4aa 100644
--- a/usr/src/pkgdefs/SUNWmibii/preremove
+++ b/usr/src/pkgdefs/SUNWmibii/preremove
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 #	preremove script for package: SUNWmibii
 #
diff --git a/usr/src/pkgdefs/SUNWmibii/prototype_i386 b/usr/src/pkgdefs/SUNWmibii/prototype_i386
index 918792ed48..3617af0d71 100644
--- a/usr/src/pkgdefs/SUNWmibii/prototype_i386
+++ b/usr/src/pkgdefs/SUNWmibii/prototype_i386
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
diff --git a/usr/src/pkgdefs/SUNWmibii/prototype_sparc b/usr/src/pkgdefs/SUNWmibii/prototype_sparc
index 42c3b086e0..6e1d364027 100644
--- a/usr/src/pkgdefs/SUNWmibii/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWmibii/prototype_sparc
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 1988 - %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
diff --git a/usr/src/pkgdefs/SUNWsacom/prototype_i386 b/usr/src/pkgdefs/SUNWsacom/prototype_i386
index 5725a91f54..fcc71ce602 100644
--- a/usr/src/pkgdefs/SUNWsacom/prototype_i386
+++ b/usr/src/pkgdefs/SUNWsacom/prototype_i386
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #
diff --git a/usr/src/pkgdefs/SUNWsacom/prototype_sparc b/usr/src/pkgdefs/SUNWsacom/prototype_sparc
index 0348c72454..782a875327 100644
--- a/usr/src/pkgdefs/SUNWsacom/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWsacom/prototype_sparc
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # pkgdefs/SUNWsacom/prototype_sparc
diff --git a/usr/src/pkgdefs/SUNWsacom/space b/usr/src/pkgdefs/SUNWsacom/space
index 0dac6936a5..db92707008 100644
--- a/usr/src/pkgdefs/SUNWsacom/space
+++ b/usr/src/pkgdefs/SUNWsacom/space
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,6 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 etc/snmp/conf/snmpd.conf 5 1
diff --git a/usr/src/pkgdefs/SUNWsasnm/Makefile b/usr/src/pkgdefs/SUNWsasnm/Makefile
index eec444c97b..0dc3322367 100644
--- a/usr/src/pkgdefs/SUNWsasnm/Makefile
+++ b/usr/src/pkgdefs/SUNWsasnm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../Makefile.com
diff --git a/usr/src/pkgdefs/SUNWsasnm/preinstall b/usr/src/pkgdefs/SUNWsasnm/preinstall
index 64a811c1db..f585ba1042 100644
--- a/usr/src/pkgdefs/SUNWsasnm/preinstall
+++ b/usr/src/pkgdefs/SUNWsasnm/preinstall
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 #	preinstall script for package: SUNWsasnm
diff --git a/usr/src/pkgdefs/SUNWsasnm/preremove b/usr/src/pkgdefs/SUNWsasnm/preremove
index 9242ca10ff..d21fd94e0e 100644
--- a/usr/src/pkgdefs/SUNWsasnm/preremove
+++ b/usr/src/pkgdefs/SUNWsasnm/preremove
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright %G% Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 #	preremove script for package: SUNWsasnm