diff options
Diffstat (limited to 'include/rpc')
| -rw-r--r-- | include/rpc/auth.h | 30 | ||||
| -rw-r--r-- | include/rpc/auth_des.h | 9 | ||||
| -rw-r--r-- | include/rpc/auth_unix.h | 3 | ||||
| -rw-r--r-- | include/rpc/clnt.h | 39 | ||||
| -rw-r--r-- | include/rpc/des_crypt.h | 2 | ||||
| -rw-r--r-- | include/rpc/key_prot.h | 23 | ||||
| -rw-r--r-- | include/rpc/pmap_clnt.h | 4 | ||||
| -rw-r--r-- | include/rpc/pmap_prot.h | 7 | ||||
| -rw-r--r-- | include/rpc/pmap_rmt.h | 7 | ||||
| -rw-r--r-- | include/rpc/rpc_msg.h | 9 | ||||
| -rw-r--r-- | include/rpc/svc.h | 35 | ||||
| -rw-r--r-- | include/rpc/svc_auth.h | 4 | ||||
| -rw-r--r-- | include/rpc/xdr.h | 95 |
13 files changed, 126 insertions, 141 deletions
diff --git a/include/rpc/auth.h b/include/rpc/auth.h index a03188ed44..0219fd9316 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -13,7 +13,7 @@ extern int key_setnet (struct key_netstarg *arg); #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ##service ## _netname2user \ - (char netname[MAXNETNAMELEN + 1], uid_t *uidp, \ + (char netname[MAXNETNAMELEN + 1], uid_t *uidp, \ gid_t *gidp, int *gidlenp, gid_t *gidlist, \ int *errnop); @@ -22,23 +22,23 @@ DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES -extern bool_t xdr_des_block_internal (XDR *__xdrs, des_block *__blkp) - attribute_hidden; -extern bool_t xdr_opaque_auth_internal (XDR *, struct opaque_auth *) - attribute_hidden; - -extern AUTH *authunix_create_internal (char *__machname, __uid_t __uid, - __gid_t __gid, int __len, - __gid_t *__aup_gids) attribute_hidden; -extern AUTH *authunix_create_default_internal (void) attribute_hidden; -extern AUTH *authnone_create_internal (void) attribute_hidden; -extern AUTH *authdes_pk_create_internal (const char *, netobj *, u_int, - struct sockaddr *, - des_block *) attribute_hidden; - libc_hidden_proto (key_encryptsession_pk) libc_hidden_proto (key_decryptsession_pk) libc_hidden_proto (_null_auth) +libc_hidden_proto (authnone_create) +libc_hidden_proto (authunix_create) +libc_hidden_proto (authunix_create_default) +libc_hidden_proto (xdr_des_block) +libc_hidden_proto (xdr_opaque_auth) +libc_hidden_proto (authdes_create) +libc_hidden_proto (authdes_pk_create) +libc_hidden_proto (key_decryptsession) +libc_hidden_proto (key_encryptsession) +libc_hidden_proto (key_get_conv) +libc_hidden_proto (key_secretkey_is_set) +libc_hidden_proto (key_setnet) +libc_hidden_proto (key_setsecret) +libc_hidden_proto (netname2host) #endif diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index 6dee05961d..c14f069668 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -3,6 +3,7 @@ #include <sunrpc/rpc/auth_des.h> libc_hidden_proto (getpublickey) +libc_hidden_proto (getsecretkey) libc_hidden_proto (rtime) extern bool_t xdr_authdes_cred (XDR *xdrs, struct authdes_cred *cred); @@ -16,9 +17,9 @@ extern enum auth_stat _svcauth_des (register struct svc_req *rqst, #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _getpublickey \ - (const char *netname, char *pkey, int *errnop); \ + (const char *netname, char *pkey, int *errnop); \ extern enum nss_status _nss_ ## service ## _getsecretkey \ - (const char *netname, char *skey, char *passwd, \ + (const char *netname, char *skey, char *passwd, \ int *errnop); DECLARE_NSS_PROTOTYPES (files) @@ -27,4 +28,8 @@ DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES +libc_hidden_proto (authdes_getucred) +libc_hidden_proto (xdr_authdes_cred) +libc_hidden_proto (xdr_authdes_verf) + #endif diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 14928cc67f..07031c9bd9 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -1,4 +1,3 @@ #include <sunrpc/rpc/auth_unix.h> -extern bool_t xdr_authunix_parms_internal (XDR *__xdrs, - struct authunix_parms *__p); +libc_hidden_proto (xdr_authunix_parms) diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 75d88a65ca..d79a6a7b5b 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -4,44 +4,27 @@ /* Now define the internal interfaces. */ extern int _openchild (const char *command, FILE **fto, FILE **ffrom); -extern CLIENT *clnt_create_internal (__const char *__host, - __const u_long __prog, - __const u_long __vers, - __const char *__prot) attribute_hidden; -extern CLIENT *clnttcp_create_internal (struct sockaddr_in *__raddr, - u_long __prog, u_long __version, - int *__sockp, u_int __sendsz, - u_int __recvsz) attribute_hidden; -extern CLIENT *clntudp_create_internal (struct sockaddr_in *__raddr, - u_long __program, u_long __version, - struct timeval __wait_resend, - int *__sockp) attribute_hidden; -extern CLIENT *clntudp_bufcreate_internal (struct sockaddr_in *__raddr, - u_long __program, u_long __version, - struct timeval __wait_resend, - int *__sockp, u_int __sendsz, - u_int __recvsz) attribute_hidden; extern CLIENT *__libc_clntudp_bufcreate (struct sockaddr_in *__raddr, u_long __program, u_long __version, struct timeval __wait_resend, int *__sockp, u_int __sendsz, u_int __recvsz, int __flags); -extern CLIENT *__libc_clntudp_bufcreate_internal (struct sockaddr_in *__raddr, - u_long __program, - u_long __version, - struct timeval __wait_resend, - int *__sockp, u_int __sendsz, - u_int __recvsz, int __flags) - attribute_hidden; -extern CLIENT *clntunix_create_internal (struct sockaddr_un *__raddr, - u_long __program, u_long __version, - int *__sockp, u_int __sendsz, - u_int __recvsz) attribute_hidden; libc_hidden_proto (clnt_sperrno) libc_hidden_proto (clnt_spcreateerror) libc_hidden_proto (clnt_perror) libc_hidden_proto (clnt_sperror) libc_hidden_proto (_rpc_dtablesize) +libc_hidden_proto (callrpc) +libc_hidden_proto (clnt_create) +libc_hidden_proto (clnt_pcreateerror) +libc_hidden_proto (clnt_perrno) +libc_hidden_proto (clntraw_create) +libc_hidden_proto (clnttcp_create) +libc_hidden_proto (clntudp_bufcreate) +libc_hidden_proto (clntudp_create) +libc_hidden_proto (get_myaddress) +libc_hidden_proto (clntunix_create) +libc_hidden_proto (__libc_clntudp_bufcreate) #endif diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h index 8c4a60ecee..44f7e669b0 100644 --- a/include/rpc/des_crypt.h +++ b/include/rpc/des_crypt.h @@ -9,5 +9,7 @@ extern int xdecrypt (char *secret, char *passwd); libc_hidden_proto (des_setparity) libc_hidden_proto (ecb_crypt) libc_hidden_proto (cbc_crypt) +libc_hidden_proto (xencrypt) +libc_hidden_proto (xdecrypt) #endif diff --git a/include/rpc/key_prot.h b/include/rpc/key_prot.h index 2da5de7f70..29d14cc8a0 100644 --- a/include/rpc/key_prot.h +++ b/include/rpc/key_prot.h @@ -1,15 +1,12 @@ #include <sunrpc/rpc/key_prot.h> -extern bool_t xdr_cryptkeyres_internal (XDR *xdrs, cryptkeyres *objp) - attribute_hidden; -extern bool_t xdr_keystatus_internal (XDR *, keystatus*) attribute_hidden; -extern bool_t xdr_keybuf_internal (XDR *, keybuf) attribute_hidden; -extern bool_t xdr_cryptkeyarg_internal (XDR *, cryptkeyarg*) attribute_hidden; -extern bool_t xdr_cryptkeyarg2_internal (XDR *, cryptkeyarg2*) - attribute_hidden; -extern bool_t xdr_key_netstres_internal (XDR *, key_netstres*) - attribute_hidden; -extern bool_t xdr_key_netstarg_internal (XDR *, key_netstarg*) - attribute_hidden; -extern bool_t xdr_netnamestr_internal (XDR *, netnamestr*) attribute_hidden; -extern bool_t xdr_unixcred_internal (XDR *, unixcred*) attribute_hidden; +libc_hidden_proto (xdr_cryptkeyarg) +libc_hidden_proto (xdr_cryptkeyarg2) +libc_hidden_proto (xdr_cryptkeyres) +libc_hidden_proto (xdr_key_netstarg) +libc_hidden_proto (xdr_key_netstres) +libc_hidden_proto (xdr_keybuf) +libc_hidden_proto (xdr_keystatus) +libc_hidden_proto (xdr_getcredres) +libc_hidden_proto (xdr_netnamestr) +libc_hidden_proto (xdr_unixcred) diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index b9a7063bbe..67628e0589 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -14,4 +14,8 @@ extern u_short __libc_rpc_getport (struct sockaddr_in *address, u_long program, internal_function; libc_hidden_proto (__libc_rpc_getport) +libc_hidden_proto (clnt_broadcast) +libc_hidden_proto (pmap_getmaps) +libc_hidden_proto (pmap_rmtcall) + #endif diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 902faba019..2e9076ee3d 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -1,7 +1,4 @@ #include <sunrpc/rpc/pmap_prot.h> - -extern bool_t xdr_pmap_internal (XDR *__xdrs, struct pmap *__regs) - attribute_hidden; -extern bool_t xdr_pmaplist_internal (XDR *__xdrs, struct pmaplist **__rp) - attribute_hidden; +libc_hidden_proto (xdr_pmap) +libc_hidden_proto (xdr_pmaplist) diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index 63e41cab28..e8822dabe9 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -1,7 +1,4 @@ #include <sunrpc/rpc/pmap_rmt.h> -extern bool_t xdr_rmtcall_args_internal (XDR *__xdrs, - struct rmtcallargs *__crp) - attribute_hidden; -extern bool_t xdr_rmtcallres_internal (XDR *__xdrs, struct rmtcallres *__crp) - attribute_hidden; +libc_hidden_proto (xdr_rmtcall_args) +libc_hidden_proto (xdr_rmtcallres) diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index 3e518c93d4..be1f4838c9 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -7,8 +7,11 @@ libc_hidden_proto (_seterr_reply) extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr); extern bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar); -extern bool_t xdr_callmsg_internal (XDR *__xdrs, struct rpc_msg *__cmsg); -extern bool_t xdr_callhdr_internal (XDR *__xdrs, struct rpc_msg *__cmsg); -extern bool_t xdr_replymsg_internal (XDR *__xdrs, struct rpc_msg *__rmsg); + +libc_hidden_proto (xdr_accepted_reply) +libc_hidden_proto (xdr_callhdr) +libc_hidden_proto (xdr_callmsg) +libc_hidden_proto (xdr_rejected_reply) +libc_hidden_proto (xdr_replymsg) #endif diff --git a/include/rpc/svc.h b/include/rpc/svc.h index dc758391a2..141971ecf5 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -10,24 +10,29 @@ libc_hidden_proto (svcerr_noprog) libc_hidden_proto (svcerr_progvers) /* Now define the internal interfaces. */ -extern int registerrpc (u_long prognum, u_long versnum, u_long procnum, - char *(*progname) (char *), xdrproc_t inproc, - xdrproc_t outproc); - extern SVCXPRT *svcfd_create (int fd, u_int sendsize, u_int recvsize); extern int svcudp_enablecache (SVCXPRT *transp, u_long size); extern SVCXPRT *svcunixfd_create (int fd, u_int sendsize, u_int recvsize); -extern bool_t svc_sendreply_internal (SVCXPRT *xprt, xdrproc_t __xdr_results, - caddr_t __xdr_location) attribute_hidden; -extern void svcerr_decode_internal (SVCXPRT *__xprt) attribute_hidden; -extern void svc_getreq_internal (int __rdfds) attribute_hidden; -extern void svc_getreq_common_internal (const int __fd) attribute_hidden; -extern void svc_getreqset_internal (fd_set *__readfds) attribute_hidden; -extern void svc_getreq_poll_internal (struct pollfd *, - const int) attribute_hidden; -extern SVCXPRT *svcudp_create_internal (int __sock) attribute_hidden; -extern SVCXPRT *svcudp_bufcreate_internal (int __sock, u_int __sendsz, - u_int __recvsz) attribute_hidden; + +libc_hidden_proto (svc_exit) +libc_hidden_proto (svc_getreq) +libc_hidden_proto (svc_getreqset) +libc_hidden_proto (svc_run) +libc_hidden_proto (svc_sendreply) +libc_hidden_proto (svcerr_decode) +libc_hidden_proto (svcerr_noproc) +libc_hidden_proto (svcerr_systemerr) +libc_hidden_proto (svcerr_weakauth) +libc_hidden_proto (svcfd_create) +libc_hidden_proto (svcraw_create) +libc_hidden_proto (svctcp_create) +libc_hidden_proto (svcudp_bufcreate) +libc_hidden_proto (svcudp_create) +libc_hidden_proto (svcudp_enablecache) +libc_hidden_proto (svcunix_create) +libc_hidden_proto (svcunixfd_create) +libc_hidden_proto (svc_getreq_common) +libc_hidden_proto (svc_getreq_poll) #endif diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index bf5ce91b68..582bb31aea 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -6,7 +6,7 @@ extern enum auth_stat _svcauth_unix (struct svc_req *rqst, struct rpc_msg *msg); extern enum auth_stat _svcauth_short (struct svc_req *rqst, struct rpc_msg *msg); -extern enum auth_stat _authenticate_internal (struct svc_req *__rqst, - struct rpc_msg *__msg) attribute_hidden; + +libc_hidden_proto (_authenticate) #endif diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index e10d53e3b1..57971d0758 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -1,54 +1,47 @@ #include <sunrpc/rpc/xdr.h> -extern bool_t xdr_void_internal (void) attribute_hidden; -extern bool_t xdr_bool_internal (XDR *__xdrs, bool_t *__bp) attribute_hidden; -extern bool_t xdr_u_hyper_internal (XDR *__xdrs, u_quad_t *__ullp) - attribute_hidden; -extern bool_t xdr_u_long_internal (XDR *__xdrs, u_long *__ulp) - attribute_hidden; -extern bool_t xdr_u_int_internal (XDR *__xdrs, u_int *__up) - attribute_hidden; -extern bool_t xdr_u_short_internal (XDR *__xdrs, u_short *__usp) - attribute_hidden; -extern bool_t xdr_hyper_internal (XDR *__xdrs, quad_t *__ullp) - attribute_hidden; -extern bool_t xdr_long_internal (XDR *__xdrs, long *__ulp) - attribute_hidden; -extern bool_t xdr_int_internal (XDR *__xdrs, int *__up) - attribute_hidden; -extern bool_t xdr_short_internal (XDR *__xdrs, short *__usp) - attribute_hidden; -extern bool_t xdr_enum_internal (XDR *__xdrs, enum_t *__ep) - attribute_hidden; -extern bool_t xdr_union_internal (XDR *__xdrs, enum_t *__dscmp, char *__unp, - const struct xdr_discrim *choices, - xdrproc_t dfault) attribute_hidden; -extern bool_t xdr_string_internal (XDR *__xdrs, char **__cpp, u_int __maxsize); -extern bool_t xdr_array_internal (XDR * _xdrs, caddr_t *__addrp, - u_int *__sizep, u_int __maxsize, - u_int __elsize, xdrproc_t __elproc) - attribute_hidden; -extern bool_t xdr_reference_internal (XDR *__xdrs, caddr_t *__xpp, - u_int __size, xdrproc_t __proc) - attribute_hidden; -extern bool_t xdr_bytes_internal (XDR *xdrs, char **cpp, u_int *sizep, - u_int maxsize) attribute_hidden; -extern bool_t xdr_netobj_internal (XDR *__xdrs, struct netobj *__np) - attribute_hidden; -extern bool_t xdr_opaque_internal (XDR *__xdrs, caddr_t __cp, u_int __cnt) - attribute_hidden; -extern void xdrrec_create_internal (XDR *__xdrs, u_int __sendsize, - u_int __recvsize, caddr_t __tcp_handle, - int (*__readit) (char *, char *, int), - int (*__writeit) (char *, char *, int)) - attribute_hidden; -extern void xdrmem_create_internal (XDR *, const caddr_t, u_int, enum xdr_op) - attribute_hidden; -extern bool_t xdrrec_endofrecord_internal (XDR *__xdrs, bool_t __sendnow) - attribute_hidden; -extern bool_t xdrrec_skiprecord_internal (XDR *__xdrs) - attribute_hidden; -extern bool_t xdrrec_eof_internal (XDR *__xdrs) - attribute_hidden; - libc_hidden_proto (xdrstdio_create) +libc_hidden_proto (xdr_array) +libc_hidden_proto (xdr_bool) +libc_hidden_proto (xdr_bytes) +libc_hidden_proto (xdr_char) +libc_hidden_proto (xdr_double) +libc_hidden_proto (xdr_enum) +libc_hidden_proto (xdr_float) +libc_hidden_proto (xdr_free) +libc_hidden_proto (xdr_int) +libc_hidden_proto (xdr_long) +libc_hidden_proto (xdr_netobj) +libc_hidden_proto (xdr_opaque) +libc_hidden_proto (xdr_pointer) +libc_hidden_proto (xdr_reference) +libc_hidden_proto (xdr_short) +libc_hidden_proto (xdr_string) +libc_hidden_proto (xdr_u_char) +libc_hidden_proto (xdr_u_int) +libc_hidden_proto (xdr_u_long) +libc_hidden_proto (xdr_u_short) +libc_hidden_proto (xdr_union) +libc_hidden_proto (xdr_vector) +libc_hidden_proto (xdr_void) +libc_hidden_proto (xdr_wrapstring) +libc_hidden_proto (xdrmem_create) +libc_hidden_proto (xdrrec_create) +libc_hidden_proto (xdrrec_endofrecord) +libc_hidden_proto (xdrrec_eof) +libc_hidden_proto (xdrrec_skiprecord) +libc_hidden_proto (xdr_int16_t) +libc_hidden_proto (xdr_int32_t) +libc_hidden_proto (xdr_int8_t) +libc_hidden_proto (xdr_sizeof) +libc_hidden_proto (xdr_uint16_t) +libc_hidden_proto (xdr_uint32_t) +libc_hidden_proto (xdr_uint8_t) +libc_hidden_proto (xdr_hyper) +libc_hidden_proto (xdr_u_hyper) +libc_hidden_proto (xdr_longlong_t) +libc_hidden_proto (xdr_u_longlong_t) +libc_hidden_proto (xdr_int64_t) +libc_hidden_proto (xdr_uint64_t) +libc_hidden_proto (xdr_quad_t) +libc_hidden_proto (xdr_u_quad_t) |