Make a lot of include-files self-contained. I excluded the patches changing

int's to gid_t and uid_t - should I commit these, too?

Closes PR misc/2625.

Submitted by:	Julian Assange <proff@iq.org>

10 files changed, 40 insertions, 10 deletions

diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 63dfc2f..0abf438 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	$Id: auth.h,v 1.8 1997/02/23 09:17:21 peter Exp $
+ *	$Id: auth.h,v 1.9 1997/05/07 00:58:23 bde Exp $
  */
 
 /*
@@ -44,6 +44,8 @@
 #ifndef _RPC_AUTH_H
 #define _RPC_AUTH_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
 
 #define MAX_AUTH_BYTES	400
 #define MAXNETNAMELEN	255	/* maximum length of network user's name */
@@ -174,7 +176,9 @@ extern AUTH *authdes_create		__P((char *, u_int,
 					    struct sockaddr_in *, des_block *));
 __END_DECLS
 
+#ifndef AUTH_NONE /* Protect against <login_cap.h>
 #define AUTH_NONE	0		/* no authentication */
+#endif
 #define	AUTH_NULL	0		/* backward compatibility */
 #define	AUTH_UNIX	1		/* unix style (uid, gids) */
 #define	AUTH_SHORT	2		/* short hand unix style */
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 664f798..4d71ea4 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: auth_unix.h,v 1.6 1997/02/23 09:17:21 peter Exp $
  */
 
 /*
@@ -47,6 +47,9 @@
 #ifndef _RPC_AUTH_UNIX_H
 #define _RPC_AUTH_UNIX_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
 
 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 773aa95..24066f9d 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)clnt.h 1.31 88/02/08 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
  */
 
 /*
@@ -40,6 +40,9 @@
 #ifndef _RPC_CLNT_H_
 #define _RPC_CLNT_H_
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
 
 /*
  * Rpc calls return an enum clnt_stat.  This should be looked at more,
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index ada124a..3f5dc2d 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: pmap_clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
  */
 
 /*
@@ -63,6 +63,9 @@
 #ifndef _RPC_PMAPCLNT_H
 #define _RPC_PMAPCLNT_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <netinet/in.h>
 
 __BEGIN_DECLS
 extern bool_t		pmap_set	__P((u_long, u_long, int, int));
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index aaec5b5..4c42593 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: pmap_prot.h,v 1.6 1997/02/23 09:17:23 peter Exp $
  */
 
 /*
@@ -71,6 +71,8 @@
 #ifndef _RPC_PMAPPROT_H
 #define _RPC_PMAPPROT_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
 
 #define PMAPPORT		((u_short)111)
 #define PMAPPROG		((u_long)100000)
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 7bb6259..94472ad 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: pmap_rmt.h,v 1.6 1997/02/23 09:17:23 peter Exp $
  */
 
 /*
@@ -41,6 +41,8 @@
 #ifndef _RPC_PMAPRMT_H
 #define _RPC_PMAPRMT_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
 
 struct rmtcallargs {
 	u_long prog, vers, proc, arglen;
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 654cd7d..bc5637d 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: rpc_msg.h,v 1.8 1997/02/23 09:17:24 peter Exp $
  */
 
 /*
@@ -40,6 +40,9 @@
 
 #ifndef _RPC_RPCMSG_H
 #define _RPC_RPCMSG_H
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
 
 #define RPC_MSG_VERSION		((u_long) 2)
 #define RPC_SERVICE_PORT	((u_short) 2048)
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index e72959f..c058bad 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: svc.h,v 1.9 1997/02/23 09:17:24 peter Exp $
  */
 
 /*
@@ -40,6 +40,11 @@
 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
+#include <rpc/rpc_msg.h>
+#include <netinet/in.h>
 
 /*
  * This interface must manage two items concerning remote procedure calling:
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 295027c..e7b8325 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	from: @(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: svc_auth.h,v 1.6 1997/02/23 09:17:25 peter Exp $
  */
 
 /*
@@ -39,6 +39,10 @@
 
 #ifndef _RPC_SVCAUTH_H
 #define _RPC_SVCAUTH_H
+#include <sys/cdefs.h>
+#include <rpc/auth.h>
+#include <rpc/svc.h>
+#include <rpc/rpc_msg.h>
 
 /*
  * Server side authenticator
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ae9923f..8d82ccd 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id$
+ *	$Id: xdr.h,v 1.7 1997/02/23 09:17:25 peter Exp $
  */
 
 /*
@@ -40,6 +40,7 @@
 #ifndef _RPC_XDR_H
 #define _RPC_XDR_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
 
 /*
  * XDR provides a conventional way for converting between C data