svn commit: r184647 - in user/dfr/gssapi/7/include: . rpc

[Doug Rabson]

Author: dfr
Date: Tue Nov  4 18:31:16 2008
New Revision: 184647
URL: http://svn.freebsd.org/changeset/base/184647

Log:
  Merged /head/include:r184588
  
  Add some defines for RPCSEC_GSS pseudo flavors.

Modified:
  user/dfr/gssapi/7/include/   (props changed)
  user/dfr/gssapi/7/include/rpc/auth.h
  user/dfr/gssapi/7/include/rpc/xdr.h

Modified: user/dfr/gssapi/7/include/rpc/auth.h
==============================================================================
--- user/dfr/gssapi/7/include/rpc/auth.h	Tue Nov  4 18:20:54 2008	(r184646)
+++ user/dfr/gssapi/7/include/rpc/auth.h	Tue Nov  4 18:31:16 2008	(r184647)
@@ -352,5 +352,13 @@ __END_DECLS
 #define AUTH_DH		3		/* for Diffie-Hellman mechanism */
 #define AUTH_DES	AUTH_DH		/* for backward compatibility */
 #define AUTH_KERB	4		/* kerberos style */
+#define RPCSEC_GSS	6		/* RPCSEC_GSS */
+
+/*
+ * Pseudo auth flavors for RPCSEC_GSS.
+ */
+#define	RPCSEC_GSS_KRB5		390003
+#define	RPCSEC_GSS_KRB5I	390004
+#define	RPCSEC_GSS_KRB5P	390005
 
 #endif /* !_RPC_AUTH_H */

Modified: user/dfr/gssapi/7/include/rpc/xdr.h
==============================================================================
--- user/dfr/gssapi/7/include/rpc/xdr.h	Tue Nov  4 18:20:54 2008	(r184646)
+++ user/dfr/gssapi/7/include/rpc/xdr.h	Tue Nov  4 18:31:16 2008	(r184647)
@@ -294,10 +294,13 @@ extern bool_t	xdr_short(XDR *, short *);
 extern bool_t	xdr_u_short(XDR *, u_short *);
 extern bool_t	xdr_int16_t(XDR *, int16_t *);
 extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_uint16_t(XDR *, u_int16_t *);
 extern bool_t	xdr_int32_t(XDR *, int32_t *);
 extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_uint32_t(XDR *, u_int32_t *);
 extern bool_t	xdr_int64_t(XDR *, int64_t *);
 extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t	xdr_uint64_t(XDR *, u_int64_t *);
 extern bool_t	xdr_bool(XDR *, bool_t *);
 extern bool_t	xdr_enum(XDR *, enum_t *);
 extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);