More copyright changes.

12 files changed, 405 insertions, 337 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fdec2cbb1..61dc9f8f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* nis/rpcsvc/nis.h: Update copyright notice.
+	* nis/rpcsvc/nis.x: Likewise.
+	* nis/rpcsvc/nis_callback.h: Likewise.
+	* nis/rpcsvc/nis_callback.x: Likewise.
+	* nis/rpcsvc/nis_object.x: Likewise.
+	* nis/rpcsvc/nis_tags.h: Likewise.
+	* nis/rpcsvc/yp.h: Likewise.
+	* nis/rpcsvc/yp.x: Likewise.
+	* nis/rpcsvc/ypupd.h: Likewise.
+	* nis/yp_xdr.c: Likewise.
+	* nis/ypupdate_xdr.c: Likewise.
+
 	* sunrpc/pm_getport.c (__libc_rpc_getport): New function.  This is
 	mainly the body of pmap_getport.  Add parameters to specify timeouts.
 	(pmap_getport): Use __libc_rpc_getport.
diff --git a/nis/rpcsvc/nis.h b/nis/rpcsvc/nis.h
index 0495457239..5c5c7bb41b 100644
--- a/nis/rpcsvc/nis.h
+++ b/nis/rpcsvc/nis.h
@@ -1,31 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef _RPCSVC_NIS_H
@@ -42,7 +43,7 @@ __BEGIN_DECLS
  *
  *	This file is the main include file for NIS clients. It contains
  *	both the client library function defines and the various data
- * 	structures used by the NIS service. It includes the file nis_tags.h
+ *	structures used by the NIS service. It includes the file nis_tags.h
  *	which defines the tag values. This allows the tags to change without
  *	having to change the nis.x file.
  *
@@ -119,8 +120,8 @@ enum nstype {
 typedef enum nstype nstype;
 
 struct oar_mask {
-        uint32_t oa_rights;
-        zotypes oa_otype;
+	uint32_t oa_rights;
+	zotypes oa_otype;
 };
 typedef struct oar_mask oar_mask;
 
diff --git a/nis/rpcsvc/nis.x b/nis/rpcsvc/nis.x
index 54ddb05ecb..e318af29a6 100644
--- a/nis/rpcsvc/nis.x
+++ b/nis/rpcsvc/nis.x
@@ -1,31 +1,32 @@
 %/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+% *     * Redistributions of source code must retain the above copyright
+% *       notice, this list of conditions and the following disclaimer.
+% *     * Redistributions in binary form must reproduce the above
+% *       copyright notice, this list of conditions and the following
+% *       disclaimer in the documentation and/or other materials
+% *       provided with the distribution.
+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 % */
 
 #ifdef RPC_HDR
@@ -34,7 +35,7 @@
 % *
 % *	This file is the main include file for NIS clients. It contains
 % *	both the client library function defines and the various data
-% * 	structures used by the NIS service. It includes the file nis_tags.h
+% *	structures used by the NIS service. It includes the file nis_tags.h
 % *	which defines the tag values. This allows the tags to change without
 % *	having to change the nis.x file.
 % *
@@ -57,10 +58,10 @@
 
 /* Errors  that can be returned by the service */
 enum nis_error {
-	NIS_SUCCESS = 0,	/* A-ok, let's rock n roll 	*/
-	NIS_S_SUCCESS = 1,	/* Name found (maybe)	   	*/
-	NIS_NOTFOUND = 2,	/* Name definitely not found 	*/
-	NIS_S_NOTFOUND = 3,	/* Name maybe not found 	*/
+	NIS_SUCCESS = 0,	/* A-ok, let's rock n roll	*/
+	NIS_S_SUCCESS = 1,	/* Name found (maybe)		*/
+	NIS_NOTFOUND = 2,	/* Name definitely not found	*/
+	NIS_S_NOTFOUND = 3,	/* Name maybe not found		*/
 	NIS_CACHEEXPIRED = 4,	/* Name exists but cache out of date */
 	NIS_NAMEUNREACHABLE = 5, /* Can't get there from here */
 	NIS_UNKNOWNOBJ = 6,	/* Object type is bogus */
@@ -81,7 +82,7 @@ enum nis_error {
 	NIS_NOTUNIQUE = 21,	/* Value is not uniques (entry) */
 	NIS_IBMODERROR = 22,	/* Inf. Base. Modify error. */
 	NIS_NOSUCHTABLE = 23,	/* Name for table was wrong */
-	NIS_TYPEMISMATCH = 24, 	/* Entry and table type mismatch */
+	NIS_TYPEMISMATCH = 24,	/* Entry and table type mismatch */
 	NIS_LINKNAMEERROR = 25,	/* Link points to bogus name */
 	NIS_PARTIAL = 26,	/* Partial success, found table */
 	NIS_TOOMANYATTRS = 27,	/* Too many attributes */
@@ -118,9 +119,9 @@ enum nis_error {
 
 struct nis_result {
 	nis_error	status;		/* Status of the response */
-	nis_object	objects<>;	/* objects found 	  */
-	netobj		cookie;		/* Cookie Data 		  */
-	uint32_t	zticks;		/* server ticks	 	  */
+	nis_object	objects<>;	/* objects found	  */
+	netobj		cookie;		/* Cookie Data		  */
+	uint32_t	zticks;		/* server ticks		  */
 	uint32_t	dticks;		/* DBM ticks.		  */
 	uint32_t	aticks;		/* Cache (accel) ticks	  */
 	uint32_t	cticks;		/* Client ticks		  */
@@ -148,9 +149,9 @@ struct ns_request {
  */
 
 struct ib_request {
-	nis_name  	ibr_name;	/* The name of the Table 	*/
-	nis_attr  	ibr_srch<>; 	/* The search critereia 	*/
-	uint32_t	ibr_flags;	/* Optional flags 		*/
+	nis_name	ibr_name;	/* The name of the Table	*/
+	nis_attr	ibr_srch<>;	/* The search critereia		*/
+	uint32_t	ibr_flags;	/* Optional flags		*/
 	nis_object	ibr_obj<1>;	/* optional object (add/modify) */
 	nis_server	ibr_cbhost<1>;	/* Optional callback info	*/
 	u_int		ibr_bufsize;	/* Optional first/next bufsize	*/
@@ -177,11 +178,11 @@ struct ping_args {
  */
 enum log_entry_t {
 	LOG_NOP = 0,
-	ADD_NAME = 1,		/* Name Added to name space 		  */
-	REM_NAME = 2,		/* Name removed from name space 	  */
-	MOD_NAME_OLD = 3,	/* Name was modified in the name space 	  */
-	MOD_NAME_NEW = 4,	/* Name was modified in the name space 	  */
-	ADD_IBASE = 5,		/* Entry added to information base 	  */
+	ADD_NAME = 1,		/* Name Added to name space		  */
+	REM_NAME = 2,		/* Name removed from name space		  */
+	MOD_NAME_OLD = 3,	/* Name was modified in the name space	  */
+	MOD_NAME_NEW = 4,	/* Name was modified in the name space	  */
+	ADD_IBASE = 5,		/* Entry added to information base	  */
 	REM_IBASE = 6,		/* Entry removed from information base    */
 	MOD_IBASE = 7,		/* Entry was modified in information base */
 	UPD_STAMP = 8		/* Update timestamp (used as fenceposts)  */
@@ -195,24 +196,24 @@ enum log_entry_t {
  * 'name'.
  */
 struct log_entry {
-	uint32_t	le_time;	/* Time in seconds 		*/
-	log_entry_t	le_type;	/* Type of log entry 		*/
+	uint32_t	le_time;	/* Time in seconds		*/
+	log_entry_t	le_type;	/* Type of log entry		*/
 	nis_name	le_princp;	/* Principal making the change	*/
-	nis_name	le_name;	/* Name of table/dir involved 	*/
+	nis_name	le_name;	/* Name of table/dir involved	*/
 	nis_attr	le_attrs<>;	/* List of AV pairs.		*/
-	nis_object	le_object;	/* Actual object value 		*/
+	nis_object	le_object;	/* Actual object value		*/
 };
 
 struct log_result {
-	nis_error 	lr_status;	/* The status itself 	 	*/
+	nis_error	lr_status;	/* The status itself		*/
 	netobj		lr_cookie;	/* Used by the dump callback	*/
-	log_entry	lr_entries<>;	/* zero or more entries 	*/
+	log_entry	lr_entries<>;	/* zero or more entries	*/
 };
 
 struct cp_result {
-	nis_error	cp_status;	/* Status of the checkpoint 	*/
-	uint32_t	cp_zticks;	/* Service 'ticks' 	    	*/
-	uint32_t	cp_dticks;	/* Database 'ticks'	    	*/
+	nis_error	cp_status;	/* Status of the checkpoint	*/
+	uint32_t	cp_zticks;	/* Service 'ticks'		*/
+	uint32_t	cp_dticks;	/* Database 'ticks'		*/
 };
 
 /*
@@ -222,7 +223,7 @@ struct cp_result {
  * and to set or reset state variables.
  */
 struct nis_tag {
-	uint32_t	tag_type;	/* Statistic tag (may vary) 	 */
+	uint32_t	tag_type;	/* Statistic tag (may vary)	 */
 	string		tag_val<>;	/* Statistic value may also vary */
 };
 
@@ -231,7 +232,7 @@ struct nis_taglist {
 };
 
 struct dump_args {
-	nis_name	da_dir;		/* Directory to dump 	*/
+	nis_name	da_dir;		/* Directory to dump	*/
 	uint32_t	da_time;	/* From this timestamp	*/
 	nis_server	da_cbhost<1>;	/* Callback to use.	*/
 };
@@ -243,9 +244,9 @@ struct fd_args {
 
 struct fd_result {
 	nis_error	status;		/* Status returned by function	*/
-	nis_name	source;		/* Source of this answer   	*/
-	opaque		dir_data<>;	/* Directory Data (XDR'ed) 	*/
-	opaque		signature<>;	/* Signature of the source 	*/
+	nis_name	source;		/* Source of this answer	*/
+	opaque		dir_data<>;	/* Directory Data (XDR'ed)	*/
+	opaque		signature<>;	/* Signature of the source	*/
 };
 
 %/*
@@ -372,7 +373,7 @@ program  NIS_PROG {
 %
 %/* Structure for storing dynamically allocated static data */
 %struct nis_sdata {
-%	void	*buf;	/* Memory allocation pointer 	*/
+%	void	*buf;	/* Memory allocation pointer	*/
 %	u_int	size;	/* Buffer size			*/
 %};
 %
diff --git a/nis/rpcsvc/nis_callback.h b/nis/rpcsvc/nis_callback.h
index eca4ed9f05..6f05728e2a 100644
--- a/nis/rpcsvc/nis_callback.h
+++ b/nis/rpcsvc/nis_callback.h
@@ -1,31 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _RPCSVC_NIS_CALLBACK_H
 #define _RPCSVC_NIS_CALLBACK_H 1
diff --git a/nis/rpcsvc/nis_callback.x b/nis/rpcsvc/nis_callback.x
index 48178655cf..0fdca9eeec 100644
--- a/nis/rpcsvc/nis_callback.x
+++ b/nis/rpcsvc/nis_callback.x
@@ -1,44 +1,42 @@
 %/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+% *     * Redistributions of source code must retain the above copyright
+% *       notice, this list of conditions and the following disclaimer.
+% *     * Redistributions in binary form must reproduce the above
+% *       copyright notice, this list of conditions and the following
+% *       disclaimer in the documentation and/or other materials
+% *       provided with the distribution.
+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 % */
 
 /*
  *	nis_callback.x
- *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
  */
 
-%#pragma ident	"@(#)nis_callback.x	1.7	94/05/03 SMI"
+%#pragma ident	"@(#)nis_callback.x	1.7	94/05/03"
 
 /*
- * "@(#)zns_cback.x 1.2 90/09/10 Copyr 1990 Sun Micro" 
+ * "@(#)zns_cback.x 1.2 90/09/10"
  *
  * RPCL description of the Callback Service.
  */
diff --git a/nis/rpcsvc/nis_object.x b/nis/rpcsvc/nis_object.x
index 43e7688bcc..774b38fa9c 100644
--- a/nis/rpcsvc/nis_object.x
+++ b/nis/rpcsvc/nis_object.x
@@ -1,11 +1,37 @@
 /*
  *	nis_object.x
  *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-%#pragma ident	"@(#)nis_object.x	1.12	97/11/19 SMI"
+%#pragma ident	"@(#)nis_object.x	1.12	97/11/19"
 
 #if RPC_HDR
 %
@@ -14,7 +40,7 @@
 %
 #endif
 /*
- * 	This file defines the format for a NIS object in RPC language.
+ *	This file defines the format for a NIS object in RPC language.
  * It is included by the main .x file and the database access protocol
  * file. It is common because both of them need to deal with the same
  * type of object. Generating the actual code though is a bit messy because
@@ -54,8 +80,8 @@ const NIS_PK_DHEXT     = 4;	/* Extended Diffie-Hellman for RPC-GSS */
  * optional set of attribute/value pairs.
  */
 struct nis_attr {
-	string	zattr_ndx<>;	/* name of the index 		*/
-	opaque	zattr_val<>;	/* Value for the attribute. 	*/
+	string	zattr_ndx<>;	/* name of the index		*/
+	opaque	zattr_val<>;	/* Value for the attribute.	*/
 };
 
 typedef string nis_name<>;	/* The NIS name itself. */
@@ -63,7 +89,7 @@ typedef string nis_name<>;	/* The NIS name itself. */
 /* NIS object types are defined by the following enumeration. The numbers
  * they use are based on the following scheme :
  *		     0 - 1023 are reserved for Sun,
- * 		1024 - 2047 are defined to be private to a particular tree.
+ *		1024 - 2047 are defined to be private to a particular tree.
  *		2048 - 4095 are defined to be user defined.
  *		4096 - ...  are reserved for future use.
  *
@@ -74,22 +100,22 @@ typedef string nis_name<>;	/* The NIS name itself. */
 
 enum zotypes {
 
-	BOGUS_OBJ  	= 0,	/* Uninitialized object structure 	*/
-	NO_OBJ   	= 1,	/* NULL object (no data)	 	*/
-	DIRECTORY_OBJ 	= 2,	/* Directory object describing domain 	*/
-	GROUP_OBJ  	= 3,	/* Group object (a list of names) 	*/
-	TABLE_OBJ  	= 4,	/* Table object (a database schema) 	*/
-	ENTRY_OBJ  	= 5,	/* Entry object (a database record) 	*/
-	LINK_OBJ   	= 6, 	/* A name link.				*/
-	PRIVATE_OBJ  	= 7, 	/* Private object (all opaque data) 	*/
+	BOGUS_OBJ	= 0,	/* Uninitialized object structure	*/
+	NO_OBJ		= 1,	/* NULL object (no data)		*/
+	DIRECTORY_OBJ	= 2,	/* Directory object describing domain	*/
+	GROUP_OBJ	= 3,	/* Group object (a list of names)	*/
+	TABLE_OBJ	= 4,	/* Table object (a database schema)	*/
+	ENTRY_OBJ	= 5,	/* Entry object (a database record)	*/
+	LINK_OBJ	= 6,	/* A name link.				*/
+	PRIVATE_OBJ	= 7,	/* Private object (all opaque data)	*/
 
-	NIS_BOGUS_OBJ  	= 0,	/* Uninitialized object structure 	*/
-	NIS_NO_OBJ   	= 1,	/* NULL object (no data)	 	*/
-	NIS_DIRECTORY_OBJ = 2, /* Directory object describing domain 	*/
-	NIS_GROUP_OBJ  	= 3,	/* Group object (a list of names) 	*/
-	NIS_TABLE_OBJ  	= 4,	/* Table object (a database schema) 	*/
-	NIS_ENTRY_OBJ  	= 5,	/* Entry object (a database record) 	*/
-	NIS_LINK_OBJ	= 6, 	/* A name link.				*/
+	NIS_BOGUS_OBJ	= 0,	/* Uninitialized object structure	*/
+	NIS_NO_OBJ	= 1,	/* NULL object (no data)		*/
+	NIS_DIRECTORY_OBJ = 2, /* Directory object describing domain	*/
+	NIS_GROUP_OBJ	= 3,	/* Group object (a list of names)	*/
+	NIS_TABLE_OBJ	= 4,	/* Table object (a database schema)	*/
+	NIS_ENTRY_OBJ	= 5,	/* Entry object (a database record)	*/
+	NIS_LINK_OBJ	= 6,	/* A name link.				*/
 	NIS_PRIVATE_OBJ  = 7 /* Private object (all opaque data) */
 };
 
@@ -124,8 +150,8 @@ enum nstype {
  * administrator's approval.
  */
 struct oar_mask {
-	uint32_t	oa_rights;	/* Access rights mask 	*/
-	zotypes		oa_otype;	/* Object type 		*/
+	uint32_t	oa_rights;	/* Access rights mask	*/
+	zotypes		oa_otype;	/* Object type		*/
 };
 
 struct endpoint {
@@ -140,17 +166,17 @@ struct endpoint {
  * the expected lifetime of this service.
  */
 struct nis_server {
-	nis_name	name; 	 	/* Principal name of the server  */
-	endpoint	ep<>;  		/* Universal addr(s) for server  */
+	nis_name	name;		/* Principal name of the server  */
+	endpoint	ep<>;		/* Universal addr(s) for server  */
 	uint32_t	key_type;	/* Public key type		 */
-	netobj		pkey;		/* server's public key  	 */
+	netobj		pkey;		/* server's public key		 */
 };
 
 struct directory_obj {
 	nis_name   do_name;	 /* Name of the directory being served   */
-	nstype	   do_type;	 /* one of NIS, DNS, IVY, YP, or X.500 	 */
-	nis_server do_servers<>; /* <0> == Primary name server     	 */
-	uint32_t   do_ttl;	 /* Time To Live (for caches) 		 */
+	nstype	   do_type;	 /* one of NIS, DNS, IVY, YP, or X.500	 */
+	nis_server do_servers<>; /* <0> == Primary name server		 */
+	uint32_t   do_ttl;	 /* Time To Live (for caches)		 */
 	oar_mask   do_armask<>;  /* Create/Destroy rights by object type */
 };
 
@@ -163,10 +189,10 @@ struct directory_obj {
  * entry but got to it through a LINK rather than directly.
  * If the entry is a "standalone" entry then this field is void.
  */
-const EN_BINARY   = 1;	/* Indicates value is binary data 	*/
+const EN_BINARY   = 1;	/* Indicates value is binary data	*/
 const EN_CRYPT    = 2;	/* Indicates the value is encrypted	*/
 const EN_XDR      = 4;	/* Indicates the value is XDR encoded	*/
-const EN_MODIFIED = 8;	/* Indicates entry is modified. 	*/
+const EN_MODIFIED = 8;	/* Indicates entry is modified.	*/
 const EN_ASN1     = 64;	/* Means contents use ASN.1 encoding    */
 
 struct entry_col {
@@ -175,7 +201,7 @@ struct entry_col {
 };
 
 struct entry_obj {
-	string 	en_type<>;	/* Type of entry such as "passwd" */
+	string	en_type<>;	/* Type of entry such as "passwd" */
 	entry_col en_cols<>;	/* Value for the entry		  */
 };
 
@@ -187,7 +213,7 @@ struct entry_obj {
  */
 struct group_obj {
 	uint32_t	gr_flags;	/* Flags controlling group	*/
-	nis_name	gr_members<>;  	/* List of names in group 	*/
+	nis_name	gr_members<>;	/* List of names in group	*/
 };
 
 /*
@@ -200,7 +226,7 @@ struct group_obj {
 struct link_obj {
 	zotypes	 li_rtype;	/* Real type of the object	*/
 	nis_attr li_attrs<>;	/* Attribute/Values for tables	*/
-	nis_name li_name; 	/* The object's real NIS name	*/
+	nis_name li_name;	/* The object's real NIS name	*/
 };
 
 /*
@@ -219,8 +245,8 @@ struct link_obj {
  * column value.
  */
 
-const TA_BINARY     = 1;	/* Means table data is binary 		*/
-const TA_CRYPT      = 2;	/* Means value should be encrypted 	*/
+const TA_BINARY     = 1;	/* Means table data is binary		*/
+const TA_CRYPT      = 2;	/* Means value should be encrypted	*/
 const TA_XDR        = 4;	/* Means value is XDR encoded		*/
 const TA_SEARCHABLE = 8;	/* Means this column is searchable	*/
 const TA_CASE       = 16;	/* Means this column is Case Sensitive	*/
@@ -228,16 +254,16 @@ const TA_MODIFIED   = 32;	/* Means this columns attrs are modified*/
 const TA_ASN1       = 64;	/* Means contents use ASN.1 encoding     */
 
 struct table_col {
-	string		tc_name<64>;	/* Column Name 	 	   */
+	string		tc_name<64>;	/* Column Name		   */
 	uint32_t	tc_flags;	/* control flags	   */
 	uint32_t	tc_rights;	/* Access rights mask	   */
 };
 
 struct table_obj {
-	string 	  ta_type<64>;	 /* Table type such as "passwd"	*/
+	string	  ta_type<64>;	 /* Table type such as "passwd"	*/
 	int	  ta_maxcol;	 /* Total number of columns	*/
-	u_char	  ta_sep;	 /* Separator character 	*/
-	table_col ta_cols<>; 	 /* The number of table indexes */
+	u_char	  ta_sep;	 /* Separator character		*/
+	table_col ta_cols<>;	 /* The number of table indexes */
 	string	  ta_path<>;	 /* A search path for this table */
 };
 
@@ -245,24 +271,24 @@ struct table_obj {
  * This union joins together all of the currently known objects.
  */
 union objdata switch (zotypes zo_type) {
-        case NIS_DIRECTORY_OBJ :
-                struct directory_obj di_data;
-        case NIS_GROUP_OBJ :
-                struct group_obj gr_data;
-        case NIS_TABLE_OBJ :
-                struct table_obj ta_data;
-        case NIS_ENTRY_OBJ:
-                struct entry_obj en_data;
-        case NIS_LINK_OBJ :
-                struct link_obj li_data;
-        case NIS_PRIVATE_OBJ :
-                opaque	po_data<>;
+	case NIS_DIRECTORY_OBJ :
+		struct directory_obj di_data;
+	case NIS_GROUP_OBJ :
+		struct group_obj gr_data;
+	case NIS_TABLE_OBJ :
+		struct table_obj ta_data;
+	case NIS_ENTRY_OBJ:
+		struct entry_obj en_data;
+	case NIS_LINK_OBJ :
+		struct link_obj li_data;
+	case NIS_PRIVATE_OBJ :
+		opaque	po_data<>;
 	case NIS_NO_OBJ :
 		void;
-        case NIS_BOGUS_OBJ :
+	case NIS_BOGUS_OBJ :
+		void;
+	default :
 		void;
-        default :
-                void;
 };
 
 /*
@@ -281,7 +307,7 @@ union objdata switch (zotypes zo_type) {
  * new position and calculate the size.
  */
 struct nis_oid {
-	uint32_t ctime;		/* Time of objects creation 	*/
+	uint32_t ctime;		/* Time of objects creation	*/
 	uint32_t mtime;		/* Time of objects modification */
 };
 
@@ -293,7 +319,7 @@ struct nis_object {
 	nis_name zo_domain;	/* The administrator for the object	*/
 	uint32_t zo_access;	/* Access rights (owner, group, world)	*/
 	uint32_t zo_ttl;	/* Object's time to live in seconds.	*/
-	objdata	 zo_data;	/* Data structure for this type 	*/
+	objdata	 zo_data;	/* Data structure for this type		*/
 };
 #if RPC_HDR
 %
diff --git a/nis/rpcsvc/nis_tags.h b/nis/rpcsvc/nis_tags.h
index 9a24188f98..c2dc7fd269 100644
--- a/nis/rpcsvc/nis_tags.h
+++ b/nis/rpcsvc/nis_tags.h
@@ -1,5 +1,32 @@
 /*
- * Copyright (c) 1991, Sun Microsystems Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*
@@ -13,9 +40,9 @@
 #define	_RPCSVC_NIS_TAGS_H
 
 #if 0
-#pragma ident	"@(#)nis_tags.h	1.16	96/10/25 SMI"
+#pragma ident	"@(#)nis_tags.h	1.16	96/10/25"
 #endif
-/* from file: zns_tags.h	1.7 Copyright (c) 1990 Sun Microsystems */
+/* from file: zns_tags.h	1.7 */
 
 #ifdef	__cplusplus
 extern "C" {
@@ -25,11 +52,11 @@ extern "C" {
 #define	NIS_DIR	"data"
 
 /* Lookup and List function flags */
-#define	FOLLOW_LINKS	(1<<0)	/* Follow link objects 			*/
-#define	FOLLOW_PATH	(1<<1)	/* Follow the path in a table 		*/
-#define	HARD_LOOKUP	(1<<2)	/* Block until successful 		*/
-#define	ALL_RESULTS	(1<<3)	/* Retrieve all results 		*/
-#define	NO_CACHE	(1<<4)	/* Do not return 'cached' results 	*/
+#define	FOLLOW_LINKS	(1<<0)	/* Follow link objects			*/
+#define	FOLLOW_PATH	(1<<1)	/* Follow the path in a table		*/
+#define	HARD_LOOKUP	(1<<2)	/* Block until successful		*/
+#define	ALL_RESULTS	(1<<3)	/* Retrieve all results			*/
+#define	NO_CACHE	(1<<4)	/* Do not return 'cached' results	*/
 #define	MASTER_ONLY	(1<<5)	/* Get value only from master server	*/
 #define	EXPAND_NAME	(1<<6)	/* Expand partitially qualified names	*/
 
@@ -46,7 +73,7 @@ extern "C" {
 #define	SOFT_LOOKUP	(1<<14)	/* The "old default" return on failure  */
 
 /* Transport specific modifications to the operation */
-#define	USE_DGRAM	(1<<16) /* Use a datagram transport 		*/
+#define	USE_DGRAM	(1<<16) /* Use a datagram transport		*/
 #define	NO_AUTHINFO	(1<<17) /* Don't bother attaching auth info	*/
 
 /*
@@ -55,14 +82,14 @@ extern "C" {
  * Statistic tags have values		2048 - 65535
  * User Tags have values		>2^16
  */
-#define	TAG_DEBUG	1	/* set debug level 		*/
-#define	TAG_STATS	2	/* Enable/disable statistics 	*/
+#define	TAG_DEBUG	1	/* set debug level		*/
+#define	TAG_STATS	2	/* Enable/disable statistics	*/
 #define	TAG_GCACHE	3	/* Flush the Group Cache	*/
 #define	TAG_GCACHE_ALL	TAG_GCACHE
 #define	TAG_DCACHE	4	/* Flush the directory cache	*/
 #define	TAG_DCACHE_ONE	TAG_DCACHE
 #define	TAG_OCACHE	5	/* Flush the Object Cache	*/
-#define	TAG_SECURE	6	/* Set the security level 	*/
+#define	TAG_SECURE	6	/* Set the security level	*/
 #define	TAG_TCACHE_ONE	7	/* Flush the table cache	*/
 #define	TAG_DCACHE_ALL	8	/* Flush entire directory cache	*/
 #define	TAG_TCACHE_ALL	9	/* Flush entire table cache	*/
@@ -91,8 +118,8 @@ extern "C" {
  * Declarations for the Group object flags. Currently
  * there are only 3.
  */
-#define	IMPMEM_GROUPS  1	/* Implicit Membership allowed 	*/
-#define	RECURS_GROUPS  2	/* Recursive Groups allowed 	*/
+#define	IMPMEM_GROUPS  1	/* Implicit Membership allowed	*/
+#define	RECURS_GROUPS  2	/* Recursive Groups allowed	*/
 #define	NEGMEM_GROUPS  4	/* Negative Groups allowed	*/
 
 #ifdef	__cplusplus
diff --git a/nis/rpcsvc/yp.h b/nis/rpcsvc/yp.h
index ffc13b81f1..968b74c42e 100644
--- a/nis/rpcsvc/yp.h
+++ b/nis/rpcsvc/yp.h
@@ -1,30 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef __RPCSVC_YP_H__
diff --git a/nis/rpcsvc/yp.x b/nis/rpcsvc/yp.x
index b1b25658eb..269ae6f606 100644
--- a/nis/rpcsvc/yp.x
+++ b/nis/rpcsvc/yp.x
@@ -1,32 +1,34 @@
 /* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
 
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*
@@ -163,12 +165,12 @@ struct ypresp_maplist {
 
 enum yppush_status {
 	YPPUSH_SUCC	=  1,	/* Success */
-	YPPUSH_AGE 	=  2,	/* Master's version not newer */
+	YPPUSH_AGE	=  2,	/* Master's version not newer */
 	YPPUSH_NOMAP	= -1,	/* Can't find server for map */
 	YPPUSH_NODOM	= -2,	/* Domain not supported */
 	YPPUSH_RSRC	= -3,	/* Local resource alloc failure */
 	YPPUSH_RPC	= -4,	/* RPC failure talking to server */
-	YPPUSH_MADDR 	= -5,	/* Can't get master address */
+	YPPUSH_MADDR	= -5,	/* Can't get master address */
 	YPPUSH_YPERR	= -6,	/* YP server/map db error */
 	YPPUSH_BADARGS	= -7,	/* Request arguments bad */
 	YPPUSH_DBM	= -8,	/* Local dbm operation failed */
@@ -176,8 +178,8 @@ enum yppush_status {
 	YPPUSH_SKEW	= -10,	/* Map version skew during transfer */
 	YPPUSH_CLEAR	= -11,	/* Can't send "Clear" req to local ypserv */
 	YPPUSH_FORCE	= -12,	/* No local order number in map  use -f flag. */
-	YPPUSH_XFRERR 	= -13,	/* ypxfr error */
-	YPPUSH_REFUSED	= -14 	/* Transfer request refused by ypserv */
+	YPPUSH_XFRERR	= -13,	/* ypxfr error */
+	YPPUSH_REFUSED	= -14	/* Transfer request refused by ypserv */
 };
 
 struct yppushresp_xfr {
@@ -202,9 +204,9 @@ struct ypbind_binding {
 
 union ypbind_resp switch (ypbind_resptype ypbind_status) {
 case YPBIND_FAIL_VAL:
-        unsigned ypbind_error;
+	unsigned ypbind_error;
 case YPBIND_SUCC_VAL:
-        ypbind_binding ypbind_bindinfo;
+	ypbind_binding ypbind_bindinfo;
 };
 
 /* Detailed failure reason codes for response field ypbind_error*/
diff --git a/nis/rpcsvc/ypupd.h b/nis/rpcsvc/ypupd.h
index c53e69d0e0..d07fd4d744 100644
--- a/nis/rpcsvc/ypupd.h
+++ b/nis/rpcsvc/ypupd.h
@@ -1,34 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 
diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
index bdd5d8725f..76e0f2f216 100644
--- a/nis/yp_xdr.c
+++ b/nis/yp_xdr.c
@@ -1,30 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <rpcsvc/yp.h>
diff --git a/nis/ypupdate_xdr.c b/nis/ypupdate_xdr.c
index 0f5469fa23..9f6d69f96e 100644
--- a/nis/ypupdate_xdr.c
+++ b/nis/ypupdate_xdr.c
@@ -1,34 +1,32 @@
 /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <rpcsvc/ypupd.h>