Attachment #509026 for bug #639838

Lines 291-296 else Link Here

(-)a/configure.ac (+12 lines)
291	CFLAGS="${CFLAGS} -g -rdynamic"	291	CFLAGS="${CFLAGS} -g -rdynamic"
292	fi	292	fi
293		293
		294	AC_ARG_WITH([libtirpc],
		295	AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
		296	[], [with_libtirpc=no])
		297
294	AC_ARG_ENABLE([privport_tracking],	298	AC_ARG_ENABLE([privport_tracking],
295	AC_HELP_STRING([--disable-privport_tracking],	299	AC_HELP_STRING([--disable-privport_tracking],
296	[Disable internal tracking of privileged ports.]))	300	[Disable internal tracking of privileged ports.]))
Lines 1050-1055 AC_SUBST(GF_DISTRIBUTION) Link Here
1050	GF_HOST_OS=""	1054	GF_HOST_OS=""
1051	GF_LDFLAGS="-rdynamic"	1055	GF_LDFLAGS="-rdynamic"
1052		1056
		1057	if test "x$with_libtirpc" = "xyes" ; then
		1058	PKG_CHECK_MODULES([TIRPC], [libtirpc],
		1059	[GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
		1060	[AC_MSG_ERROR([libtirpc requested but library not found])]
		1061	)
		1062	AC_DEFINE(HAVE_LIBTIRPC, 1, [Define if libtirpc is enabled.])
		1063	fi
		1064
1053	dnl check for gcc -Werror=format-security	1065	dnl check for gcc -Werror=format-security
1054	saved_CFLAGS=$CFLAGS	1066	saved_CFLAGS=$CFLAGS
1055	CFLAGS="-Wformat -Werror=format-security"	1067	CFLAGS="-Wformat -Werror=format-security"

Lines 487-492 int gf_mkostemp (char *tmpl, int suffixlen, int flags); Link Here

(-)a/libglusterfs/src/compat.h (+4 lines)
487	#define ST_CTIM_NSEC_SET(stbuf, val) do { } while (0);	487	#define ST_CTIM_NSEC_SET(stbuf, val) do { } while (0);
488	#endif	488	#endif
489		489
		490	#ifndef HAVE_LIBTIRPC
		491
490	#ifndef IXDR_GET_LONG	492	#ifndef IXDR_GET_LONG
491	#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))	493	#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))
492	#endif	494	#endif
Lines 503-508 int gf_mkostemp (char *tmpl, int suffixlen, int flags); Link Here
503	#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v))	505	#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v))
504	#endif	506	#endif
505		507
		508	#endif /* HAVE_LIBTIRPC */
		509
506	#if defined(__GNUC__) && !defined(RELAX_POISONING)	510	#if defined(__GNUC__) && !defined(RELAX_POISONING)
507	/* Use run API, see run.h */	511	/* Use run API, see run.h */
508	#include <stdlib.h> /* system(), mkostemp() */	512	#include <stdlib.h> /* system(), mkostemp() */

Lines 656-662 rpc_transport_inet_options_build (dict_t *options, const char hostname, Link Here

(-)a/rpc/rpc-lib/src/rpc-transport.c (+4 lines)
656	dict_t *dict = NULL;	656	dict_t *dict = NULL;
657	char *host = NULL;	657	char *host = NULL;
658	int ret = -1;	658	int ret = -1;
		659	#ifdef HAVE_LIBTIRPC
		660	char *addr_family = "inet6";
		661	#else
659	char *addr_family = "inet";	662	char *addr_family = "inet";
		663	#endif
660		664
661	GF_ASSERT (options);	665	GF_ASSERT (options);
662	GF_ASSERT (hostname);	666	GF_ASSERT (hostname);

Lines 1744-1750 mnt3_check_client_net_udp (struct svc_req req, char volname, xlator_t *nfsx) Link Here

(-)a/xlators/nfs/server/src/mount3.c (-2 / +2 lines)
1744	if ((!req) \|\| (!volname) \|\| (!nfsx))	1744	if ((!req) \|\| (!volname) \|\| (!nfsx))
1745	goto err;	1745	goto err;
1746		1746
1747	#if !defined(_TIRPC_SVC_H)	1747	#if !defined(HAVE_LIBTIRPC)
1748	sin = svc_getcaller (req->rq_xprt);	1748	sin = svc_getcaller (req->rq_xprt);
1749	#else	1749	#else
1750	sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);	1750	sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);
Lines 2846-2852 __mnt3udp_get_export_subdir_inode (struct svc_req req, char subdir, Link Here
2846	if (exp->hostspec) {	2846	if (exp->hostspec) {
2847	struct sockaddr_in *sin = NULL;	2847	struct sockaddr_in *sin = NULL;
2848		2848
2849	#if !defined(_TIRPC_SVC_H)	2849	#if !defined(HAVE_LIBTIRPC)
2850	sin = svc_getcaller (req->rq_xprt);	2850	sin = svc_getcaller (req->rq_xprt);
2851	#else	2851	#else
2852	sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);	2852	sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);

Lines 133-139 mountudp_program_3(struct svc_req rqstp, register SVCXPRT transp) Link Here

(-)a/xlators/nfs/server/src/mount3udp_svc.c (-2 / +1 lines)
133	mountres3 *res = NULL;	133	mountres3 *res = NULL;
134	struct sockaddr_in *sin = NULL;	134	struct sockaddr_in *sin = NULL;
135		135
136	#if !defined(_TIRPC_SVC_H)	136	#if !defined(HAVE_LIBTIRPC)
137	sin = svc_getcaller (transp);	137	sin = svc_getcaller (transp);
138	#else	138	#else
139	sin = (struct sockaddr_in *)svc_getcaller (transp);	139	sin = (struct sockaddr_in *)svc_getcaller (transp);
140	-

Return to bug 639838