From owner-svn-src-user@FreeBSD.ORG Tue Nov 4 18:31:16 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B37901065672; Tue, 4 Nov 2008 18:31:16 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A11888FC43; Tue, 4 Nov 2008 18:31:16 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA4IVG1o004333; Tue, 4 Nov 2008 18:31:16 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA4IVGlT004331; Tue, 4 Nov 2008 18:31:16 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811041831.mA4IVGlT004331@svn.freebsd.org> From: Doug Rabson Date: Tue, 4 Nov 2008 18:31:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184647 - in user/dfr/gssapi/7/include: . rpc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2008 18:31:16 -0000 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);