diff -up rpcbind-0.2.0/configure.ac.orig rpcbind-0.2.0/configure.ac

--- rpcbind-0.2.0/configure.ac.orig	2015-05-04 08:15:10.394432254 -0400

+++ rpcbind-0.2.0/configure.ac	2015-05-04 08:48:36.463258254 -0400

@@ -36,6 +36,18 @@ AC_SUBST([nss_modules], [$with_nss_modul

 PKG_CHECK_MODULES([TIRPC], [libtirpc])

+PKG_PROG_PKG_CONFIG

+AC_ARG_WITH([systemdsystemunitdir],

+  AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),

+  [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])

+  if test "x$with_systemdsystemunitdir" != xno; then

+    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])

+     PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [],

+	   [PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [],

+	   AC_MSG_ERROR([libsystemd support requested but found]))])

+  fi

+AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])

+

 AS_IF([test x$enable_libwrap = xyes], [

 	AC_CHECK_LIB([wrap], [hosts_access], ,

 		AC_MSG_ERROR([libwrap support requested but unable to find libwrap]))

diff -up rpcbind-0.2.0/Makefile.am.orig rpcbind-0.2.0/Makefile.am

--- rpcbind-0.2.0/Makefile.am.orig	2015-05-04 08:15:10.394432254 -0400

+++ rpcbind-0.2.0/Makefile.am	2015-05-04 08:48:36.463258254 -0400

@@ -39,6 +39,12 @@ rpcbind_SOURCES = \

 	src/warmstart.c

 rpcbind_LDADD = $(TIRPC_LIBS)

+if SYSTEMD

+AM_CPPFLAGS += $(SYSTEMD_CFLAGS) -DSYSTEMD

+

+rpcbind_LDADD += $(SYSTEMD_LIBS)

+endif

+

 rpcinfo_SOURCES =       src/rpcinfo.c

 rpcinfo_LDADD   =       $(TIRPC_LIBS)

diff -up rpcbind-0.2.0/src/rpcbind.c.orig rpcbind-0.2.0/src/rpcbind.c

--- rpcbind-0.2.0/src/rpcbind.c.orig	2015-05-04 08:15:10.394432254 -0400

+++ rpcbind-0.2.0/src/rpcbind.c	2015-05-04 08:48:36.463258254 -0400

@@ -56,6 +56,9 @@

 #include <netinet/in.h>

 #endif

 #include <arpa/inet.h>

+#ifdef SYSTEMD

+#include <systemd/sd-daemon.h>

+#endif

 #include <fcntl.h>

 #include <netdb.h>

 #include <stdio.h>

@@ -291,6 +294,7 @@ init_transport(struct netconfig *nconf)

 	u_int32_t host_addr[4];  /* IPv4 or IPv6 */

 	struct sockaddr_un sun;

 	mode_t oldmask;

+	int n;

         res = NULL;

 	if ((nconf->nc_semantics != NC_TPI_CLTS) &&

@@ -309,6 +313,76 @@ init_transport(struct netconfig *nconf)

 			fprintf(stderr, "[%d] - %s\n", i, *s);

 	}

 #endif

+	if (!__rpc_nconf2sockinfo(nconf, &si)) {

+		syslog(LOG_ERR, "cannot get information for %s",

+		    nconf->nc_netid);

+		return (1);

+	}

+

+#ifdef SYSTEMD

+	n = sd_listen_fds(0);

+	if (n < 0) {

+		syslog(LOG_ERR, "failed to acquire systemd sockets: %s", strerror(-n));

+		return 1;

+	}

+

+	/* Try to find if one of the systemd sockets we were given match

+	 * our netconfig structure. */

+

+	for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {

+		struct __rpc_sockinfo si_other;

+		union {

+			struct sockaddr sa;

+			struct sockaddr_un un;

+			struct sockaddr_in in4;

+			struct sockaddr_in6 in6;

+			struct sockaddr_storage storage;

+		} sa;

+		socklen_t addrlen = sizeof(sa);

+

+		if (!__rpc_fd2sockinfo(fd, &si_other)) {

+			syslog(LOG_ERR, "cannot get information for fd %i", fd);

+			return 1;

+		}

+

+		if (si.si_af != si_other.si_af ||

+                    si.si_socktype != si_other.si_socktype ||

+                    si.si_proto != si_other.si_proto)

+			continue;

+

+		if (getsockname(fd, &sa.sa, &addrlen) < 0) {

+			syslog(LOG_ERR, "failed to query socket name: %s",

+                               strerror(errno));

+			goto error;

+		}

+

+		/* Copy the address */

+		taddr.addr.maxlen = taddr.addr.len = addrlen;

+		taddr.addr.buf = malloc(addrlen);

+		if (taddr.addr.buf == NULL) {

+			syslog(LOG_ERR,

+                               "cannot allocate memory for %s address",

+                               nconf->nc_netid);

+			goto error;

+		}

+		memcpy(taddr.addr.buf, &sa, addrlen);

+

+		my_xprt = (SVCXPRT *)svc_tli_create(fd, nconf, &taddr,

+                          RPC_MAXDATASIZE, RPC_MAXDATASIZE);

+		if (my_xprt == (SVCXPRT *)NULL) {

+			syslog(LOG_ERR, "%s: could not create service",

+                               nconf->nc_netid);

+			goto error;

+		}

+	}

+

+	/*

+	 * If none of the systemd sockets matched, we set up the socket in

+	 * the normal way:

+	 */

+#endif

+	if (my_xprt != NULL)

+		goto got_socket;

 	/*

 	 * XXX - using RPC library internal functions. For NC_TPI_CLTS

@@ -322,12 +396,6 @@ init_transport(struct netconfig *nconf)

 		}

 	}

-	if (!__rpc_nconf2sockinfo(nconf, &si)) {

-		syslog(LOG_ERR, "cannot get information for %s",

-		    nconf->nc_netid);

-		return (1);

-	}

-

 	if ((strcmp(nconf->nc_netid, "local") == 0) ||

 	    (strcmp(nconf->nc_netid, "unix") == 0)) {

 		memset(&sun, 0, sizeof sun);

@@ -564,6 +632,7 @@ init_transport(struct netconfig *nconf)

 			goto error;

 		}

 	}

+got_socket:

 #ifdef PORTMAP

 	/*