Revert "Sun agreed to a change of the license for the RPC code to a BSD-like license."

This reverts commit ab09b221594f12d90a63d29cbf5488d91f39d3f3.

The lawyers now say the copy in glibc isn't contained in the
agreement.

1 files changed, 59 insertions, 56 deletions

diff --git a/sunrpc/rpcsvc/key_prot.x b/sunrpc/rpcsvc/key_prot.x
index 0350250825..d9272cbcfa 100644
--- a/sunrpc/rpcsvc/key_prot.x
+++ b/sunrpc/rpcsvc/key_prot.x
@@ -1,34 +1,35 @@
+%/*
+% * 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.
+% *
+% * 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.
+% *
+% * 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.
+% *
+% * 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
+% */
 /*
  * Key server protocol definition
  * Copyright (C) 1990, 1991 Sun Microsystems, 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 Sun Microsystems, 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.
- *
  * The keyserver is a public key storage/encryption/decryption service
  * The encryption method used is based on the Diffie-Hellman exponential
  * key exchange technology.
@@ -48,7 +49,7 @@
 %
 %/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 %
-%/*
+%/* 
 % * Compiled from key_prot.x using rpcgen.
 % * DO NOT EDIT THIS FILE!
 % * This is NOT source code!
@@ -94,7 +95,7 @@ typedef opaque keybuf[HEXKEYBYTES];	/* store key in hex */
 typedef string netnamestr<MAXNETNAMELEN>;
 
 /*
- * Argument to ENCRYPT or DECRYPT
+ * Argument to ENCRYPT or DECRYPT 
  */
 struct cryptkeyarg {
 	netnamestr remotename;
@@ -124,12 +125,12 @@ default:
 const MAXGIDS  = 16;	/* max number of gids in gid list */
 
 /*
- * Unix credential
- */
+ * Unix credential 
+ */	
 struct unixcred {
 	u_int uid;
 	u_int gid;
-	u_int gids<MAXGIDS>;
+	u_int gids<MAXGIDS>;	
 };
 
 /*
@@ -156,7 +157,7 @@ case KEY_SUCCESS:
 	key_netstarg knet;
 default:
 	void;
-};
+};	
 
 #ifdef RPC_HDR
 %
@@ -172,15 +173,15 @@ program KEY_PROG {
 		 * This is my secret key.
 	 	 * Store it for me.
 		 */
-		keystatus
-		KEY_SET(keybuf) = 1;
-
+		keystatus 
+		KEY_SET(keybuf) = 1;	
+	
 		/*
 		 * I want to talk to X.
 		 * Encrypt a conversation key for me.
 	 	 */
 		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;
+		KEY_ENCRYPT(cryptkeyarg) = 2;	
 
 		/*
 		 * X just sent me a message.
@@ -192,7 +193,7 @@ program KEY_PROG {
 		/*
 		 * Generate a secure conversation key for me
 		 */
-		des_block
+		des_block 
 		KEY_GEN(void) = 4;
 
 		/*
@@ -214,15 +215,15 @@ program KEY_PROG {
 		 * This is my secret key.
 	 	 * Store it for me.
 		 */
-		keystatus
-		KEY_SET(keybuf) = 1;
-
+		keystatus 
+		KEY_SET(keybuf) = 1;	
+	
 		/*
 		 * I want to talk to X.
 		 * Encrypt a conversation key for me.
 	 	 */
 		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;
+		KEY_ENCRYPT(cryptkeyarg) = 2;	
 
 		/*
 		 * X just sent me a message.
@@ -234,7 +235,7 @@ program KEY_PROG {
 		/*
 		 * Generate a secure conversation key for me
 		 */
-		des_block
+		des_block 
 		KEY_GEN(void) = 4;
 
 		/*
@@ -243,13 +244,13 @@ program KEY_PROG {
 		 */
 		getcredres
 		KEY_GETCRED(netnamestr) = 5;
-
+		
 		/*
 		 * I want to talk to X. and I know X's public key
 		 * Encrypt a conversation key for me.
 	 	 */
 		cryptkeyres
-		KEY_ENCRYPT_PK(cryptkeyarg2) = 6;
+		KEY_ENCRYPT_PK(cryptkeyarg2) = 6;	
 
 		/*
 		 * X just sent me a message. and I know X's public key
@@ -257,27 +258,29 @@ program KEY_PROG {
 		 */
 		cryptkeyres
 		KEY_DECRYPT_PK(cryptkeyarg2) = 7;
-
-		/*
-		 * Store my public key, netname and private key.
+		
+		/* 
+		 * Store my public key, netname and private key. 
 		 */
 		keystatus
 		KEY_NET_PUT(key_netstarg) = 8;
-
+		
 		/*
-		 * Retrieve my public key, netname and private key.
+		 * Retrieve my public key, netname and private key. 
 		 */
  		key_netstres
 		KEY_NET_GET(void) = 9;
-
+		
 		/*
-		 * Return me the conversation key that is constructed
-		 * from my secret key and this publickey.
+		 * Return me the conversation key that is constructed 
+		 * from my secret key and this publickey. 
 		 */
 
-		cryptkeyres
-		KEY_GET_CONV(keybuf) = 10;
-
+		cryptkeyres 
+		KEY_GET_CONV(keybuf) = 10; 
 
+		
 	} = 2;
 } = 100029;
+
+