Attachment #285391 for bug #371127

View | Details | Raw Unified | Return to bug 371127
Collapse All | Expand All

Lines 208-213 Link Here

(-)a/config.h.in (+6 lines)
208	/* Define to 1 if you have the <rpc/rpcent.h> header file. */	208	/* Define to 1 if you have the <rpc/rpcent.h> header file. */
209	#undef HAVE_RPC_RPCENT_H	209	#undef HAVE_RPC_RPCENT_H
210		210
		211	/* Define to 1 if you have the <rpc/rpc.h> header file. */
		212	#undef HAVE_RPC_RPC_H
		213
211	/* Define to 1 if you have the `setlinebuf' function. */	214	/* Define to 1 if you have the `setlinebuf' function. */
212	#undef HAVE_SETLINEBUF	215	#undef HAVE_SETLINEBUF
213		216
Lines 295-300 Link Here
295	/* Define to the one symbol short name of this package. */	298	/* Define to the one symbol short name of this package. */
296	#undef PACKAGE_TARNAME	299	#undef PACKAGE_TARNAME
297		300
		301	/* Define to the home page for this package. */
		302	#undef PACKAGE_URL
		303
298	/* Define to the version of this package. */	304	/* Define to the version of this package. */
299	#undef PACKAGE_VERSION	305	#undef PACKAGE_VERSION
300		306

Lines 15-21 Link Here

(-)a/configure.in (-1 / +1 lines)
15	AC_LBL_C_INIT(V_CCOPT, V_INCLS)	15	AC_LBL_C_INIT(V_CCOPT, V_INCLS)
16	AC_LBL_C_INLINE	16	AC_LBL_C_INLINE
17	AC_C___ATTRIBUTE__	17	AC_C___ATTRIBUTE__
18	AC_CHECK_HEADERS(fcntl.h rpc/rpcent.h netdnet/dnetdb.h)	18	AC_CHECK_HEADERS(fcntl.h rpc.h rpc/rpcent.h netdnet/dnetdb.h)
19	AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>	19	AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
20	#include <sys/socket.h>	20	#include <sys/socket.h>
21	#include <net/if.h>])	21	#include <net/if.h>])





#include <tcpdump-stdinc.h>

#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
#include <rpc/rpc.h>
#ifdef HAVE_RPC_RPCENT_H
#include <rpc/rpcent.h>
#endif /* HAVE_RPC_RPCENT_H */
#endif /* defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H) */

#include <stdio.h>
#include <string.h>

progstr(prog)
	u_int32_t prog;
{
#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
	register struct rpcent *rp;
#endif
	static char buf[32];


	if (lastprog != 0 && prog == lastprog)
		return (buf);
#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
	rp = getrpcbynumber(prog);
	if (rp == NULL)
#endif
		(void) snprintf(buf, sizeof(buf), "#%u", prog);
#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
	else
		strlcpy(buf, rp->r_name, sizeof(buf));
#endif

Return to bug 371127

Lines 30-41 Link Here

(-)a/print-sunrpc.c (-5 / +5 lines)
30		30
31	#include <tcpdump-stdinc.h>	31	#include <tcpdump-stdinc.h>
32		32
33	#ifdef HAVE_GETRPCBYNUMBER	33	#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
34	#include <rpc/rpc.h>	34	#include <rpc/rpc.h>
35	#ifdef HAVE_RPC_RPCENT_H	35	#ifdef HAVE_RPC_RPCENT_H
36	#include <rpc/rpcent.h>	36	#include <rpc/rpcent.h>
37	#endif /* HAVE_RPC_RPCENT_H */	37	#endif /* HAVE_RPC_RPCENT_H */
38	#endif /* HAVE_GETRPCBYNUMBER */	38	#endif /* defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H) */
39		39
40	#include <stdio.h>	40	#include <stdio.h>
41	#include <string.h>	41	#include <string.h>
Lines 136-142 Link Here
136	progstr(prog)	136	progstr(prog)
137	u_int32_t prog;	137	u_int32_t prog;
138	{	138	{
139	#ifdef HAVE_GETRPCBYNUMBER	139	#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
140	register struct rpcent *rp;	140	register struct rpcent *rp;
141	#endif	141	#endif
142	static char buf[32];	142	static char buf[32];
Lines 144-155 Link Here
144		144
145	if (lastprog != 0 && prog == lastprog)	145	if (lastprog != 0 && prog == lastprog)
146	return (buf);	146	return (buf);
147	#ifdef HAVE_GETRPCBYNUMBER	147	#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
148	rp = getrpcbynumber(prog);	148	rp = getrpcbynumber(prog);
149	if (rp == NULL)	149	if (rp == NULL)
150	#endif	150	#endif
151	(void) snprintf(buf, sizeof(buf), "#%u", prog);	151	(void) snprintf(buf, sizeof(buf), "#%u", prog);
152	#ifdef HAVE_GETRPCBYNUMBER	152	#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
153	else	153	else
154	strlcpy(buf, rp->r_name, sizeof(buf));	154	strlcpy(buf, rp->r_name, sizeof(buf));
155	#endif	155	#endif