diff options
author | bde <bde@FreeBSD.org> | 1998-02-13 03:10:28 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-02-13 03:10:28 +0000 |
commit | 65241a7de7f2e0fcf6e475bcd5bb1236b86441d4 (patch) | |
tree | 5799ecb1454705c180f2b54db6393d2e31d76293 | |
parent | 7fdb812e6b3d9404ee46bbc059c4580fa103e0cd (diff) | |
download | FreeBSD-src-65241a7de7f2e0fcf6e475bcd5bb1236b86441d4.zip FreeBSD-src-65241a7de7f2e0fcf6e475bcd5bb1236b86441d4.tar.gz |
Uncommit the generated file key_prot.h. Install it from where it
is generated. It must be installed in both /usr/include/rpc/ and
/usr/include/rpcsvc/ for historical reasons. The generated version
was once missing ANSI prototypes because the wrong flags were passed
to rpcgen, but that is fixed now. The committed version had `#pragma
indent' which gratuitously broke K&R support. Apart from this, all
versions before and after this commit are identical.
-rw-r--r-- | include/Makefile | 4 | ||||
-rw-r--r-- | include/rpc/key_prot.h | 261 | ||||
-rw-r--r-- | include/rpcsvc/Makefile | 4 |
3 files changed, 5 insertions, 264 deletions
diff --git a/include/Makefile b/include/Makefile index b666ab7..6ce2fe1 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $Id: Makefile,v 1.70 1998/01/31 05:54:54 imp Exp $ +# $Id: Makefile,v 1.71 1998/02/11 04:57:24 jdp Exp $ # # Doing a make install builds /usr/include # @@ -29,7 +29,7 @@ PROTOFILES= dumprestore.h routed.h rwhod.h talkd.h timed.h RPCFILES= auth.h auth_unix.h clnt.h pmap_clnt.h pmap_prot.h pmap_rmt.h \ rpc.h rpc_com.h rpc_msg.h svc.h svc_auth.h types.h xdr.h \ - auth_des.h des.h des_crypt.h key_prot.h + auth_des.h des.h des_crypt.h MFILES= float.h floatingpoint.h stdarg.h varargs.h LFILES= errno.h fcntl.h poll.h syslog.h termios.h diff --git a/include/rpc/key_prot.h b/include/rpc/key_prot.h deleted file mode 100644 index f762ba0..0000000 --- a/include/rpc/key_prot.h +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Please do not edit this file. - * It was generated using rpcgen. - */ - -#ifndef _KEY_PROT_H_RPCGEN -#define _KEY_PROT_H_RPCGEN - -#include <rpc/rpc.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * 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 - */ -#pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" - -/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ - -/* - * Compiled from key_prot.x using rpcgen. - * DO NOT EDIT THIS FILE! - * This is NOT source code! - */ -#define PROOT 3 -#define HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b" -#define HEXKEYBYTES 48 -#define KEYSIZE 192 -#define KEYBYTES 24 -#define KEYCHECKSUMSIZE 16 - -enum keystatus { - KEY_SUCCESS = 0, - KEY_NOSECRET = 1, - KEY_UNKNOWN = 2, - KEY_SYSTEMERR = 3 -}; -typedef enum keystatus keystatus; - -typedef char keybuf[HEXKEYBYTES]; - -typedef char *netnamestr; - -struct cryptkeyarg { - netnamestr remotename; - des_block deskey; -}; -typedef struct cryptkeyarg cryptkeyarg; - -struct cryptkeyarg2 { - netnamestr remotename; - netobj remotekey; - des_block deskey; -}; -typedef struct cryptkeyarg2 cryptkeyarg2; - -struct cryptkeyres { - keystatus status; - union { - des_block deskey; - } cryptkeyres_u; -}; -typedef struct cryptkeyres cryptkeyres; -#define MAXGIDS 16 - -struct unixcred { - u_int uid; - u_int gid; - struct { - u_int gids_len; - u_int *gids_val; - } gids; -}; -typedef struct unixcred unixcred; - -struct getcredres { - keystatus status; - union { - unixcred cred; - } getcredres_u; -}; -typedef struct getcredres getcredres; - -struct key_netstarg { - keybuf st_priv_key; - keybuf st_pub_key; - netnamestr st_netname; -}; -typedef struct key_netstarg key_netstarg; - -struct key_netstres { - keystatus status; - union { - key_netstarg knet; - } key_netstres_u; -}; -typedef struct key_netstres key_netstres; - -#ifndef opaque -#define opaque char -#endif - - -#define KEY_PROG ((unsigned long)(100029)) -#define KEY_VERS ((unsigned long)(1)) - -#if defined(__STDC__) || defined(__cplusplus) -#define KEY_SET ((unsigned long)(1)) -extern keystatus * key_set_1(char *, CLIENT *); -extern keystatus * key_set_1_svc(char *, struct svc_req *); -#define KEY_ENCRYPT ((unsigned long)(2)) -extern cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *); -extern cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *); -#define KEY_DECRYPT ((unsigned long)(3)) -extern cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *); -extern cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *); -#define KEY_GEN ((unsigned long)(4)) -extern des_block * key_gen_1(void *, CLIENT *); -extern des_block * key_gen_1_svc(void *, struct svc_req *); -#define KEY_GETCRED ((unsigned long)(5)) -extern getcredres * key_getcred_1(netnamestr *, CLIENT *); -extern getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *); -extern int key_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t); - -#else /* K&R C */ -#define KEY_SET ((unsigned long)(1)) -extern keystatus * key_set_1(); -extern keystatus * key_set_1_svc(); -#define KEY_ENCRYPT ((unsigned long)(2)) -extern cryptkeyres * key_encrypt_1(); -extern cryptkeyres * key_encrypt_1_svc(); -#define KEY_DECRYPT ((unsigned long)(3)) -extern cryptkeyres * key_decrypt_1(); -extern cryptkeyres * key_decrypt_1_svc(); -#define KEY_GEN ((unsigned long)(4)) -extern des_block * key_gen_1(); -extern des_block * key_gen_1_svc(); -#define KEY_GETCRED ((unsigned long)(5)) -extern getcredres * key_getcred_1(); -extern getcredres * key_getcred_1_svc(); -extern int key_prog_1_freeresult(); -#endif /* K&R C */ -#define KEY_VERS2 ((unsigned long)(2)) - -#if defined(__STDC__) || defined(__cplusplus) -extern keystatus * key_set_2(char *, CLIENT *); -extern keystatus * key_set_2_svc(char *, struct svc_req *); -extern cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *); -extern cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *); -extern cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *); -extern cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *); -extern des_block * key_gen_2(void *, CLIENT *); -extern des_block * key_gen_2_svc(void *, struct svc_req *); -extern getcredres * key_getcred_2(netnamestr *, CLIENT *); -extern getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *); -#define KEY_ENCRYPT_PK ((unsigned long)(6)) -extern cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *); -extern cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *); -#define KEY_DECRYPT_PK ((unsigned long)(7)) -extern cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *); -extern cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *); -#define KEY_NET_PUT ((unsigned long)(8)) -extern keystatus * key_net_put_2(key_netstarg *, CLIENT *); -extern keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *); -#define KEY_NET_GET ((unsigned long)(9)) -extern key_netstres * key_net_get_2(void *, CLIENT *); -extern key_netstres * key_net_get_2_svc(void *, struct svc_req *); -#define KEY_GET_CONV ((unsigned long)(10)) -extern cryptkeyres * key_get_conv_2(char *, CLIENT *); -extern cryptkeyres * key_get_conv_2_svc(char *, struct svc_req *); -extern int key_prog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t); - -#else /* K&R C */ -extern keystatus * key_set_2(); -extern keystatus * key_set_2_svc(); -extern cryptkeyres * key_encrypt_2(); -extern cryptkeyres * key_encrypt_2_svc(); -extern cryptkeyres * key_decrypt_2(); -extern cryptkeyres * key_decrypt_2_svc(); -extern des_block * key_gen_2(); -extern des_block * key_gen_2_svc(); -extern getcredres * key_getcred_2(); -extern getcredres * key_getcred_2_svc(); -#define KEY_ENCRYPT_PK ((unsigned long)(6)) -extern cryptkeyres * key_encrypt_pk_2(); -extern cryptkeyres * key_encrypt_pk_2_svc(); -#define KEY_DECRYPT_PK ((unsigned long)(7)) -extern cryptkeyres * key_decrypt_pk_2(); -extern cryptkeyres * key_decrypt_pk_2_svc(); -#define KEY_NET_PUT ((unsigned long)(8)) -extern keystatus * key_net_put_2(); -extern keystatus * key_net_put_2_svc(); -#define KEY_NET_GET ((unsigned long)(9)) -extern key_netstres * key_net_get_2(); -extern key_netstres * key_net_get_2_svc(); -#define KEY_GET_CONV ((unsigned long)(10)) -extern cryptkeyres * key_get_conv_2(); -extern cryptkeyres * key_get_conv_2_svc(); -extern int key_prog_2_freeresult(); -#endif /* K&R C */ - -/* the xdr functions */ - -#if defined(__STDC__) || defined(__cplusplus) -extern bool_t xdr_keystatus(XDR *, keystatus*); -extern bool_t xdr_keybuf(XDR *, keybuf); -extern bool_t xdr_netnamestr(XDR *, netnamestr*); -extern bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*); -extern bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*); -extern bool_t xdr_cryptkeyres(XDR *, cryptkeyres*); -extern bool_t xdr_unixcred(XDR *, unixcred*); -extern bool_t xdr_getcredres(XDR *, getcredres*); -extern bool_t xdr_key_netstarg(XDR *, key_netstarg*); -extern bool_t xdr_key_netstres(XDR *, key_netstres*); - -#else /* K&R C */ -extern bool_t xdr_keystatus(); -extern bool_t xdr_keybuf(); -extern bool_t xdr_netnamestr(); -extern bool_t xdr_cryptkeyarg(); -extern bool_t xdr_cryptkeyarg2(); -extern bool_t xdr_cryptkeyres(); -extern bool_t xdr_unixcred(); -extern bool_t xdr_getcredres(); -extern bool_t xdr_key_netstarg(); -extern bool_t xdr_key_netstres(); - -#endif /* K&R C */ - -#ifdef __cplusplus -} -#endif - -#endif /* !_KEY_PROT_H_RPCGEN */ diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index 71cd966..8b058ee 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC -# $Id: Makefile,v 1.20 1998/01/16 11:51:19 bde Exp $ +# $Id: Makefile,v 1.21 1998/01/19 17:19:09 wpaul Exp $ .SUFFIXES: .x @@ -25,6 +25,8 @@ beforeinstall: ${XFILES:S;^;${.CURDIR}/;} \ ${HDRS} \ ${DESTDIR}/usr/include/rpcsvc + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 key_prot.h \ + ${DESTDIR}/usr/include/rpc .x.h: ${RPCCOM} -h ${.IMPSRC} -o ${.TARGET} |