Attachment #390596 for bug #530080

Lines 289-295 struct xdr_discrim { Link Here

(-)./tirpc/rpc/xdr.h.orig (+16 lines)
289	/*	289	/*
290	* These are the "generic" xdr routines.	290	* These are the "generic" xdr routines.
291	*/	291	*/
		292	#ifdef __GLIBC__
292	__BEGIN_DECLS	293	__BEGIN_DECLS
		294	#elif defined(__cplusplus)
		295	extern "C" {
		296	#endif
293	extern bool_t xdr_void(void);	297	extern bool_t xdr_void(void);
294	extern bool_t xdr_int(XDR , int );	298	extern bool_t xdr_int(XDR , int );
295	extern bool_t xdr_u_int(XDR , u_int );	299	extern bool_t xdr_u_int(XDR , u_int );
Lines 332-338 extern bool_t xdr_hyper(XDR , quad_t ) Link Here
332	extern bool_t xdr_u_hyper(XDR , u_quad_t );	336	extern bool_t xdr_u_hyper(XDR , u_quad_t );
333	extern bool_t xdr_longlong_t(XDR , quad_t );	337	extern bool_t xdr_longlong_t(XDR , quad_t );
334	extern bool_t xdr_u_longlong_t(XDR , u_quad_t );	338	extern bool_t xdr_u_longlong_t(XDR , u_quad_t );
		339	#ifdef __GLIBC__
335	__END_DECLS	340	__END_DECLS
		341	#elif defined(__cplusplus)
		342	}
		343	#endif
336		344
337	/*	345	/*
338	* Common opaque bytes objects used by many rpc protocols;	346	* Common opaque bytes objects used by many rpc protocols;
Lines 350-356 extern bool_t xdr_netobj(XDR *, struct Link Here
350	* These are the public routines for the various implementations of	358	* These are the public routines for the various implementations of
351	* xdr streams.	359	* xdr streams.
352	*/	360	*/
		361	#ifdef __GLIBC__
353	__BEGIN_DECLS	362	__BEGIN_DECLS
		363	#elif defined(__cplusplus)
		364	extern "C" {
		365	#endif
354	/* XDR using memory buffers */	366	/* XDR using memory buffers */
355	extern void xdrmem_create(XDR , char , u_int, enum xdr_op);	367	extern void xdrmem_create(XDR , char , u_int, enum xdr_op);
356		368
Lines 371-376 extern bool_t xdrrec_skiprecord(XDR *); Link Here
371	/* true if no more input */	383	/* true if no more input */
372	extern bool_t xdrrec_eof(XDR *);	384	extern bool_t xdrrec_eof(XDR *);
373	extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);	385	extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
		386	#ifdef __GLIBC__
374	__END_DECLS	387	__END_DECLS
		388	#elif defined(__cplusplus)
		389	}
		390	#endif
375		391
376	#endif /* !_TIRPC_XDR_H */	392	#endif /* !_TIRPC_XDR_H */

Lines 114-130 struct authdes_verf { Link Here

(-)./tirpc/rpc/auth_des.h.orig (+16 lines)
114	* Map a des credential into a unix cred.	114	* Map a des credential into a unix cred.
115	*	115	*
116	*/	116	*/
		117	#ifdef __GLIBC__
117	__BEGIN_DECLS	118	__BEGIN_DECLS
		119	#elif defined(__cplusplus)
		120	extern "C" {
		121	#endif
118	extern int authdes_getucred( struct authdes_cred , uid_t , gid_t , int , gid_t * );	122	extern int authdes_getucred( struct authdes_cred , uid_t , gid_t , int , gid_t * );
		123	#ifdef __GLIBC__
119	__END_DECLS	124	__END_DECLS
		125	#elif defined(__cplusplus)
		126	}
		127	#endif
120		128
		129	#ifdef __GLIBC__
121	__BEGIN_DECLS	130	__BEGIN_DECLS
		131	#elif defined(__cplusplus)
		132	extern "C" {
		133	#endif
122	extern bool_t xdr_authdes_cred(XDR , struct authdes_cred );	134	extern bool_t xdr_authdes_cred(XDR , struct authdes_cred );
123	extern bool_t xdr_authdes_verf(XDR , struct authdes_verf );	135	extern bool_t xdr_authdes_verf(XDR , struct authdes_verf );
124	extern int rtime(dev_t, struct netbuf , int, struct timeval ,	136	extern int rtime(dev_t, struct netbuf , int, struct timeval ,
125	struct timeval *);	137	struct timeval *);
126	extern void kgetnetname(char *);	138	extern void kgetnetname(char *);
127	extern enum auth_stat _svcauth_des(struct svc_req , struct rpc_msg );	139	extern enum auth_stat _svcauth_des(struct svc_req , struct rpc_msg );
		140	#ifdef __GLIBC__
128	__END_DECLS	141	__END_DECLS
		142	#elif defined(__cplusplus)
		143	}
		144	#endif
129		145
130	#endif /* ndef _TI_AUTH_DES_ */	146	#endif /* ndef _TI_AUTH_DES_ */

Lines 99-108 struct pmaplist { Link Here

(-)./tirpc/rpc/pmap_prot.h.orig (+8 lines)
99	struct pmaplist *pml_next;	99	struct pmaplist *pml_next;
100	};	100	};
101		101
		102	#ifdef __GLIBC__
102	__BEGIN_DECLS	103	__BEGIN_DECLS
		104	#elif defined(__cplusplus)
		105	extern "C" {
		106	#endif
103	extern bool_t xdr_pmap(XDR , struct pmap );	107	extern bool_t xdr_pmap(XDR , struct pmap );
104	extern bool_t xdr_pmaplist(XDR , struct pmaplist *);	108	extern bool_t xdr_pmaplist(XDR , struct pmaplist *);
105	extern bool_t xdr_pmaplist_ptr(XDR , struct pmaplist );	109	extern bool_t xdr_pmaplist_ptr(XDR , struct pmaplist );
		110	#ifdef __GLIBC__
106	__END_DECLS	111	__END_DECLS
		112	#elif defined(__cplusplus)
		113	}
		114	#endif
107		115
108	#endif /* !_RPC_PMAP_PROT_H */	116	#endif /* !_RPC_PMAP_PROT_H */

Lines 166-174 union des_block { Link Here

(-)./tirpc/rpc/auth.h.orig (+88 lines)
166	char c[8];	166	char c[8];
167	};	167	};
168	typedef union des_block des_block;	168	typedef union des_block des_block;
		169	#ifdef __GLIBC__
169	__BEGIN_DECLS	170	__BEGIN_DECLS
		171	#elif defined(__cplusplus)
		172	extern "C" {
		173	#endif
170	extern bool_t xdr_des_block(XDR , des_block );	174	extern bool_t xdr_des_block(XDR , des_block );
		175	#ifdef __GLIBC__
171	__END_DECLS	176	__END_DECLS
		177	#elif defined(__cplusplus)
		178	}
		179	#endif
172		180
173	/*	181	/*
174	* Authentication info. Opaque to client.	182	* Authentication info. Opaque to client.
Lines 279-287 auth_put(AUTH *auth) Link Here
279	xfunc, xwhere))	287	xfunc, xwhere))
280		288
281		289
		290	#ifdef __GLIBC__
282	__BEGIN_DECLS	291	__BEGIN_DECLS
		292	#elif defined(__cplusplus)
		293	extern "C" {
		294	#endif
283	extern struct opaque_auth _null_auth;	295	extern struct opaque_auth _null_auth;
		296	#ifdef __GLIBC__
284	__END_DECLS	297	__END_DECLS
		298	#elif defined(__cplusplus)
		299	}
		300	#endif
285		301
286	/*	302	/*
287	* Any style authentication. These routines can be used by any	303	* Any style authentication. These routines can be used by any
Lines 302-312 int authany_wrap(void), authany_unwrap(v Link Here
302	* int len;	318	* int len;
303	* int *aup_gids;	319	* int *aup_gids;
304	*/	320	*/
		321	#ifdef __GLIBC__
305	__BEGIN_DECLS	322	__BEGIN_DECLS
		323	#elif defined(__cplusplus)
		324	extern "C" {
		325	#endif
306	extern AUTH authunix_create(char , uid_t, uid_t, int, uid_t *);	326	extern AUTH authunix_create(char , uid_t, uid_t, int, uid_t *);
307	extern AUTH authunix_create_default(void); / takes no parameters */	327	extern AUTH authunix_create_default(void); / takes no parameters */
308	extern AUTH authnone_create(void); / takes no parameters */	328	extern AUTH authnone_create(void); / takes no parameters */
		329	#ifdef __GLIBC__
309	__END_DECLS	330	__END_DECLS
		331	#elif defined(__cplusplus)
		332	}
		333	#endif
310	/*	334	/*
311	* DES style authentication	335	* DES style authentication
312	* AUTH *authsecdes_create(servername, window, timehost, ckey)	336	* AUTH *authsecdes_create(servername, window, timehost, ckey)
Lines 315-329 __END_DECLS Link Here
315	* const char *timehost; - optional hostname to sync with	339	* const char *timehost; - optional hostname to sync with
316	* des_block *ckey; - optional conversation key to use	340	* des_block *ckey; - optional conversation key to use
317	*/	341	*/
		342	#ifdef __GLIBC__
318	__BEGIN_DECLS	343	__BEGIN_DECLS
		344	#elif defined(__cplusplus)
		345	extern "C" {
		346	#endif
319	extern AUTH authdes_create (char , u_int, struct sockaddr , des_block );	347	extern AUTH authdes_create (char , u_int, struct sockaddr , des_block );
320	extern AUTH authdes_seccreate (const char , const u_int, const char *,	348	extern AUTH authdes_seccreate (const char , const u_int, const char *,
321	const des_block *);	349	const des_block *);
		350	#ifdef __GLIBC__
322	__END_DECLS	351	__END_DECLS
		352	#elif defined(__cplusplus)
		353	}
		354	#endif
323		355
		356	#ifdef __GLIBC__
324	__BEGIN_DECLS	357	__BEGIN_DECLS
		358	#elif defined(__cplusplus)
		359	extern "C" {
		360	#endif
325	extern bool_t xdr_opaque_auth (XDR , struct opaque_auth );	361	extern bool_t xdr_opaque_auth (XDR , struct opaque_auth );
		362	#ifdef __GLIBC__
326	__END_DECLS	363	__END_DECLS
		364	#elif defined(__cplusplus)
		365	}
		366	#endif
327		367
328	#define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))	368	#define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
329	#define authsys_create_default() authunix_create_default()	369	#define authsys_create_default() authunix_create_default()
Lines 331-366 __END_DECLS Link Here
331	/*	371	/*
332	* Netname manipulation routines.	372	* Netname manipulation routines.
333	*/	373	*/
		374	#ifdef __GLIBC__
334	__BEGIN_DECLS	375	__BEGIN_DECLS
		376	#elif defined(__cplusplus)
		377	extern "C" {
		378	#endif
335	extern int getnetname(char *);	379	extern int getnetname(char *);
336	extern int host2netname(char , const char , const char *);	380	extern int host2netname(char , const char , const char *);
337	extern int user2netname(char , const uid_t, const char );	381	extern int user2netname(char , const uid_t, const char );
338	extern int netname2user(char , uid_t , gid_t , int , gid_t *);	382	extern int netname2user(char , uid_t , gid_t , int , gid_t *);
339	extern int netname2host(char , char , const int);	383	extern int netname2host(char , char , const int);
340	extern void passwd2des ( char , char );	384	extern void passwd2des ( char , char );
		385	#ifdef __GLIBC__
341	__END_DECLS	386	__END_DECLS
		387	#elif defined(__cplusplus)
		388	}
		389	#endif
342		390
343	/*	391	/*
344	*	392	*
345	* These routines interface to the keyserv daemon	393	* These routines interface to the keyserv daemon
346	*	394	*
347	*/	395	*/
		396	#ifdef __GLIBC__
348	__BEGIN_DECLS	397	__BEGIN_DECLS
		398	#elif defined(__cplusplus)
		399	extern "C" {
		400	#endif
349	extern int key_decryptsession(const char , des_block );	401	extern int key_decryptsession(const char , des_block );
350	extern int key_encryptsession(const char , des_block );	402	extern int key_encryptsession(const char , des_block );
351	extern int key_gendes(des_block *);	403	extern int key_gendes(des_block *);
352	extern int key_setsecret(const char *);	404	extern int key_setsecret(const char *);
353	extern int key_secretkey_is_set(void);	405	extern int key_secretkey_is_set(void);
		406	#ifdef __GLIBC__
354	__END_DECLS	407	__END_DECLS
		408	#elif defined(__cplusplus)
		409	}
		410	#endif
355		411
356	/*	412	/*
357	* Publickey routines.	413	* Publickey routines.
358	*/	414	*/
		415	#ifdef __GLIBC__
359	__BEGIN_DECLS	416	__BEGIN_DECLS
		417	#elif defined(__cplusplus)
		418	extern "C" {
		419	#endif
360	extern int getpublickey (const char , char );	420	extern int getpublickey (const char , char );
361	extern int getpublicandprivatekey (char , char );	421	extern int getpublicandprivatekey (char , char );
362	extern int getsecretkey (char , char , char *);	422	extern int getsecretkey (char , char , char *);
		423	#ifdef __GLIBC__
363	__END_DECLS	424	__END_DECLS
		425	#elif defined(__cplusplus)
		426	}
		427	#endif
364		428
365	#ifdef KERBEROS	429	#ifdef KERBEROS
366	/*	430	/*
Lines 373-382 __END_DECLS Link Here
373	* const char *timehost; - optional hostname to sync with	437	* const char *timehost; - optional hostname to sync with
374	* int *status; - kerberos status returned	438	* int *status; - kerberos status returned
375	*/	439	*/
		440	#ifdef __GLIBC__
376	__BEGIN_DECLS	441	__BEGIN_DECLS
		442	#elif defined(__cplusplus)
		443	extern "C" {
		444	#endif
377	extern AUTH authkerb_seccreate(const char , const char , const char ,	445	extern AUTH authkerb_seccreate(const char , const char , const char ,
378	const u_int, const char , int );	446	const u_int, const char , int );
		447	#ifdef __GLIBC__
379	__END_DECLS	448	__END_DECLS
		449	#elif defined(__cplusplus)
		450	}
		451	#endif
380		452
381	/*	453	/*
382	* Map a kerberos credential into a unix cred.	454	* Map a kerberos credential into a unix cred.
Lines 389-408 __END_DECLS Link Here
389	* int *groups;	461	* int *groups;
390	*	462	*
391	*/	463	*/
		464	#ifdef __GLIBC__
392	__BEGIN_DECLS	465	__BEGIN_DECLS
		466	#elif defined(__cplusplus)
		467	extern "C" {
		468	#endif
393	extern int authkerb_getucred(/* struct svc_req , uid_t , gid_t *,	469	extern int authkerb_getucred(/* struct svc_req , uid_t , gid_t *,
394	short , int */);	470	short , int */);
		471	#ifdef __GLIBC__
395	__END_DECLS	472	__END_DECLS
		473	#elif defined(__cplusplus)
		474	}
		475	#endif
396	#endif /* KERBEROS */	476	#endif /* KERBEROS */
397		477
		478	#ifdef __GLIBC__
398	__BEGIN_DECLS	479	__BEGIN_DECLS
		480	#elif defined(__cplusplus)
		481	extern "C" {
		482	#endif
399	struct svc_req;	483	struct svc_req;
400	struct rpc_msg;	484	struct rpc_msg;
401	enum auth_stat _svcauth_none (struct svc_req , struct rpc_msg );	485	enum auth_stat _svcauth_none (struct svc_req , struct rpc_msg );
402	enum auth_stat _svcauth_short (struct svc_req , struct rpc_msg );	486	enum auth_stat _svcauth_short (struct svc_req , struct rpc_msg );
403	enum auth_stat _svcauth_unix (struct svc_req , struct rpc_msg );	487	enum auth_stat _svcauth_unix (struct svc_req , struct rpc_msg );
404	enum auth_stat _svcauth_gss (struct svc_req , struct rpc_msg , bool_t *);	488	enum auth_stat _svcauth_gss (struct svc_req , struct rpc_msg , bool_t *);
		489	#ifdef __GLIBC__
405	__END_DECLS	490	__END_DECLS
		491	#elif defined(__cplusplus)
		492	}
		493	#endif
406		494
407	#define AUTH_NONE 0 /* no authentication */	495	#define AUTH_NONE 0 /* no authentication */
408	#define AUTH_NULL 0 /* backward compatibility */	496	#define AUTH_NULL 0 /* backward compatibility */

Lines 202-212 struct svc_req { Link Here

(-)./tirpc/rpc/svc.h.orig (+64 lines)
202	* const struct netconfig *nconf;	202	* const struct netconfig *nconf;
203	*/	203	*/
204		204
		205	#ifdef __GLIBC__
205	__BEGIN_DECLS	206	__BEGIN_DECLS
		207	#elif defined(__cplusplus)
		208	extern "C" {
		209	#endif
206	extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,	210	extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
207	void ()(struct svc_req , SVCXPRT *),	211	void ()(struct svc_req , SVCXPRT *),
208	const struct netconfig *);	212	const struct netconfig *);
		213	#ifdef __GLIBC__
209	__END_DECLS	214	__END_DECLS
		215	#elif defined(__cplusplus)
		216	}
		217	#endif
210		218
211	/*	219	/*
212	* Service un-registration	220	* Service un-registration
Lines 216-224 __END_DECLS Link Here
216	* const rpcvers_t vers;	224	* const rpcvers_t vers;
217	*/	225	*/
218		226
		227	#ifdef __GLIBC__
219	__BEGIN_DECLS	228	__BEGIN_DECLS
		229	#elif defined(__cplusplus)
		230	extern "C" {
		231	#endif
220	extern void svc_unreg(const rpcprog_t, const rpcvers_t);	232	extern void svc_unreg(const rpcprog_t, const rpcvers_t);
		233	#ifdef __GLIBC__
221	__END_DECLS	234	__END_DECLS
		235	#elif defined(__cplusplus)
		236	}
		237	#endif
222		238
223	/*	239	/*
224	* Transport registration.	240	* Transport registration.
Lines 226-234 __END_DECLS Link Here
226	* xprt_register(xprt)	242	* xprt_register(xprt)
227	* SVCXPRT *xprt;	243	* SVCXPRT *xprt;
228	*/	244	*/
		245	#ifdef __GLIBC__
229	__BEGIN_DECLS	246	__BEGIN_DECLS
		247	#elif defined(__cplusplus)
		248	extern "C" {
		249	#endif
230	extern void xprt_register(SVCXPRT *);	250	extern void xprt_register(SVCXPRT *);
		251	#ifdef __GLIBC__
231	__END_DECLS	252	__END_DECLS
		253	#elif defined(__cplusplus)
		254	}
		255	#endif
232		256
233	/*	257	/*
234	* Transport un-register	258	* Transport un-register
Lines 236-244 __END_DECLS Link Here
236	* xprt_unregister(xprt)	260	* xprt_unregister(xprt)
237	* SVCXPRT *xprt;	261	* SVCXPRT *xprt;
238	*/	262	*/
		263	#ifdef __GLIBC__
239	__BEGIN_DECLS	264	__BEGIN_DECLS
		265	#elif defined(__cplusplus)
		266	extern "C" {
		267	#endif
240	extern void xprt_unregister(SVCXPRT *);	268	extern void xprt_unregister(SVCXPRT *);
		269	#ifdef __GLIBC__
241	__END_DECLS	270	__END_DECLS
		271	#elif defined(__cplusplus)
		272	}
		273	#endif
242		274
243		275
244	/*	276	/*
Lines 267-273 __END_DECLS Link Here
267	* deadlock the caller and server processes!	299	* deadlock the caller and server processes!
268	*/	300	*/
269		301
		302	#ifdef __GLIBC__
270	__BEGIN_DECLS	303	__BEGIN_DECLS
		304	#elif defined(__cplusplus)
		305	extern "C" {
		306	#endif
271	extern bool_t svc_sendreply(SVCXPRT , xdrproc_t, void );	307	extern bool_t svc_sendreply(SVCXPRT , xdrproc_t, void );
272	extern void svcerr_decode(SVCXPRT *);	308	extern void svcerr_decode(SVCXPRT *);
273	extern void svcerr_weakauth(SVCXPRT *);	309	extern void svcerr_weakauth(SVCXPRT *);
Lines 279-285 extern void svcerr_systemerr(SVCXPRT *); Link Here
279	extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,	315	extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
280	char ()(char *), xdrproc_t, xdrproc_t,	316	char ()(char *), xdrproc_t, xdrproc_t,
281	char *);	317	char *);
		318	#ifdef __GLIBC__
282	__END_DECLS	319	__END_DECLS
		320	#elif defined(__cplusplus)
		321	}
		322	#endif
283		323
284	/*	324	/*
285	* Lowest level dispatching -OR- who owns this process anyway.	325	* Lowest level dispatching -OR- who owns this process anyway.
Lines 308-318 extern int svc_fds; Link Here
308	* a small program implemented by the svc_rpc implementation itself;	348	* a small program implemented by the svc_rpc implementation itself;
309	* also see clnt.h for protocol numbers.	349	* also see clnt.h for protocol numbers.
310	*/	350	*/
		351	#ifdef __GLIBC__
311	__BEGIN_DECLS	352	__BEGIN_DECLS
		353	#elif defined(__cplusplus)
		354	extern "C" {
		355	#endif
312	extern void rpctest_service(void);	356	extern void rpctest_service(void);
		357	#ifdef __GLIBC__
313	__END_DECLS	358	__END_DECLS
		359	#elif defined(__cplusplus)
		360	}
		361	#endif
314		362
		363	#ifdef __GLIBC__
315	__BEGIN_DECLS	364	__BEGIN_DECLS
		365	#elif defined(__cplusplus)
		366	extern "C" {
		367	#endif
316	extern void svc_getreq(int);	368	extern void svc_getreq(int);
317	extern void svc_getreqset(fd_set *);	369	extern void svc_getreqset(fd_set *);
318	extern void svc_getreq_common(int);	370	extern void svc_getreq_common(int);
Lines 321-327 extern void svc_getreq_poll(struct pollf Link Here
321		373
322	extern void svc_run(void);	374	extern void svc_run(void);
323	extern void svc_exit(void);	375	extern void svc_exit(void);
		376	#ifdef __GLIBC__
324	__END_DECLS	377	__END_DECLS
		378	#elif defined(__cplusplus)
		379	}
		380	#endif
325		381
326	/*	382	/*
327	* Socket to use on svcxxx_create call to get default socket	383	* Socket to use on svcxxx_create call to get default socket
Lines 333-339 __END_DECLS Link Here
333	* These are the existing service side transport implementations	389	* These are the existing service side transport implementations
334	*/	390	*/
335		391
		392	#ifdef __GLIBC__
336	__BEGIN_DECLS	393	__BEGIN_DECLS
		394	#elif defined(__cplusplus)
		395	extern "C" {
		396	#endif
337	/*	397	/*
338	* Transport independent svc_create routine.	398	* Transport independent svc_create routine.
339	*/	399	*/
Lines 429-435 int svc_dg_enablecache(SVCXPRT *, const Link Here
429		489
430	int __rpc_get_local_uid(SVCXPRT _transp, uid_t _uid);	490	int __rpc_get_local_uid(SVCXPRT _transp, uid_t _uid);
431		491
		492	#ifdef __GLIBC__
432	__END_DECLS	493	__END_DECLS
		494	#elif defined(__cplusplus)
		495	}
		496	#endif
433		497
434		498
435	/* for backward compatibility */	499	/* for backward compatibility */

Lines 79-85 Link Here

(-)./tirpc/rpc/rpc.h.orig (+16 lines)
79	#define UDPMSGSIZE 8800	79	#define UDPMSGSIZE 8800
80	#endif	80	#endif
81		81
		82	#ifdef __GLIBC__
82	__BEGIN_DECLS	83	__BEGIN_DECLS
		84	#elif defined(__cplusplus)
		85	extern "C" {
		86	#endif
83	extern int get_myaddress(struct sockaddr_in *);	87	extern int get_myaddress(struct sockaddr_in *);
84	extern int bindresvport(int, struct sockaddr_in *) __THROW;	88	extern int bindresvport(int, struct sockaddr_in *) __THROW;
85	extern int registerrpc(int, int, int, char ()(char [UDPMSGSIZE]),	89	extern int registerrpc(int, int, int, char ()(char [UDPMSGSIZE]),
Lines 93-110 struct netbuf *uaddr2taddr(const struct Link Here
93		97
94	struct sockaddr;	98	struct sockaddr;
95	extern int bindresvport_sa(int, struct sockaddr *);	99	extern int bindresvport_sa(int, struct sockaddr *);
		100	#ifdef __GLIBC__
96	__END_DECLS	101	__END_DECLS
		102	#elif defined(__cplusplus)
		103	}
		104	#endif
97		105
98	/*	106	/*
99	* The following are not exported interfaces, they are for internal library	107	* The following are not exported interfaces, they are for internal library
100	* and rpcbind use only. Do not use, they may change without notice.	108	* and rpcbind use only. Do not use, they may change without notice.
101	*/	109	*/
		110	#ifdef __GLIBC__
102	__BEGIN_DECLS	111	__BEGIN_DECLS
		112	#elif defined(__cplusplus)
		113	extern "C" {
		114	#endif
103	int __rpc_nconf2fd(const struct netconfig *);	115	int __rpc_nconf2fd(const struct netconfig *);
104	int __rpc_nconf2fd_flags(const struct netconfig *, int);	116	int __rpc_nconf2fd_flags(const struct netconfig *, int);
105	int __rpc_nconf2sockinfo(const struct netconfig , struct __rpc_sockinfo );	117	int __rpc_nconf2sockinfo(const struct netconfig , struct __rpc_sockinfo );
106	int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);	118	int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
107	u_int __rpc_get_t_size(int, int, int);	119	u_int __rpc_get_t_size(int, int, int);
		120	#ifdef __GLIBC__
108	__END_DECLS	121	__END_DECLS
		122	#elif defined(__cplusplus)
		123	}
		124	#endif
109		125
110	#endif /* !_RPC_RPC_H */	126	#endif /* !_RPC_RPC_H */

Lines 66-75 Link Here

(-)./tirpc/rpc/svc_soc.h.orig (+48 lines)
66	* void (*dispatch)();	66	* void (*dispatch)();
67	* int protocol; like TCP or UDP, zero means do not register	67	* int protocol; like TCP or UDP, zero means do not register
68	*/	68	*/
		69	#ifdef __GLIBC__
69	__BEGIN_DECLS	70	__BEGIN_DECLS
		71	#elif defined(__cplusplus)
		72	extern "C" {
		73	#endif
70	extern bool_t svc_register(SVCXPRT *, u_long, u_long,	74	extern bool_t svc_register(SVCXPRT *, u_long, u_long,
71	void ()(struct svc_req , SVCXPRT *), int);	75	void ()(struct svc_req , SVCXPRT *), int);
		76	#ifdef __GLIBC__
72	__END_DECLS	77	__END_DECLS
		78	#elif defined(__cplusplus)
		79	}
		80	#endif
73		81
74	/*	82	/*
75	* Service un-registration	83	* Service un-registration
Lines 78-121 __END_DECLS Link Here
78	* u_long prog;	86	* u_long prog;
79	* u_long vers;	87	* u_long vers;
80	*/	88	*/
		89	#ifdef __GLIBC__
81	__BEGIN_DECLS	90	__BEGIN_DECLS
		91	#elif defined(__cplusplus)
		92	extern "C" {
		93	#endif
82	extern void svc_unregister(u_long, u_long);	94	extern void svc_unregister(u_long, u_long);
		95	#ifdef __GLIBC__
83	__END_DECLS	96	__END_DECLS
		97	#elif defined(__cplusplus)
		98	}
		99	#endif
84		100
85		101
86	/*	102	/*
87	* Memory based rpc for testing and timing.	103	* Memory based rpc for testing and timing.
88	*/	104	*/
		105	#ifdef __GLIBC__
89	__BEGIN_DECLS	106	__BEGIN_DECLS
		107	#elif defined(__cplusplus)
		108	extern "C" {
		109	#endif
90	extern SVCXPRT *svcraw_create(void);	110	extern SVCXPRT *svcraw_create(void);
		111	#ifdef __GLIBC__
91	__END_DECLS	112	__END_DECLS
		113	#elif defined(__cplusplus)
		114	}
		115	#endif
92		116
93		117
94	/*	118	/*
95	* Udp based rpc.	119	* Udp based rpc.
96	*/	120	*/
		121	#ifdef __GLIBC__
97	__BEGIN_DECLS	122	__BEGIN_DECLS
		123	#elif defined(__cplusplus)
		124	extern "C" {
		125	#endif
98	extern SVCXPRT *svcudp_create(int);	126	extern SVCXPRT *svcudp_create(int);
99	extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);	127	extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
100	extern int svcudp_enablecache(SVCXPRT *, u_long);	128	extern int svcudp_enablecache(SVCXPRT *, u_long);
101	extern SVCXPRT *svcudp6_create(int);	129	extern SVCXPRT *svcudp6_create(int);
102	extern SVCXPRT *svcudp6_bufcreate(int, u_int, u_int);	130	extern SVCXPRT *svcudp6_bufcreate(int, u_int, u_int);
		131	#ifdef __GLIBC__
103	__END_DECLS	132	__END_DECLS
		133	#elif defined(__cplusplus)
		134	}
		135	#endif
104		136
105		137
106	/*	138	/*
107	* Tcp based rpc.	139	* Tcp based rpc.
108	*/	140	*/
		141	#ifdef __GLIBC__
109	__BEGIN_DECLS	142	__BEGIN_DECLS
		143	#elif defined(__cplusplus)
		144	extern "C" {
		145	#endif
110	extern SVCXPRT *svctcp_create(int, u_int, u_int);	146	extern SVCXPRT *svctcp_create(int, u_int, u_int);
111	extern SVCXPRT *svctcp6_create(int, u_int, u_int);	147	extern SVCXPRT *svctcp6_create(int, u_int, u_int);
		148	#ifdef __GLIBC__
112	__END_DECLS	149	__END_DECLS
		150	#elif defined(__cplusplus)
		151	}
		152	#endif
113		153
114	/*	154	/*
115	* Fd based rpc.	155	* Fd based rpc.
116	*/	156	*/
		157	#ifdef __GLIBC__
117	__BEGIN_DECLS	158	__BEGIN_DECLS
		159	#elif defined(__cplusplus)
		160	extern "C" {
		161	#endif
118	extern SVCXPRT *svcfd_create(int, u_int, u_int);	162	extern SVCXPRT *svcfd_create(int, u_int, u_int);
		163	#ifdef __GLIBC__
119	__END_DECLS	164	__END_DECLS
		165	#elif defined(__cplusplus)
		166	}
		167	#endif
120		168
121	#endif /* !_RPC_SVC_SOC_H */	169	#endif /* !_RPC_SVC_SOC_H */

Lines 63-89 Link Here

(-)./tirpc/rpc/clnt_soc.h.orig (+32 lines)
63	* u_int sendsz;	63	* u_int sendsz;
64	* u_int recvsz;	64	* u_int recvsz;
65	*/	65	*/
		66	#ifdef __GLIBC__
66	__BEGIN_DECLS	67	__BEGIN_DECLS
		68	#elif defined(__cplusplus)
		69	extern "C" {
		70	#endif
67	extern CLIENT clnttcp_create(struct sockaddr_in , u_long, u_long, int *,	71	extern CLIENT clnttcp_create(struct sockaddr_in , u_long, u_long, int *,
68	u_int, u_int);	72	u_int, u_int);
		73	#ifdef __GLIBC__
69	__END_DECLS	74	__END_DECLS
		75	#elif defined(__cplusplus)
		76	}
		77	#endif
70		78
71	/*	79	/*
72	* Raw (memory) rpc.	80	* Raw (memory) rpc.
73	*/	81	*/
		82	#ifdef __GLIBC__
74	__BEGIN_DECLS	83	__BEGIN_DECLS
		84	#elif defined(__cplusplus)
		85	extern "C" {
		86	#endif
75	extern CLIENT *clntraw_create(u_long, u_long);	87	extern CLIENT *clntraw_create(u_long, u_long);
		88	#ifdef __GLIBC__
76	__END_DECLS	89	__END_DECLS
		90	#elif defined(__cplusplus)
		91	}
		92	#endif
77		93
78		94
79	/*	95	/*
80	IPv6 socket version	96	IPv6 socket version
81	*/	97	*/
82	#ifdef INET6	98	#ifdef INET6
		99	#ifdef __GLIBC__
83	__BEGIN_DECLS	100	__BEGIN_DECLS
		101	#elif defined(__cplusplus)
		102	extern "C" {
		103	#endif
84	extern CLIENT clnttcp6_create(struct sockaddr_in6 , u_long, u_long, int *,	104	extern CLIENT clnttcp6_create(struct sockaddr_in6 , u_long, u_long, int *,
85	u_int, u_int);	105	u_int, u_int);
		106	#ifdef __GLIBC__
86	__END_DECLS	107	__END_DECLS
		108	#elif defined(__cplusplus)
		109	}
		110	#endif
87	#endif	111	#endif
88		112
89	/*	113	/*
Lines 107-113 __END_DECLS Link Here
107	* u_int sendsz;	131	* u_int sendsz;
108	* u_int recvsz;	132	* u_int recvsz;
109	*/	133	*/
		134	#ifdef __GLIBC__
110	__BEGIN_DECLS	135	__BEGIN_DECLS
		136	#elif defined(__cplusplus)
		137	extern "C" {
		138	#endif
111	extern CLIENT clntudp_create(struct sockaddr_in , u_long, u_long,	139	extern CLIENT clntudp_create(struct sockaddr_in , u_long, u_long,
112	struct timeval, int *);	140	struct timeval, int *);
113	extern CLIENT clntudp_bufcreate(struct sockaddr_in , u_long, u_long,	141	extern CLIENT clntudp_bufcreate(struct sockaddr_in , u_long, u_long,
Lines 118-124 extern CLIENT *clntudp6_create(struct so Link Here
118	extern CLIENT clntudp6_bufcreate(struct sockaddr_in6 , u_long, u_long,	146	extern CLIENT clntudp6_bufcreate(struct sockaddr_in6 , u_long, u_long,
119	struct timeval, int *, u_int, u_int);	147	struct timeval, int *, u_int, u_int);
120	#endif	148	#endif
		149	#ifdef __GLIBC__
121	__END_DECLS	150	__END_DECLS
		151	#elif defined(__cplusplus)
		152	}
		153	#endif
122		154
123		155
124	#endif /* _RPC_CLNT_SOC_H */	156	#endif /* _RPC_CLNT_SOC_H */

Lines 57-63 Link Here

(-)./tirpc/rpc/rpc_com.h.orig (+8 lines)
57	#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \	57	#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
58	(u_int32_t)(now)->tv_usec)	58	(u_int32_t)(now)->tv_usec)
59		59
		60	#ifdef __GLIBC__
60	__BEGIN_DECLS	61	__BEGIN_DECLS
		62	#elif defined(__cplusplus)
		63	extern "C" {
		64	#endif
61	extern u_int __rpc_get_a_size(int);	65	extern u_int __rpc_get_a_size(int);
62	extern int __rpc_dtbsize(void);	66	extern int __rpc_dtbsize(void);
63	extern int _rpc_dtablesize(void);	67	extern int _rpc_dtablesize(void);
Lines 79-84 bool_t rpc_control(int,void *); Link Here
79		83
80	char _get_next_token(char , int);	84	char _get_next_token(char , int);
81		85
		86	#ifdef __GLIBC__
82	__END_DECLS	87	__END_DECLS
		88	#elif defined(__cplusplus)
		89	}
		90	#endif
83		91
84	#endif /* _RPC_RPCCOM_H */	92	#endif /* _RPC_RPCCOM_H */

Lines 69-77 struct authunix_parms { Link Here

(-)./tirpc/rpc/auth_unix.h.orig (+8 lines)
69		69
70	#define authsys_parms authunix_parms	70	#define authsys_parms authunix_parms
71		71
		72	#ifdef __GLIBC__
72	__BEGIN_DECLS	73	__BEGIN_DECLS
		74	#elif defined(__cplusplus)
		75	extern "C" {
		76	#endif
73	extern bool_t xdr_authunix_parms(XDR , struct authunix_parms );	77	extern bool_t xdr_authunix_parms(XDR , struct authunix_parms );
		78	#ifdef __GLIBC__
74	__END_DECLS	79	__END_DECLS
		80	#elif defined(__cplusplus)
		81	}
		82	#endif
75		83
76	/*	84	/*
77	* If a response verifier has flavor AUTH_SHORT,	85	* If a response verifier has flavor AUTH_SHORT,

Lines 58-66 struct rmtcallres { Link Here

(-)./tirpc/rpc/pmap_rmt.h.orig (+8 lines)
58	xdrproc_t xdr_results;	58	xdrproc_t xdr_results;
59	};	59	};
60		60
		61	#ifdef __GLIBC__
61	__BEGIN_DECLS	62	__BEGIN_DECLS
		63	#elif defined(__cplusplus)
		64	extern "C" {
		65	#endif
62	extern bool_t xdr_rmtcall_args(XDR , struct rmtcallargs );	66	extern bool_t xdr_rmtcall_args(XDR , struct rmtcallargs );
63	extern bool_t xdr_rmtcallres(XDR , struct rmtcallres );	67	extern bool_t xdr_rmtcallres(XDR , struct rmtcallres );
		68	#ifdef __GLIBC__
64	__END_DECLS	69	__END_DECLS
		70	#elif defined(__cplusplus)
		71	}
		72	#endif
65		73
66	#endif /* !_RPC_PMAP_RMT_H */	74	#endif /* !_RPC_PMAP_RMT_H */

Lines 85-107 Link Here

(-)./tirpc/rpc/des_crypt.h.orig (+24 lines)
85	/*	85	/*
86	* Cipher Block Chaining mode	86	* Cipher Block Chaining mode
87	*/	87	*/
		88	#ifdef __GLIBC__
88	__BEGIN_DECLS	89	__BEGIN_DECLS
		90	#elif defined(__cplusplus)
		91	extern "C" {
		92	#endif
89	int cbc_crypt( char , char , unsigned int, unsigned int, char *);	93	int cbc_crypt( char , char , unsigned int, unsigned int, char *);
		94	#ifdef __GLIBC__
90	__END_DECLS	95	__END_DECLS
		96	#elif defined(__cplusplus)
		97	}
		98	#endif
91		99
92	/*	100	/*
93	* Electronic Code Book mode	101	* Electronic Code Book mode
94	*/	102	*/
		103	#ifdef __GLIBC__
95	__BEGIN_DECLS	104	__BEGIN_DECLS
		105	#elif defined(__cplusplus)
		106	extern "C" {
		107	#endif
96	int ecb_crypt( char , char , unsigned int, unsigned int );	108	int ecb_crypt( char , char , unsigned int, unsigned int );
		109	#ifdef __GLIBC__
97	__END_DECLS	110	__END_DECLS
		111	#elif defined(__cplusplus)
		112	}
		113	#endif
98		114
99	/*	115	/*
100	* Set des parity for a key.	116	* Set des parity for a key.
101	* DES parity is odd and in the low bit of each byte	117	* DES parity is odd and in the low bit of each byte
102	*/	118	*/
		119	#ifdef __GLIBC__
103	__BEGIN_DECLS	120	__BEGIN_DECLS
		121	#elif defined(__cplusplus)
		122	extern "C" {
		123	#endif
104	void des_setparity( char *);	124	void des_setparity( char *);
		125	#ifdef __GLIBC__
105	__END_DECLS	126	__END_DECLS
		127	#elif defined(__cplusplus)
		128	}
		129	#endif
106		130
107	#endif /* _DES_DES_CRYPT_H */	131	#endif /* _DES_DES_CRYPT_H */

Lines 59-65 Link Here

(-)./tirpc/rpc/rpcb_clnt.h.orig (+8 lines)
59		59
60	#include <rpc/types.h>	60	#include <rpc/types.h>
61	#include <rpc/rpcb_prot.h>	61	#include <rpc/rpcb_prot.h>
		62	#ifdef __GLIBC__
62	__BEGIN_DECLS	63	__BEGIN_DECLS
		64	#elif defined(__cplusplus)
		65	extern "C" {
		66	#endif
63	extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,	67	extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
64	const struct netconfig , const struct netbuf );	68	const struct netconfig , const struct netbuf );
65	extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,	69	extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
Lines 78-83 extern bool_t rpcb_getaddr(const rpcprog Link Here
78	extern bool_t rpcb_gettime(const char , time_t );	82	extern bool_t rpcb_gettime(const char , time_t );
79	extern char rpcb_taddr2uaddr(struct netconfig , struct netbuf *);	83	extern char rpcb_taddr2uaddr(struct netconfig , struct netbuf *);
80	extern struct netbuf rpcb_uaddr2taddr(struct netconfig , char *);	84	extern struct netbuf rpcb_uaddr2taddr(struct netconfig , char *);
		85	#ifdef __GLIBC__
81	__END_DECLS	86	__END_DECLS
		87	#elif defined(__cplusplus)
		88	}
		89	#endif
82		90
83	#endif /* !_RPC_RPCB_CLNT_H */	91	#endif /* !_RPC_RPCB_CLNT_H */

Lines 269-275 struct rpc_timers { Link Here

(-)./tirpc/rpc/clnt.h.orig (+56 lines)
269	* Generic client creation routine. Supported protocols are those that	269	* Generic client creation routine. Supported protocols are those that
270	* belong to the nettype namespace (/etc/netconfig).	270	* belong to the nettype namespace (/etc/netconfig).
271	*/	271	*/
		272	#ifdef __GLIBC__
272	__BEGIN_DECLS	273	__BEGIN_DECLS
		274	#elif defined(__cplusplus)
		275	extern "C" {
		276	#endif
273	extern CLIENT clnt_create(const char , const rpcprog_t, const rpcvers_t,	277	extern CLIENT clnt_create(const char , const rpcprog_t, const rpcvers_t,
274	const char *);	278	const char *);
275	/*	279	/*
Lines 416-447 extern CLIENT *clnt_dg_create(const int, Link Here
416	*/	420	*/
417	extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);	421	extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
418		422
		423	#ifdef __GLIBC__
419	__END_DECLS	424	__END_DECLS
		425	#elif defined(__cplusplus)
		426	}
		427	#endif
420		428
421		429
422	/*	430	/*
423	* Print why creation failed	431	* Print why creation failed
424	*/	432	*/
		433	#ifdef __GLIBC__
425	__BEGIN_DECLS	434	__BEGIN_DECLS
		435	#elif defined(__cplusplus)
		436	extern "C" {
		437	#endif
426	extern void clnt_pcreateerror(const char ); / stderr */	438	extern void clnt_pcreateerror(const char ); / stderr */
427	extern char clnt_spcreateerror(const char ); /* string */	439	extern char clnt_spcreateerror(const char ); /* string */
		440	#ifdef __GLIBC__
428	__END_DECLS	441	__END_DECLS
		442	#elif defined(__cplusplus)
		443	}
		444	#endif
429		445
430	/*	446	/*
431	* Like clnt_perror(), but is more verbose in its output	447	* Like clnt_perror(), but is more verbose in its output
432	*/	448	*/
		449	#ifdef __GLIBC__
433	__BEGIN_DECLS	450	__BEGIN_DECLS
		451	#elif defined(__cplusplus)
		452	extern "C" {
		453	#endif
434	extern void clnt_perrno(enum clnt_stat); /* stderr */	454	extern void clnt_perrno(enum clnt_stat); /* stderr */
435	extern char clnt_sperrno(enum clnt_stat); / string */	455	extern char clnt_sperrno(enum clnt_stat); / string */
		456	#ifdef __GLIBC__
436	__END_DECLS	457	__END_DECLS
		458	#elif defined(__cplusplus)
		459	}
		460	#endif
437		461
438	/*	462	/*
439	* Print an English error message, given the client error code	463	* Print an English error message, given the client error code
440	*/	464	*/
		465	#ifdef __GLIBC__
441	__BEGIN_DECLS	466	__BEGIN_DECLS
		467	#elif defined(__cplusplus)
		468	extern "C" {
		469	#endif
442	extern void clnt_perror(CLIENT , const char ); /* stderr */	470	extern void clnt_perror(CLIENT , const char ); /* stderr */
443	extern char clnt_sperror(CLIENT , const char ); / string */	471	extern char clnt_sperror(CLIENT , const char ); / string */
		472	#ifdef __GLIBC__
444	__END_DECLS	473	__END_DECLS
		474	#elif defined(__cplusplus)
		475	}
		476	#endif
445		477
446		478
447	/*	479	/*
Lines 452-460 struct rpc_createerr { Link Here
452	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */	484	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
453	};	485	};
454		486
		487	#ifdef __GLIBC__
455	__BEGIN_DECLS	488	__BEGIN_DECLS
		489	#elif defined(__cplusplus)
		490	extern "C" {
		491	#endif
456	extern struct rpc_createerr *__rpc_createerr(void);	492	extern struct rpc_createerr *__rpc_createerr(void);
		493	#ifdef __GLIBC__
457	__END_DECLS	494	__END_DECLS
		495	#elif defined(__cplusplus)
		496	}
		497	#endif
458	#define get_rpc_createerr() (*(__rpc_createerr()))	498	#define get_rpc_createerr() (*(__rpc_createerr()))
459	#define rpc_createerr (*(__rpc_createerr()))	499	#define rpc_createerr (*(__rpc_createerr()))
460		500
Lines 471-482 __END_DECLS Link Here
471	* char *out;	511	* char *out;
472	* const char *nettype;	512	* const char *nettype;
473	*/	513	*/
		514	#ifdef __GLIBC__
474	__BEGIN_DECLS	515	__BEGIN_DECLS
		516	#elif defined(__cplusplus)
		517	extern "C" {
		518	#endif
475	extern enum clnt_stat rpc_call(const char *, const rpcprog_t,	519	extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
476	const rpcvers_t, const rpcproc_t,	520	const rpcvers_t, const rpcproc_t,
477	const xdrproc_t, const char *,	521	const xdrproc_t, const char *,
478	const xdrproc_t, char , const char );	522	const xdrproc_t, char , const char );
		523	#ifdef __GLIBC__
479	__END_DECLS	524	__END_DECLS
		525	#elif defined(__cplusplus)
		526	}
		527	#endif
480		528
481	/*	529	/*
482	* RPC broadcast interface	530	* RPC broadcast interface
Lines 524-530 __END_DECLS Link Here
524		572
525	typedef bool_t (*resultproc_t)(caddr_t, ...);	573	typedef bool_t (*resultproc_t)(caddr_t, ...);
526		574
		575	#ifdef __GLIBC__
527	__BEGIN_DECLS	576	__BEGIN_DECLS
		577	#elif defined(__cplusplus)
		578	extern "C" {
		579	#endif
528	extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,	580	extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
529	const rpcproc_t, const xdrproc_t,	581	const rpcproc_t, const xdrproc_t,
530	caddr_t, const xdrproc_t, caddr_t,	582	caddr_t, const xdrproc_t, caddr_t,
Lines 534-540 extern enum clnt_stat rpc_broadcast_exp( Link Here
534	caddr_t, const xdrproc_t, caddr_t,	586	caddr_t, const xdrproc_t, caddr_t,
535	const resultproc_t, const int,	587	const resultproc_t, const int,
536	const int, const char *);	588	const int, const char *);
		589	#ifdef __GLIBC__
537	__END_DECLS	590	__END_DECLS
		591	#elif defined(__cplusplus)
		592	}
		593	#endif
538		594
539	/* For backward compatibility */	595	/* For backward compatibility */
540	#include <rpc/clnt_soc.h>	596	#include <rpc/clnt_soc.h>

Lines 44-50 Link Here

(-)./tirpc/rpc/rpcent.h.orig (+8 lines)
44	/* #pragma ident "@(#)rpcent.h 1.13 94/04/25 SMI" */	44	/* #pragma ident "@(#)rpcent.h 1.13 94/04/25 SMI" */
45	/* @(#)rpcent.h 1.1 88/12/06 SMI */	45	/* @(#)rpcent.h 1.1 88/12/06 SMI */
46		46
		47	#ifdef __GLIBC__
47	__BEGIN_DECLS	48	__BEGIN_DECLS
		49	#elif defined(__cplusplus)
		50	extern "C" {
		51	#endif
48		52
49	/* These are defined in /usr/include/rpc/netdb.h */	53	/* These are defined in /usr/include/rpc/netdb.h */
50	#if 0	54	#if 0
Lines 62-67 extern struct rpcent *getrpcent(void); Link Here
62		66
63	extern void setrpcent(int) __THROW;	67	extern void setrpcent(int) __THROW;
64	extern void endrpcent(void) __THROW;	68	extern void endrpcent(void) __THROW;
		69	#ifdef __GLIBC__
65	__END_DECLS	70	__END_DECLS
		71	#elif defined(__cplusplus)
		72	}
		73	#endif
66		74
67	#endif /* !_RPC_CENT_H */	75	#endif /* !_RPC_CENT_H */

Lines 67-73 Link Here

(-)./tirpc/rpc/pmap_clnt.h.orig (+8 lines)
67	#include <sys/cdefs.h>	67	#include <sys/cdefs.h>
68	#endif	68	#endif
69		69
		70	#ifdef __GLIBC__
70	__BEGIN_DECLS	71	__BEGIN_DECLS
		72	#elif defined(__cplusplus)
		73	extern "C" {
		74	#endif
71	extern bool_t pmap_set(u_long, u_long, int, int);	75	extern bool_t pmap_set(u_long, u_long, int, int);
72	extern bool_t pmap_unset(u_long, u_long);	76	extern bool_t pmap_unset(u_long, u_long);
73	extern struct pmaplist pmap_getmaps(struct sockaddr_in );	77	extern struct pmaplist pmap_getmaps(struct sockaddr_in );
Lines 82-87 extern enum clnt_stat clnt_broadcast(u_l Link Here
82	resultproc_t);	86	resultproc_t);
83	extern u_short pmap_getport(struct sockaddr_in *,	87	extern u_short pmap_getport(struct sockaddr_in *,
84	u_long, u_long, u_int);	88	u_long, u_long, u_int);
		89	#ifdef __GLIBC__
85	__END_DECLS	90	__END_DECLS
		91	#elif defined(__cplusplus)
		92	}
		93	#endif
86		94
87	#endif /* !_RPC_PMAP_CLNT_H_ */	95	#endif /* !_RPC_PMAP_CLNT_H_ */

Lines 104-110 struct rpc_gss_init_res { Link Here

(-)./tirpc/rpc/auth_gss.h.orig (+8 lines)
104	#define MAXSEQ 0x80000000	104	#define MAXSEQ 0x80000000
105		105
106	/* Prototypes. */	106	/* Prototypes. */
		107	#ifdef __GLIBC__
107	__BEGIN_DECLS	108	__BEGIN_DECLS
		109	#elif defined(__cplusplus)
		110	extern "C" {
		111	#endif
108	bool_t xdr_rpc_gss_cred __P((XDR xdrs, struct rpc_gss_cred p));	112	bool_t xdr_rpc_gss_cred __P((XDR xdrs, struct rpc_gss_cred p));
109	bool_t xdr_rpc_gss_init_args __P((XDR xdrs, gss_buffer_desc p));	113	bool_t xdr_rpc_gss_init_args __P((XDR xdrs, gss_buffer_desc p));
110	bool_t xdr_rpc_gss_init_res __P((XDR xdrs, struct rpc_gss_init_res p));	114	bool_t xdr_rpc_gss_init_res __P((XDR xdrs, struct rpc_gss_init_res p));
Lines 126-131 void gss_log_status __P((char *m, OM_ui Link Here
126	OM_uint32 minor));	130	OM_uint32 minor));
127	void gss_log_hexdump __P((const u_char *buf, int len, int offset));	131	void gss_log_hexdump __P((const u_char *buf, int len, int offset));
128		132
		133	#ifdef __GLIBC__
129	__END_DECLS	134	__END_DECLS
		135	#elif defined(__cplusplus)
		136	}
		137	#endif
130		138
131	#endif /* !_TIRPC_AUTH_GSS_H */	139	#endif /* !_TIRPC_AUTH_GSS_H */

Lines 161-167 struct rpc_msg { Link Here

(-)./tirpc/rpc/rpc_msg.h.orig (+8 lines)
161	#define acpted_rply ru.RM_rmb.ru.RP_ar	161	#define acpted_rply ru.RM_rmb.ru.RP_ar
162	#define rjcted_rply ru.RM_rmb.ru.RP_dr	162	#define rjcted_rply ru.RM_rmb.ru.RP_dr
163		163
		164	#ifdef __GLIBC__
164	__BEGIN_DECLS	165	__BEGIN_DECLS
		166	#elif defined(__cplusplus)
		167	extern "C" {
		168	#endif
165	/*	169	/*
166	* XDR routine to handle a rpc message.	170	* XDR routine to handle a rpc message.
167	* xdr_callmsg(xdrs, cmsg)	171	* xdr_callmsg(xdrs, cmsg)
Lines 210-215 extern bool_t xdr_rejected_reply(XDR *, Link Here
210	* struct rpc_err *error;	214	* struct rpc_err *error;
211	*/	215	*/
212	extern void _seterr_reply(struct rpc_msg , struct rpc_err );	216	extern void _seterr_reply(struct rpc_msg , struct rpc_err );
		217	#ifdef __GLIBC__
213	__END_DECLS	218	__END_DECLS
		219	#elif defined(__cplusplus)
		220	}
		221	#endif
214		222
215	#endif /* !_TIRPC_RPC_MSG_H */	223	#endif /* !_TIRPC_RPC_MSG_H */

Lines 53-63 Link Here

(-)./tirpc/rpc/nettype.h.orig (+8 lines)
53	#define _RPC_TCP 7	53	#define _RPC_TCP 7
54	#define _RPC_UDP 8	54	#define _RPC_UDP 8
55		55
		56	#ifdef __GLIBC__
56	__BEGIN_DECLS	57	__BEGIN_DECLS
		58	#elif defined(__cplusplus)
		59	extern "C" {
		60	#endif
57	extern void __rpc_setconf(const char );	61	extern void __rpc_setconf(const char );
58	extern void __rpc_endconf(void *);	62	extern void __rpc_endconf(void *);
59	extern struct netconfig __rpc_getconf(void );	63	extern struct netconfig __rpc_getconf(void );
60	extern struct netconfig __rpc_getconfip(const char );	64	extern struct netconfig __rpc_getconfip(const char );
		65	#ifdef __GLIBC__
61	__END_DECLS	66	__END_DECLS
		67	#elif defined(__cplusplus)
		68	}
		69	#endif
62		70
63	#endif /* !_TIRPC_NETTYPE_H */	71	#endif /* !_TIRPC_NETTYPE_H */

Lines 65-77 typedef struct SVCAUTH { Link Here

(-)./tirpc/rpc/svc_auth.h.orig (+8 lines)
65	/*	65	/*
66	* Server side authenticator	66	* Server side authenticator
67	*/	67	*/
		68	#ifdef __GLIBC__
68	__BEGIN_DECLS	69	__BEGIN_DECLS
		70	#elif defined(__cplusplus)
		71	extern "C" {
		72	#endif
69	extern enum auth_stat _gss_authenticate(struct svc_req , struct rpc_msg ,	73	extern enum auth_stat _gss_authenticate(struct svc_req , struct rpc_msg ,
70	bool_t *);	74	bool_t *);
71	extern enum auth_stat _authenticate(struct svc_req , struct rpc_msg );	75	extern enum auth_stat _authenticate(struct svc_req , struct rpc_msg );
72	extern int svc_auth_reg(int, enum auth_stat ()(struct svc_req ,	76	extern int svc_auth_reg(int, enum auth_stat ()(struct svc_req ,
73	struct rpc_msg *));	77	struct rpc_msg *));
74		78
		79	#ifdef __GLIBC__
75	__END_DECLS	80	__END_DECLS
		81	#elif defined(__cplusplus)
		82	}
		83	#endif
76		84
77	#endif /* !_RPC_SVC_AUTH_H */	85	#endif /* !_RPC_SVC_AUTH_H */

Lines 36-42 Link Here

(-)./tirpc/rpcsvc/nis.h.orig (+8 lines)
36	#include <rpc/rpc.h>	36	#include <rpc/rpc.h>
37	#include <rpcsvc/nis_tags.h>	37	#include <rpcsvc/nis_tags.h>
38		38
		39	#ifdef __GLIBC__
39	__BEGIN_DECLS	40	__BEGIN_DECLS
		41	#elif defined(__cplusplus)
		42	extern "C" {
		43	#endif
40		44
41	/*	45	/*
42	* nis.h	46	* nis.h
Lines 611-616 extern nis_error * nis_rmdir_3_svc (nis Link Here
611	extern nis_error * nis_updkeys_3 (nis_name , CLIENT ) __THROW;	615	extern nis_error * nis_updkeys_3 (nis_name , CLIENT ) __THROW;
612	extern nis_error * nis_updkeys_3_svc (nis_name , struct svc_req ) __THROW;	616	extern nis_error * nis_updkeys_3_svc (nis_name , struct svc_req ) __THROW;
613		617
		618	#ifdef __GLIBC__
614	__END_DECLS	619	__END_DECLS
		620	#elif defined(__cplusplus)
		621	}
		622	#endif
615		623
616	#endif /* ! _RPCSVC_NIS_H */	624	#endif /* ! _RPCSVC_NIS_H */

Lines 23-29 Link Here

(-)./tirpc/rpcsvc/nislib.h.orig (+8 lines)
23		23
24	#include <features.h>	24	#include <features.h>
25		25
		26	#ifdef __GLIBC__
26	__BEGIN_DECLS	27	__BEGIN_DECLS
		28	#elif defined(__cplusplus)
		29	extern "C" {
		30	#endif
27		31
28	typedef const char *const_nis_name;	32	typedef const char *const_nis_name;
29		33
Lines 283-288 extern nis_error __nisfind_server (const Link Here
283		287
284	#endif	288	#endif
285		289
		290	#ifdef __GLIBC__
286	__END_DECLS	291	__END_DECLS
		292	#elif defined(__cplusplus)
		293	}
		294	#endif
287		295
288	#endif /* __RPCSVC_NISLIB_H__ */	296	#endif /* __RPCSVC_NISLIB_H__ */

Lines 74-80 typedef struct { Link Here

(-)./tirpc/netconfig.h.orig (+8 lines)
74	#define NC_UDP "udp"	74	#define NC_UDP "udp"
75	#define NC_ICMP "icmp"	75	#define NC_ICMP "icmp"
76		76
		77	#ifdef __GLIBC__
77	__BEGIN_DECLS	78	__BEGIN_DECLS
		79	#elif defined(__cplusplus)
		80	extern "C" {
		81	#endif
78		82
79	extern void *setnetconfig (void);	83	extern void *setnetconfig (void);
80	extern struct netconfig getnetconfig (void );	84	extern struct netconfig getnetconfig (void );
Lines 89-94 extern int endnetpath (void *); Link Here
89	extern void nc_perror (const char *);	93	extern void nc_perror (const char *);
90	extern char *nc_sperror (void);	94	extern char *nc_sperror (void);
91		95
		96	#ifdef __GLIBC__
92	__END_DECLS	97	__END_DECLS
		98	#elif defined(__cplusplus)
		99	}
		100	#endif
93		101
94	#endif /* _NETCONFIG_H_ */	102	#endif /* _NETCONFIG_H_ */

Lines 56-62 Link Here

(-)./src/rpc_com.h.orig (+8 lines)
56	#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \	56	#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
57	(u_int32_t)(now)->tv_usec)	57	(u_int32_t)(now)->tv_usec)
58		58
		59	#ifdef __GLIBC__
59	__BEGIN_DECLS	60	__BEGIN_DECLS
		61	#elif defined(__cplusplus)
		62	extern "C" {
		63	#endif
60	extern u_int __rpc_get_a_size(int);	64	extern u_int __rpc_get_a_size(int);
61	extern int __rpc_dtbsize(void);	65	extern int __rpc_dtbsize(void);
62	extern struct netconfig * __rpcgettp(int);	66	extern struct netconfig * __rpcgettp(int);
Lines 92-97 void __xprt_set_raddr(SVCXPRT *, const s Link Here
92	SVCXPRT **__svc_xports;	96	SVCXPRT **__svc_xports;
93	int __svc_maxrec;	97	int __svc_maxrec;
94		98
		99	#ifdef __GLIBC__
95	__END_DECLS	100	__END_DECLS
		101	#elif defined(__cplusplus)
		102	}
		103	#endif
96		104
97	#endif /* _TIRPC_RPCCOM_H */	105	#endif /* _TIRPC_RPCCOM_H */

Return to bug 530080