Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
32f772a7dd | ||
|
e4eea6588f | ||
|
|
8b5dd7733d | ||
|
|
8b146ac82d | ||
|
|
e9bedb08c6 | ||
|
|
04ed069bb3 |
12 changed files with 964 additions and 759 deletions
|
|
@ -1,12 +1,11 @@
|
|||
diff -up rpcbind-0.2.3/systemd/rpcbind.service.in.orig rpcbind-0.2.3/systemd/rpcbind.service.in
|
||||
--- rpcbind-0.2.3/systemd/rpcbind.service.in.orig 2016-11-07 14:45:17.440658739 -0500
|
||||
+++ rpcbind-0.2.3/systemd/rpcbind.service.in 2016-11-07 14:46:50.968844715 -0500
|
||||
@@ -10,7 +10,7 @@ After=rpcbind.socket
|
||||
|
||||
diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpcbind.service.in
|
||||
--- rpcbind-0.2.4/systemd/rpcbind.service.in.orig 2017-12-16 15:49:07.830889473 -0500
|
||||
+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-12-16 15:49:43.156610673 -0500
|
||||
@@ -12,6 +12,7 @@ Wants=rpcbind.target
|
||||
[Service]
|
||||
Type=notify
|
||||
-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
||||
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
||||
+EnvironmentFile=/etc/sysconfig/rpcbind
|
||||
ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
|
||||
[Install]
|
||||
|
|
|
|||
|
|
@ -1,34 +1,6 @@
|
|||
commit b47e0f12cfa005bb120e018257410663efbd7254
|
||||
Author: Steve Dickson <steved@redhat.com>
|
||||
Date: Tue Nov 15 13:32:40 2016 -0500
|
||||
|
||||
Use systemd-tmpfiles to create the warmstart directory
|
||||
|
||||
When systemd is available have it create the /run/rpcbind
|
||||
warmstart directory. Note, the new rpcbind.conf file
|
||||
expects 'rpc' user and group since that those will be
|
||||
the id/gid that will own the directory.
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 43c2710..d7ca426 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -54,6 +54,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS)
|
||||
systemdsystemunit_DATA = \
|
||||
systemd/rpcbind.service \
|
||||
systemd/rpcbind.socket
|
||||
+
|
||||
+systemdtmpfiles_DATA = \
|
||||
+ systemd/rpcbind.conf
|
||||
endif
|
||||
|
||||
rpcinfo_SOURCES = src/rpcinfo.c
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index acc6914..81adafc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
||||
--- rpcbind-0.2.4/configure.ac.orig 2017-12-16 15:52:22.774298138 -0500
|
||||
+++ rpcbind-0.2.4/configure.ac 2017-12-16 15:52:45.301075188 -0500
|
||||
@@ -52,6 +52,17 @@ AC_ARG_WITH([systemdsystemunitdir],
|
||||
fi
|
||||
AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
||||
|
|
@ -47,11 +19,22 @@ index acc6914..81adafc 100644
|
|||
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 --git a/systemd/rpcbind.conf b/systemd/rpcbind.conf
|
||||
new file mode 100644
|
||||
index 0000000..2f8af45
|
||||
--- /dev/null
|
||||
+++ b/systemd/rpcbind.conf
|
||||
diff -up rpcbind-0.2.4/Makefile.am.orig rpcbind-0.2.4/Makefile.am
|
||||
--- rpcbind-0.2.4/Makefile.am.orig 2017-12-16 15:52:22.774298138 -0500
|
||||
+++ rpcbind-0.2.4/Makefile.am 2017-12-16 15:52:45.301075188 -0500
|
||||
@@ -55,6 +55,9 @@ rpcbind_LDADD += $(SYSTEMD_LIBS)
|
||||
systemdsystemunit_DATA = \
|
||||
systemd/rpcbind.service \
|
||||
systemd/rpcbind.socket
|
||||
+
|
||||
+systemdtmpfiles_DATA = \
|
||||
+ systemd/rpcbind.conf
|
||||
endif
|
||||
|
||||
rpcinfo_SOURCES = src/rpcinfo.c
|
||||
diff -up rpcbind-0.2.4/systemd/rpcbind.conf.orig rpcbind-0.2.4/systemd/rpcbind.conf
|
||||
--- rpcbind-0.2.4/systemd/rpcbind.conf.orig 2017-12-16 15:52:45.301075188 -0500
|
||||
+++ rpcbind-0.2.4/systemd/rpcbind.conf 2017-12-16 15:52:45.301075188 -0500
|
||||
@@ -0,0 +1,2 @@
|
||||
+#Type Path Mode UID GID Age Argument
|
||||
+D /run/rpcbind 0700 rpc rpc - -
|
||||
|
|
|
|||
|
|
@ -1,193 +0,0 @@
|
|||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index ff9ce6b..148fe42 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -536,10 +536,6 @@ create_rmtcall_fd(struct netconfig *nconf)
|
||||
rmttail->next = rmt;
|
||||
rmttail = rmt;
|
||||
}
|
||||
- /* XXX not threadsafe */
|
||||
- if (fd > svc_maxfd)
|
||||
- svc_maxfd = fd;
|
||||
- FD_SET(fd, &svc_fdset);
|
||||
return (fd);
|
||||
}
|
||||
|
||||
@@ -1056,9 +1052,6 @@ free_slot_by_index(int index)
|
||||
fi = &FINFO[index];
|
||||
if (fi->flag & FINFO_ACTIVE) {
|
||||
netbuffree(fi->caller_addr);
|
||||
- /* XXX may be too big, but can't access xprt array here */
|
||||
- if (fi->forward_fd >= svc_maxfd)
|
||||
- svc_maxfd--;
|
||||
free(fi->uaddr);
|
||||
fi->flag &= ~FINFO_ACTIVE;
|
||||
rpcb_rmtcalls--;
|
||||
@@ -1097,35 +1090,28 @@ netbuffree(struct netbuf *ap)
|
||||
}
|
||||
|
||||
|
||||
-#define MASKVAL (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)
|
||||
-extern bool_t __svc_clean_idle(fd_set *, int, bool_t);
|
||||
-
|
||||
void
|
||||
my_svc_run()
|
||||
{
|
||||
- size_t nfds;
|
||||
- struct pollfd pollfds[FD_SETSIZE];
|
||||
int poll_ret, check_ret;
|
||||
int n;
|
||||
-#ifdef SVC_RUN_DEBUG
|
||||
- int i;
|
||||
-#endif
|
||||
- register struct pollfd *p;
|
||||
- fd_set cleanfds;
|
||||
|
||||
for (;;) {
|
||||
- p = pollfds;
|
||||
- for (n = 0; n <= svc_maxfd; n++) {
|
||||
- if (FD_ISSET(n, &svc_fdset)) {
|
||||
- p->fd = n;
|
||||
- p->events = MASKVAL;
|
||||
- p++;
|
||||
- }
|
||||
- }
|
||||
- nfds = p - pollfds;
|
||||
- poll_ret = 0;
|
||||
+ struct pollfd my_pollfd[svc_max_pollfd];
|
||||
+ int i;
|
||||
+
|
||||
+ if (svc_max_pollfd == 0 && svc_pollfd == NULL)
|
||||
+ return;
|
||||
|
||||
- switch (poll_ret = poll(pollfds, nfds, 30 * 1000)) {
|
||||
+
|
||||
+ for (i = 0; i < svc_max_pollfd; ++i)
|
||||
+ {
|
||||
+ my_pollfd[i].fd = svc_pollfd[i].fd;
|
||||
+ my_pollfd[i].events = svc_pollfd[i].events;
|
||||
+ my_pollfd[i].revents = 0;
|
||||
+ }
|
||||
+
|
||||
+ switch (poll_ret = poll(my_pollfd, svc_max_pollfd, 30 * 1000)) {
|
||||
case -1:
|
||||
/*
|
||||
* We ignore all errors, continuing with the assumption
|
||||
@@ -1133,8 +1119,6 @@ my_svc_run()
|
||||
* other outside event) and not caused by poll().
|
||||
*/
|
||||
case 0:
|
||||
- cleanfds = svc_fdset;
|
||||
- __svc_clean_idle(&cleanfds, 30, FALSE);
|
||||
continue;
|
||||
default:
|
||||
/*
|
||||
@@ -1144,10 +1128,10 @@ my_svc_run()
|
||||
* don't call svc_getreq_poll. Otherwise, there
|
||||
* must be another so we must call svc_getreq_poll.
|
||||
*/
|
||||
- if ((check_ret = check_rmtcalls(pollfds, nfds)) ==
|
||||
+ if ((check_ret = check_rmtcalls(my_pollfd, svc_max_pollfd)) ==
|
||||
poll_ret)
|
||||
continue;
|
||||
- svc_getreq_poll(pollfds, poll_ret-check_ret);
|
||||
+ svc_getreq_poll(my_pollfd, poll_ret-check_ret);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1183,12 +1167,33 @@ check_rmtcalls(struct pollfd *pfds, int nfds)
|
||||
return (ncallbacks_found);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * This is really a helper function defined in libtirpc,
|
||||
+ * but unfortunately, it hasn't been exported yet.
|
||||
+ */
|
||||
+static struct netbuf *
|
||||
+__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
|
||||
+{
|
||||
+ if (nb->len != len) {
|
||||
+ if (nb->len)
|
||||
+ mem_free(nb->buf, nb->len);
|
||||
+ nb->buf = mem_alloc(len);
|
||||
+ if (nb->buf == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ nb->maxlen = nb->len = len;
|
||||
+ }
|
||||
+ memcpy(nb->buf, ptr, len);
|
||||
+ return nb;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
|
||||
{
|
||||
+ const struct netbuf *caller = fi->caller_addr;
|
||||
u_int32_t *xidp;
|
||||
|
||||
- *(svc_getrpccaller(xprt)) = *(fi->caller_addr);
|
||||
+ __rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
|
||||
xidp = __rpcb_get_dg_xidp(xprt);
|
||||
*xidp = fi->caller_xid;
|
||||
}
|
||||
@@ -1274,10 +1279,17 @@ handle_reply(int fd, SVCXPRT *xprt)
|
||||
a.rmt_localvers = fi->versnum;
|
||||
|
||||
xprt_set_caller(xprt, fi);
|
||||
+#if defined(SVC_XP_AUTH)
|
||||
+ SVC_XP_AUTH(xprt) = svc_auth_none;
|
||||
+#else
|
||||
xprt->xp_auth = &svc_auth_none;
|
||||
+#endif
|
||||
svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
|
||||
+#if !defined(SVC_XP_AUTH)
|
||||
SVCAUTH_DESTROY(xprt->xp_auth);
|
||||
xprt->xp_auth = NULL;
|
||||
+#endif
|
||||
+
|
||||
done:
|
||||
if (buffer)
|
||||
free(buffer);
|
||||
diff --git a/src/rpcbind.c b/src/rpcbind.c
|
||||
index 045daa1..c4265cd 100644
|
||||
--- a/src/rpcbind.c
|
||||
+++ b/src/rpcbind.c
|
||||
@@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
|
||||
int debugging = 0; /* Tell me what's going on */
|
||||
int doabort = 0; /* When debugging, do an abort on errors */
|
||||
int dofork = 1; /* fork? */
|
||||
+int createdsocket = 0; /* Did I create the socket or systemd did it for me? */
|
||||
|
||||
rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */
|
||||
|
||||
@@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
|
||||
memset(&sun, 0, sizeof sun);
|
||||
sun.sun_family = AF_LOCAL;
|
||||
unlink(_PATH_RPCBINDSOCK);
|
||||
+ createdsocket = 1; /* We are now in the process of creating the unix socket */
|
||||
strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
|
||||
addrlen = SUN_LEN(&sun);
|
||||
sa = (struct sockaddr *)&sun;
|
||||
@@ -846,7 +848,8 @@ static void
|
||||
terminate(int dummy /*__unused*/)
|
||||
{
|
||||
close(rpcbindlockfd);
|
||||
- unlink(_PATH_RPCBINDSOCK);
|
||||
+ if(createdsocket)
|
||||
+ unlink(_PATH_RPCBINDSOCK);
|
||||
unlink(RPCBINDDLOCK);
|
||||
#ifdef WARMSTART
|
||||
write_warmstart(); /* Dump yourself */
|
||||
diff --git a/src/security.c b/src/security.c
|
||||
index 0c9453f..c54ce26 100644
|
||||
--- a/src/security.c
|
||||
+++ b/src/security.c
|
||||
@@ -17,6 +17,8 @@
|
||||
#include <syslog.h>
|
||||
#include <netdb.h>
|
||||
|
||||
+#include "xlog.h"
|
||||
+
|
||||
/*
|
||||
* XXX for special case checks in check_callit.
|
||||
*/
|
||||
|
|
@ -1,474 +0,0 @@
|
|||
diff --git a/.gitignore b/.gitignore
|
||||
index 321dff6..a8f1fed 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -27,3 +27,4 @@ rpcbind
|
||||
rpcinfo
|
||||
# cscope database files
|
||||
cscope.*
|
||||
+systemd/rpcbind.service
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 5ec8cd6..43c2710 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -50,6 +50,10 @@ if SYSTEMD
|
||||
AM_CPPFLAGS += $(SYSTEMD_CFLAGS) -DSYSTEMD
|
||||
|
||||
rpcbind_LDADD += $(SYSTEMD_LIBS)
|
||||
+
|
||||
+systemdsystemunit_DATA = \
|
||||
+ systemd/rpcbind.service \
|
||||
+ systemd/rpcbind.socket
|
||||
endif
|
||||
|
||||
rpcinfo_SOURCES = src/rpcinfo.c
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index af4b74b..f84921e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -61,4 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
|
||||
|
||||
AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
|
||||
|
||||
-AC_OUTPUT([Makefile])
|
||||
+# make sbindir available for substitution in config file
|
||||
+# 2 "evals" needed to expand variable names
|
||||
+AC_SUBST([_sbindir])
|
||||
+AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
||||
+
|
||||
+AC_OUTPUT([Makefile systemd/rpcbind.service])
|
||||
diff --git a/src/check_bound.c b/src/check_bound.c
|
||||
index c70b845..92bfd36 100644
|
||||
--- a/src/check_bound.c
|
||||
+++ b/src/check_bound.c
|
||||
@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */
|
||||
static struct fdlist *fdtail;
|
||||
static char *nullstring = "";
|
||||
|
||||
-static bool_t check_bound __P((struct fdlist *, char *uaddr));
|
||||
+static bool_t check_bound(struct fdlist *, char *uaddr);
|
||||
|
||||
/*
|
||||
* Returns 1 if the given address is bound for the given addr & transport
|
||||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index ad28b93..4c744fe 100644
|
||||
--- a/src/pmap_svc.c
|
||||
+++ b/src/pmap_svc.c
|
||||
@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
|
||||
#include "rpcbind.h"
|
||||
#include "xlog.h"
|
||||
#include <rpc/svc_soc.h> /* svc_getcaller routine definition */
|
||||
-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
|
||||
- rpcprot_t));
|
||||
-static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
|
||||
-static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
|
||||
-static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
|
||||
+static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t,
|
||||
+ rpcprot_t);
|
||||
+static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long);
|
||||
+static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *);
|
||||
+static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *);
|
||||
|
||||
/*
|
||||
* Called for all the version 2 inquiries.
|
||||
diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
|
||||
index bd92201..709e3fb 100644
|
||||
--- a/src/rpcb_svc.c
|
||||
+++ b/src/rpcb_svc.c
|
||||
@@ -53,10 +53,10 @@
|
||||
#include "rpcbind.h"
|
||||
#include "xlog.h"
|
||||
|
||||
-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
|
||||
- rpcvers_t));
|
||||
-static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
|
||||
- rpcvers_t));
|
||||
+static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *,
|
||||
+ rpcvers_t);
|
||||
+static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *,
|
||||
+ rpcvers_t);
|
||||
|
||||
/*
|
||||
* Called by svc_getreqset. There is a separate server handle for
|
||||
@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
} argument;
|
||||
char *result;
|
||||
xdrproc_t xdr_argument, xdr_result;
|
||||
- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
|
||||
+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
rpcprog_t setprog = 0;
|
||||
|
||||
rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
|
||||
diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
|
||||
index b673452..5094879 100644
|
||||
--- a/src/rpcb_svc_4.c
|
||||
+++ b/src/rpcb_svc_4.c
|
||||
@@ -54,13 +54,11 @@
|
||||
#include "rpcbind.h"
|
||||
#include "xlog.h"
|
||||
|
||||
-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
|
||||
- rpcvers_t));
|
||||
-static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
|
||||
-static void *rpcbproc_getaddrlist_4_local
|
||||
- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
|
||||
-static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));
|
||||
-static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
|
||||
+static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
+static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
+static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
+static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
|
||||
+static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
|
||||
/*
|
||||
* Called by svc_getreqset. There is a separate server handle for
|
||||
@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
} argument;
|
||||
char *result;
|
||||
xdrproc_t xdr_argument, xdr_result;
|
||||
- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
|
||||
+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
||||
rpcprog_t setprog = 0;
|
||||
|
||||
rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
|
||||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index ff9ce6b..5862c26 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -100,29 +100,29 @@ struct finfo {
|
||||
static struct finfo FINFO[NFORWARD];
|
||||
|
||||
|
||||
-static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *));
|
||||
-static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *));
|
||||
-static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
|
||||
-static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
|
||||
-static int find_rmtcallfd_by_netid __P((char *));
|
||||
-static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
|
||||
-static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
|
||||
- rpcproc_t, rpcvers_t, u_int32_t *));
|
||||
-static struct finfo *forward_find __P((u_int32_t));
|
||||
-static int free_slot_by_xid __P((u_int32_t));
|
||||
-static int free_slot_by_index __P((int));
|
||||
-static int netbufcmp __P((struct netbuf *, struct netbuf *));
|
||||
-static struct netbuf *netbufdup __P((struct netbuf *));
|
||||
-static void netbuffree __P((struct netbuf *));
|
||||
-static int check_rmtcalls __P((struct pollfd *, int));
|
||||
-static void xprt_set_caller __P((SVCXPRT *, struct finfo *));
|
||||
-static void send_svcsyserr __P((SVCXPRT *, struct finfo *));
|
||||
-static void handle_reply __P((int, SVCXPRT *));
|
||||
-static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *));
|
||||
-static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));
|
||||
-static char *getowner __P((SVCXPRT *, char *, size_t));
|
||||
-static int add_pmaplist __P((RPCB *));
|
||||
-static int del_pmaplist __P((RPCB *));
|
||||
+static bool_t xdr_encap_parms(XDR *, struct encap_parms *);
|
||||
+static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *);
|
||||
+static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *);
|
||||
+static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *);
|
||||
+static int find_rmtcallfd_by_netid(char *);
|
||||
+static SVCXPRT *find_rmtcallxprt_by_fd(int);
|
||||
+static int forward_register(u_int32_t, struct netbuf *, int, char *,
|
||||
+ rpcproc_t, rpcvers_t, u_int32_t *);
|
||||
+static struct finfo *forward_find(u_int32_t);
|
||||
+static int free_slot_by_xid(u_int32_t);
|
||||
+static int free_slot_by_index(int);
|
||||
+static int netbufcmp(struct netbuf *, struct netbuf *);
|
||||
+static struct netbuf *netbufdup(struct netbuf *);
|
||||
+static void netbuffree(struct netbuf *);
|
||||
+static int check_rmtcalls(struct pollfd *, int);
|
||||
+static void xprt_set_caller(SVCXPRT *, struct finfo *);
|
||||
+static void send_svcsyserr(SVCXPRT *, struct finfo *);
|
||||
+static void handle_reply(int, SVCXPRT *);
|
||||
+static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
|
||||
+static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
|
||||
+static char *getowner(SVCXPRT *, char *, size_t);
|
||||
+static int add_pmaplist(RPCB *);
|
||||
+static int del_pmaplist(RPCB *);
|
||||
|
||||
/*
|
||||
* Set a mapping of program, version, netid
|
||||
@@ -536,10 +536,6 @@ create_rmtcall_fd(struct netconfig *nconf)
|
||||
rmttail->next = rmt;
|
||||
rmttail = rmt;
|
||||
}
|
||||
- /* XXX not threadsafe */
|
||||
- if (fd > svc_maxfd)
|
||||
- svc_maxfd = fd;
|
||||
- FD_SET(fd, &svc_fdset);
|
||||
return (fd);
|
||||
}
|
||||
|
||||
@@ -1056,9 +1052,6 @@ free_slot_by_index(int index)
|
||||
fi = &FINFO[index];
|
||||
if (fi->flag & FINFO_ACTIVE) {
|
||||
netbuffree(fi->caller_addr);
|
||||
- /* XXX may be too big, but can't access xprt array here */
|
||||
- if (fi->forward_fd >= svc_maxfd)
|
||||
- svc_maxfd--;
|
||||
free(fi->uaddr);
|
||||
fi->flag &= ~FINFO_ACTIVE;
|
||||
rpcb_rmtcalls--;
|
||||
@@ -1097,35 +1090,28 @@ netbuffree(struct netbuf *ap)
|
||||
}
|
||||
|
||||
|
||||
-#define MASKVAL (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)
|
||||
-extern bool_t __svc_clean_idle(fd_set *, int, bool_t);
|
||||
-
|
||||
void
|
||||
my_svc_run()
|
||||
{
|
||||
- size_t nfds;
|
||||
- struct pollfd pollfds[FD_SETSIZE];
|
||||
int poll_ret, check_ret;
|
||||
int n;
|
||||
-#ifdef SVC_RUN_DEBUG
|
||||
- int i;
|
||||
-#endif
|
||||
- register struct pollfd *p;
|
||||
- fd_set cleanfds;
|
||||
|
||||
for (;;) {
|
||||
- p = pollfds;
|
||||
- for (n = 0; n <= svc_maxfd; n++) {
|
||||
- if (FD_ISSET(n, &svc_fdset)) {
|
||||
- p->fd = n;
|
||||
- p->events = MASKVAL;
|
||||
- p++;
|
||||
- }
|
||||
- }
|
||||
- nfds = p - pollfds;
|
||||
- poll_ret = 0;
|
||||
+ struct pollfd my_pollfd[svc_max_pollfd];
|
||||
+ int i;
|
||||
+
|
||||
+ if (svc_max_pollfd == 0 && svc_pollfd == NULL)
|
||||
+ return;
|
||||
|
||||
- switch (poll_ret = poll(pollfds, nfds, 30 * 1000)) {
|
||||
+
|
||||
+ for (i = 0; i < svc_max_pollfd; ++i)
|
||||
+ {
|
||||
+ my_pollfd[i].fd = svc_pollfd[i].fd;
|
||||
+ my_pollfd[i].events = svc_pollfd[i].events;
|
||||
+ my_pollfd[i].revents = 0;
|
||||
+ }
|
||||
+
|
||||
+ switch (poll_ret = poll(my_pollfd, svc_max_pollfd, 30 * 1000)) {
|
||||
case -1:
|
||||
/*
|
||||
* We ignore all errors, continuing with the assumption
|
||||
@@ -1133,8 +1119,6 @@ my_svc_run()
|
||||
* other outside event) and not caused by poll().
|
||||
*/
|
||||
case 0:
|
||||
- cleanfds = svc_fdset;
|
||||
- __svc_clean_idle(&cleanfds, 30, FALSE);
|
||||
continue;
|
||||
default:
|
||||
/*
|
||||
@@ -1144,10 +1128,10 @@ my_svc_run()
|
||||
* don't call svc_getreq_poll. Otherwise, there
|
||||
* must be another so we must call svc_getreq_poll.
|
||||
*/
|
||||
- if ((check_ret = check_rmtcalls(pollfds, nfds)) ==
|
||||
+ if ((check_ret = check_rmtcalls(my_pollfd, svc_max_pollfd)) ==
|
||||
poll_ret)
|
||||
continue;
|
||||
- svc_getreq_poll(pollfds, poll_ret-check_ret);
|
||||
+ svc_getreq_poll(my_pollfd, poll_ret-check_ret);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1183,12 +1167,33 @@ check_rmtcalls(struct pollfd *pfds, int nfds)
|
||||
return (ncallbacks_found);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * This is really a helper function defined in libtirpc,
|
||||
+ * but unfortunately, it hasn't been exported yet.
|
||||
+ */
|
||||
+static struct netbuf *
|
||||
+__rpc_set_netbuf(struct netbuf *nb, const void *ptr, size_t len)
|
||||
+{
|
||||
+ if (nb->len != len) {
|
||||
+ if (nb->len)
|
||||
+ mem_free(nb->buf, nb->len);
|
||||
+ nb->buf = mem_alloc(len);
|
||||
+ if (nb->buf == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ nb->maxlen = nb->len = len;
|
||||
+ }
|
||||
+ memcpy(nb->buf, ptr, len);
|
||||
+ return nb;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
|
||||
{
|
||||
+ const struct netbuf *caller = fi->caller_addr;
|
||||
u_int32_t *xidp;
|
||||
|
||||
- *(svc_getrpccaller(xprt)) = *(fi->caller_addr);
|
||||
+ __rpc_set_netbuf(svc_getrpccaller(xprt), caller->buf, caller->len);
|
||||
xidp = __rpcb_get_dg_xidp(xprt);
|
||||
*xidp = fi->caller_xid;
|
||||
}
|
||||
@@ -1274,10 +1279,17 @@ handle_reply(int fd, SVCXPRT *xprt)
|
||||
a.rmt_localvers = fi->versnum;
|
||||
|
||||
xprt_set_caller(xprt, fi);
|
||||
+#if defined(SVC_XP_AUTH)
|
||||
+ SVC_XP_AUTH(xprt) = svc_auth_none;
|
||||
+#else
|
||||
xprt->xp_auth = &svc_auth_none;
|
||||
+#endif
|
||||
svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
|
||||
+#if !defined(SVC_XP_AUTH)
|
||||
SVCAUTH_DESTROY(xprt->xp_auth);
|
||||
xprt->xp_auth = NULL;
|
||||
+#endif
|
||||
+
|
||||
done:
|
||||
if (buffer)
|
||||
free(buffer);
|
||||
diff --git a/src/rpcbind.c b/src/rpcbind.c
|
||||
index 045daa1..87ccdc2 100644
|
||||
--- a/src/rpcbind.c
|
||||
+++ b/src/rpcbind.c
|
||||
@@ -87,6 +87,7 @@ static inline void __nss_configure_lookup(const char *db, const char *s) {}
|
||||
int debugging = 0; /* Tell me what's going on */
|
||||
int doabort = 0; /* When debugging, do an abort on errors */
|
||||
int dofork = 1; /* fork? */
|
||||
+int createdsocket = 0; /* Did I create the socket or systemd did it for me? */
|
||||
|
||||
rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */
|
||||
|
||||
@@ -135,13 +136,13 @@ char *tcp_uaddr; /* Universal TCP address */
|
||||
static char servname[] = "rpcbind";
|
||||
static char superuser[] = "superuser";
|
||||
|
||||
-int main __P((int, char *[]));
|
||||
+int main(int, char *[]);
|
||||
|
||||
-static int init_transport __P((struct netconfig *));
|
||||
-static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,
|
||||
- struct netbuf *));
|
||||
-static void terminate __P((int));
|
||||
-static void parseargs __P((int, char *[]));
|
||||
+static int init_transport(struct netconfig *);
|
||||
+static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
|
||||
+ struct netbuf *);
|
||||
+static void terminate(int);
|
||||
+static void parseargs(int, char *[]);
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
@@ -445,6 +446,7 @@ init_transport(struct netconfig *nconf)
|
||||
memset(&sun, 0, sizeof sun);
|
||||
sun.sun_family = AF_LOCAL;
|
||||
unlink(_PATH_RPCBINDSOCK);
|
||||
+ createdsocket = 1; /* We are now in the process of creating the unix socket */
|
||||
strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
|
||||
addrlen = SUN_LEN(&sun);
|
||||
sa = (struct sockaddr *)&sun;
|
||||
@@ -846,7 +848,8 @@ static void
|
||||
terminate(int dummy /*__unused*/)
|
||||
{
|
||||
close(rpcbindlockfd);
|
||||
- unlink(_PATH_RPCBINDSOCK);
|
||||
+ if(createdsocket)
|
||||
+ unlink(_PATH_RPCBINDSOCK);
|
||||
unlink(RPCBINDDLOCK);
|
||||
#ifdef WARMSTART
|
||||
write_warmstart(); /* Dump yourself */
|
||||
diff --git a/src/security.c b/src/security.c
|
||||
index 0c9453f..c54ce26 100644
|
||||
--- a/src/security.c
|
||||
+++ b/src/security.c
|
||||
@@ -17,6 +17,8 @@
|
||||
#include <syslog.h>
|
||||
#include <netdb.h>
|
||||
|
||||
+#include "xlog.h"
|
||||
+
|
||||
/*
|
||||
* XXX for special case checks in check_callit.
|
||||
*/
|
||||
diff --git a/src/util.c b/src/util.c
|
||||
index a6c835b..74b0284 100644
|
||||
--- a/src/util.c
|
||||
+++ b/src/util.c
|
||||
@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
|
||||
static struct sockaddr_in6 *local_in6;
|
||||
#endif
|
||||
|
||||
-static int bitmaskcmp __P((void *, void *, void *, int));
|
||||
+static int bitmaskcmp(void *, void *, void *, int);
|
||||
|
||||
/*
|
||||
* For all bits set in "mask", compare the corresponding bits in
|
||||
diff --git a/src/warmstart.c b/src/warmstart.c
|
||||
index b6eb73e..122a058 100644
|
||||
--- a/src/warmstart.c
|
||||
+++ b/src/warmstart.c
|
||||
@@ -58,8 +58,8 @@
|
||||
#define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
|
||||
#endif
|
||||
|
||||
-static bool_t write_struct __P((char *, xdrproc_t, void *));
|
||||
-static bool_t read_struct __P((char *, xdrproc_t, void *));
|
||||
+static bool_t write_struct(char *, xdrproc_t, void *);
|
||||
+static bool_t read_struct(char *, xdrproc_t, void *);
|
||||
|
||||
static bool_t
|
||||
write_struct(char *filename, xdrproc_t structproc, void *list)
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
new file mode 100644
|
||||
index 0000000..c173b83
|
||||
--- /dev/null
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -0,0 +1,17 @@
|
||||
+[Unit]
|
||||
+Description=RPC Bind
|
||||
+Documentation=man:rpcbind(8)
|
||||
+DefaultDependencies=no
|
||||
+
|
||||
+# Make sure we use the IP addresses listed for
|
||||
+# rpcbind.socket, no matter how this unit is started.
|
||||
+Wants=rpcbind.socket
|
||||
+After=rpcbind.socket
|
||||
+
|
||||
+[Service]
|
||||
+Type=notify
|
||||
+# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
||||
+ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/systemd/rpcbind.socket b/systemd/rpcbind.socket
|
||||
new file mode 100644
|
||||
index 0000000..3b1a936
|
||||
--- /dev/null
|
||||
+++ b/systemd/rpcbind.socket
|
||||
@@ -0,0 +1,18 @@
|
||||
+[Unit]
|
||||
+Description=RPCbind Server Activation Socket
|
||||
+DefaultDependencies=no
|
||||
+Wants=rpcbind.target
|
||||
+Before=rpcbind.target
|
||||
+
|
||||
+[Socket]
|
||||
+ListenStream=/run/rpcbind.sock
|
||||
+
|
||||
+# RPC netconfig can't handle ipv6/ipv4 dual sockets
|
||||
+BindIPv6Only=ipv6-only
|
||||
+ListenStream=0.0.0.0:111
|
||||
+ListenDatagram=0.0.0.0:111
|
||||
+ListenStream=[::]:111
|
||||
+ListenDatagram=[::]:111
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=sockets.target
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
||||
--- rpcbind-0.2.4/configure.ac.orig 2017-01-03 13:51:48.426758826 -0500
|
||||
+++ rpcbind-0.2.4/configure.ac 2017-01-16 11:19:12.888958858 -0500
|
||||
--- rpcbind-0.2.4/configure.ac.orig 2017-12-16 15:53:47.253462041 -0500
|
||||
+++ rpcbind-0.2.4/configure.ac 2017-12-16 15:54:01.089325106 -0500
|
||||
@@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts],
|
||||
AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
|
||||
|
||||
|
|
@ -13,9 +13,9 @@ diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
|
|||
|
||||
AC_ARG_WITH([rpcuser],
|
||||
diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
||||
--- rpcbind-0.2.4/configure.orig 2017-01-03 13:51:50.222749413 -0500
|
||||
+++ rpcbind-0.2.4/configure 2017-01-16 11:20:29.650978018 -0500
|
||||
@@ -1389,7 +1389,7 @@ Optional Features:
|
||||
--- rpcbind-0.2.4/configure.orig 2016-11-30 09:03:59.000000000 -0500
|
||||
+++ rpcbind-0.2.4/configure 2017-12-16 15:54:01.091325086 -0500
|
||||
@@ -1387,7 +1387,7 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
|
|
@ -24,7 +24,7 @@ diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
|||
|
||||
--with-rpcuser=ARG use ARG for RPC [default=root]
|
||||
|
||||
@@ -3887,7 +3887,7 @@ fi
|
||||
@@ -3883,7 +3883,7 @@ fi
|
||||
if test "${with_statedir+set}" = set; then :
|
||||
withval=$with_statedir;
|
||||
else
|
||||
|
|
@ -35,7 +35,7 @@ diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
|
|||
statedir=$with_statedir
|
||||
diff -up rpcbind-0.2.4/man/rpcbind-fr.8.orig rpcbind-0.2.4/man/rpcbind-fr.8
|
||||
--- rpcbind-0.2.4/man/rpcbind-fr.8.orig 2016-11-28 15:47:28.000000000 -0500
|
||||
+++ rpcbind-0.2.4/man/rpcbind-fr.8 2017-01-16 11:19:12.888958858 -0500
|
||||
+++ rpcbind-0.2.4/man/rpcbind-fr.8 2017-12-16 15:54:01.091325086 -0500
|
||||
@@ -138,8 +138,8 @@ est redémarré.
|
||||
.Xr rpcbind 3 ,
|
||||
.Xr rpcinfo 8
|
||||
|
|
@ -49,7 +49,7 @@ diff -up rpcbind-0.2.4/man/rpcbind-fr.8.orig rpcbind-0.2.4/man/rpcbind-fr.8
|
|||
.El
|
||||
diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c
|
||||
--- rpcbind-0.2.4/src/rpcbind.c.orig 2016-11-28 15:47:28.000000000 -0500
|
||||
+++ rpcbind-0.2.4/src/rpcbind.c 2017-01-16 11:20:16.499974736 -0500
|
||||
+++ rpcbind-0.2.4/src/rpcbind.c 2017-12-16 15:54:01.092325076 -0500
|
||||
@@ -106,7 +106,7 @@ char *nss_modules = "files";
|
||||
/* who to suid to if -s is given */
|
||||
#define RUN_AS "daemon"
|
||||
|
|
|
|||
35
rpcbind-0.2.4-systemd-rundir.patch
Normal file
35
rpcbind-0.2.4-systemd-rundir.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c
|
||||
--- rpcbind-0.2.4/src/rpcbind.c.orig 2017-03-21 10:12:35.005190509 -0400
|
||||
+++ rpcbind-0.2.4/src/rpcbind.c 2017-03-21 10:36:45.510507649 -0400
|
||||
@@ -144,6 +144,8 @@ static void rbllist_add(rpcprog_t, rpcve
|
||||
static void terminate(int);
|
||||
static void parseargs(int, char *[]);
|
||||
|
||||
+char *systemdtmp = "/usr/bin/systemd-tmpfiles --create rpcbind.conf";
|
||||
+
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
@@ -151,13 +153,21 @@ main(int argc, char *argv[])
|
||||
void *nc_handle; /* Net config handle */
|
||||
struct rlimit rl;
|
||||
int maxrec = RPC_MAXDATASIZE;
|
||||
+ int once = 1;
|
||||
|
||||
parseargs(argc, argv);
|
||||
|
||||
+tryagain:
|
||||
/* Check that another rpcbind isn't already running. */
|
||||
if ((rpcbindlockfd = (open(RPCBINDDLOCK,
|
||||
- O_RDONLY|O_CREAT, 0444))) == -1)
|
||||
+ O_RDONLY|O_CREAT, 0444))) == -1) {
|
||||
+ if (once) {
|
||||
+ once = system(systemdtmp); /* set once to avoid a warning */
|
||||
+ once = 0;
|
||||
+ goto tryagain;
|
||||
+ }
|
||||
err(1, "%s", RPCBINDDLOCK);
|
||||
+ }
|
||||
|
||||
if(flock(rpcbindlockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK)
|
||||
errx(1, "another rpcbind is already running. Aborting");
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpcbind.service.in
|
||||
--- rpcbind-0.2.4/systemd/rpcbind.service.in.orig 2017-01-28 11:47:59.505282030 -0500
|
||||
+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-01-28 13:13:43.763324301 -0500
|
||||
@@ -6,8 +6,8 @@ RequiresMountsFor=@statedir@
|
||||
|
||||
--- rpcbind-0.2.4/systemd/rpcbind.service.in.orig 2017-12-16 15:46:12.896270101 -0500
|
||||
+++ rpcbind-0.2.4/systemd/rpcbind.service.in 2017-12-16 15:46:43.672027210 -0500
|
||||
@@ -7,7 +7,8 @@ RequiresMountsFor=@statedir@
|
||||
# Make sure we use the IP addresses listed for
|
||||
# rpcbind.socket, no matter how this unit is started.
|
||||
-Wants=rpcbind.socket
|
||||
-After=rpcbind.socket
|
||||
+Wants=rpcbind.socket systemd-tmpfiles-setup.service
|
||||
+After=rpcbind.socket systemd-tmpfiles-setup.service
|
||||
Requires=rpcbind.socket
|
||||
-Wants=rpcbind.target
|
||||
+Wants=rpcbind.target systemd-tmpfiles-setup.service
|
||||
+After=systemd-tmpfiles-setup.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
commit ee569be4d6189a68b38d2af162af00ff475b48e2
|
||||
Author: Yann Leprince <yann.leprince@ylep.fr>
|
||||
Date: Wed Dec 21 14:32:54 2016 -0500
|
||||
|
||||
Fix boot dependency in systemd service file
|
||||
|
||||
From: Yann Leprince <yann.leprince@ylep.fr>
|
||||
|
||||
This fix ensures that a separate /var partition will be mounted before
|
||||
rpcbind tries to write its status to /var/run.
|
||||
|
||||
Acked-by: NeilBrown <neilb@suse.com>
|
||||
Signed-off-by: Yann Leprince <yann.leprince@ylep.fr>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
index e7e86da..03a9e0b 100644
|
||||
--- a/systemd/rpcbind.service.in
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -2,6 +2,7 @@
|
||||
Description=RPC Bind
|
||||
Documentation=man:rpcbind(8)
|
||||
DefaultDependencies=no
|
||||
+RequiresMountsFor=@statedir@
|
||||
|
||||
# Make sure we use the IP addresses listed for
|
||||
# rpcbind.socket, no matter how this unit is started.
|
||||
185
rpcbind-0.2.5-rc1.patch
Normal file
185
rpcbind-0.2.5-rc1.patch
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index 4c744fe..e926cdc 100644
|
||||
--- a/src/pmap_svc.c
|
||||
+++ b/src/pmap_svc.c
|
||||
@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
long ans;
|
||||
uid_t uid;
|
||||
char uidbuf[32];
|
||||
+ int rc = TRUE;
|
||||
|
||||
/*
|
||||
* Can't use getpwnam here. We might end up calling ourselves
|
||||
@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = (FALSE);
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
rpcbreg.r_prog = reg.pm_prog;
|
||||
@@ -258,7 +261,16 @@ done_change:
|
||||
rpcbs_set(RPCBVERS_2_STAT, ans);
|
||||
else
|
||||
rpcbs_unset(RPCBVERS_2_STAT, ans);
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
@@ -272,15 +284,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
#ifdef RPCBIND_DEBUG
|
||||
char *uaddr;
|
||||
#endif
|
||||
+ int rc = TRUE;
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
#ifdef RPCBIND_DEBUG
|
||||
@@ -330,21 +345,34 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
|
||||
port ? udptrans : "");
|
||||
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static bool_t
|
||||
pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
{
|
||||
+ int rc = TRUE;
|
||||
+
|
||||
if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
|
||||
@@ -354,7 +382,17 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
rpcbind_abort();
|
||||
}
|
||||
}
|
||||
- return (TRUE);
|
||||
+
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
int pmap_netid2ipprot(const char *netid)
|
||||
diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
|
||||
index 709e3fb..091f530 100644
|
||||
--- a/src/rpcb_svc.c
|
||||
+++ b/src/rpcb_svc.c
|
||||
@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
|
||||
index 5094879..eebbbbe 100644
|
||||
--- a/src/rpcb_svc_4.c
|
||||
+++ b/src/rpcb_svc_4.c
|
||||
@@ -218,7 +218,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode\n");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index 5862c26..cb63afd 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -927,6 +927,14 @@ error:
|
||||
if (call_msg.rm_xid != 0)
|
||||
(void) free_slot_by_xid(call_msg.rm_xid);
|
||||
out:
|
||||
+ if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
if (local_uaddr)
|
||||
free(local_uaddr);
|
||||
if (buf_alloc)
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
index e7e86da..03a9e0b 100644
|
||||
--- a/systemd/rpcbind.service.in
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -2,6 +2,7 @@
|
||||
Description=RPC Bind
|
||||
Documentation=man:rpcbind(8)
|
||||
DefaultDependencies=no
|
||||
+RequiresMountsFor=@statedir@
|
||||
|
||||
# Make sure we use the IP addresses listed for
|
||||
# rpcbind.socket, no matter how this unit is started.
|
||||
310
rpcbind-0.2.5-rc2.patch
Normal file
310
rpcbind-0.2.5-rc2.patch
Normal file
|
|
@ -0,0 +1,310 @@
|
|||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index 4c744fe..a53dd5f 100644
|
||||
--- a/src/pmap_svc.c
|
||||
+++ b/src/pmap_svc.c
|
||||
@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
long ans;
|
||||
uid_t uid;
|
||||
char uidbuf[32];
|
||||
+ int rc = TRUE;
|
||||
|
||||
/*
|
||||
* Can't use getpwnam here. We might end up calling ourselves
|
||||
@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = (FALSE);
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
rpcbreg.r_prog = reg.pm_prog;
|
||||
@@ -258,7 +261,18 @@ done_change:
|
||||
rpcbs_set(RPCBVERS_2_STAT, ans);
|
||||
else
|
||||
rpcbs_unset(RPCBVERS_2_STAT, ans);
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
@@ -272,15 +286,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
#ifdef RPCBIND_DEBUG
|
||||
char *uaddr;
|
||||
#endif
|
||||
+ int rc = TRUE;
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
#ifdef RPCBIND_DEBUG
|
||||
@@ -330,21 +347,36 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
|
||||
port ? udptrans : "");
|
||||
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static bool_t
|
||||
pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
{
|
||||
+ int rc = TRUE;
|
||||
+
|
||||
if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
|
||||
@@ -354,7 +386,19 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
rpcbind_abort();
|
||||
}
|
||||
}
|
||||
- return (TRUE);
|
||||
+
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
int pmap_netid2ipprot(const char *netid)
|
||||
diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
|
||||
index 709e3fb..091f530 100644
|
||||
--- a/src/rpcb_svc.c
|
||||
+++ b/src/rpcb_svc.c
|
||||
@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
|
||||
index 5094879..eebbbbe 100644
|
||||
--- a/src/rpcb_svc_4.c
|
||||
+++ b/src/rpcb_svc_4.c
|
||||
@@ -218,7 +218,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode\n");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index 5862c26..d36b090 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -612,9 +612,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
struct netconfig *nconf;
|
||||
struct netbuf *caller;
|
||||
struct r_rmtcall_args a;
|
||||
- char *buf_alloc = NULL, *outbufp;
|
||||
- char *outbuf_alloc = NULL;
|
||||
- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
|
||||
+ char outbuf[RPC_BUF_MAX];
|
||||
struct netbuf *na = (struct netbuf *) NULL;
|
||||
struct rpc_msg call_msg;
|
||||
int outlen;
|
||||
@@ -635,36 +633,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
}
|
||||
if (si.si_socktype != SOCK_DGRAM)
|
||||
return; /* Only datagram type accepted */
|
||||
- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
|
||||
- if (sendsz == 0) { /* data transfer not supported */
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- /*
|
||||
- * Should be multiple of 4 for XDR.
|
||||
- */
|
||||
- sendsz = ((sendsz + 3) / 4) * 4;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- buf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- buf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (buf_alloc == NULL) {
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No Memory!\n");
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- a.rmt_args.args = buf_alloc;
|
||||
- } else {
|
||||
- a.rmt_args.args = buf;
|
||||
- }
|
||||
+ sendsz = UDPMSGSIZE;
|
||||
|
||||
call_msg.rm_xid = 0; /* For error checking purposes */
|
||||
+ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
|
||||
if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_decode(transp);
|
||||
@@ -700,11 +672,11 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
|
||||
rpcbs_rmtcall(versnum - 2, reply_type, a.rmt_prog, a.rmt_vers,
|
||||
a.rmt_proc, transp->xp_netid, rbl);
|
||||
-
|
||||
if (rbl == (rpcblist_ptr)NULL) {
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
- xlog(LOG_DEBUG, "not found\n");
|
||||
+ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n",
|
||||
+ a.rmt_prog, a.rmt_vers);
|
||||
#endif
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_noprog(transp);
|
||||
@@ -818,24 +790,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
||||
call_msg.rm_call.cb_prog = a.rmt_prog;
|
||||
call_msg.rm_call.cb_vers = a.rmt_vers;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- outbuf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- outbuf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (outbuf_alloc == NULL) {
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No memory!\n");
|
||||
- goto error;
|
||||
- }
|
||||
- xdrmem_create(&outxdr, outbuf_alloc, sendsz, XDR_ENCODE);
|
||||
- } else {
|
||||
- xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
- }
|
||||
+
|
||||
+ memset(outbuf, '\0', sendsz); /* Zero out the output buffer */
|
||||
+ xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
+
|
||||
if (!xdr_callhdr(&outxdr, &call_msg)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_systemerr(transp);
|
||||
@@ -900,10 +858,6 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
outlen = (int) XDR_GETPOS(&outxdr);
|
||||
- if (outbuf_alloc)
|
||||
- outbufp = outbuf_alloc;
|
||||
- else
|
||||
- outbufp = outbuf;
|
||||
|
||||
na = uaddr2taddr(nconf, local_uaddr);
|
||||
if (!na) {
|
||||
@@ -912,7 +866,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
|
||||
- if (sendto(fd, outbufp, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
+ if (sendto(fd, outbuf, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
!= outlen) {
|
||||
if (debugging)
|
||||
xlog(LOG_DEBUG,
|
||||
@@ -927,12 +881,16 @@ error:
|
||||
if (call_msg.rm_xid != 0)
|
||||
(void) free_slot_by_xid(call_msg.rm_xid);
|
||||
out:
|
||||
+ if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
if (local_uaddr)
|
||||
free(local_uaddr);
|
||||
- if (buf_alloc)
|
||||
- free(buf_alloc);
|
||||
- if (outbuf_alloc)
|
||||
- free(outbuf_alloc);
|
||||
if (na) {
|
||||
free(na->buf);
|
||||
free(na);
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
index e7e86da..03a9e0b 100644
|
||||
--- a/systemd/rpcbind.service.in
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -2,6 +2,7 @@
|
||||
Description=RPC Bind
|
||||
Documentation=man:rpcbind(8)
|
||||
DefaultDependencies=no
|
||||
+RequiresMountsFor=@statedir@
|
||||
|
||||
# Make sure we use the IP addresses listed for
|
||||
# rpcbind.socket, no matter how this unit is started.
|
||||
362
rpcbind-0.2.5-rc3.patch
Normal file
362
rpcbind-0.2.5-rc3.patch
Normal file
|
|
@ -0,0 +1,362 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 43c2710..c160a95 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -29,7 +29,8 @@ if LIBWRAP
|
||||
AM_CPPFLAGS += -DLIBWRAP
|
||||
endif
|
||||
|
||||
-bin_PROGRAMS = rpcbind rpcinfo
|
||||
+bin_PROGRAMS = rpcinfo
|
||||
+sbin_PROGRAMS = rpcbind
|
||||
|
||||
rpcbind_SOURCES = \
|
||||
src/check_bound.c \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3790310..359a418 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -61,9 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
|
||||
|
||||
AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
|
||||
|
||||
-# make bindir available for substitution in config file
|
||||
+# make sbindir available for substitution in config file
|
||||
# 2 "evals" needed to expand variable names
|
||||
-AC_SUBST([_bindir])
|
||||
-AC_CONFIG_COMMANDS_PRE([eval eval _bindir=$bindir])
|
||||
+AC_SUBST([_sbindir])
|
||||
+AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
||||
|
||||
AC_OUTPUT([Makefile systemd/rpcbind.service])
|
||||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index 4c744fe..a53dd5f 100644
|
||||
--- a/src/pmap_svc.c
|
||||
+++ b/src/pmap_svc.c
|
||||
@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
long ans;
|
||||
uid_t uid;
|
||||
char uidbuf[32];
|
||||
+ int rc = TRUE;
|
||||
|
||||
/*
|
||||
* Can't use getpwnam here. We might end up calling ourselves
|
||||
@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long
|
||||
|
||||
if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = (FALSE);
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
rpcbreg.r_prog = reg.pm_prog;
|
||||
@@ -258,7 +261,18 @@ done_change:
|
||||
rpcbs_set(RPCBVERS_2_STAT, ans);
|
||||
else
|
||||
rpcbs_unset(RPCBVERS_2_STAT, ans);
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
@@ -272,15 +286,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
#ifdef RPCBIND_DEBUG
|
||||
char *uaddr;
|
||||
#endif
|
||||
+ int rc = TRUE;
|
||||
|
||||
if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
#ifdef RPCBIND_DEBUG
|
||||
@@ -330,21 +347,36 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
pmap_ipprot2netid(reg.pm_prot) ?: "<unknown>",
|
||||
port ? udptrans : "");
|
||||
|
||||
- return (TRUE);
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static bool_t
|
||||
pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
{
|
||||
+ int rc = TRUE;
|
||||
+
|
||||
if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) {
|
||||
svcerr_decode(xprt);
|
||||
- return (FALSE);
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) {
|
||||
svcerr_weakauth(xprt);
|
||||
- return FALSE;
|
||||
+ rc = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
|
||||
@@ -354,7 +386,19 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
rpcbind_abort();
|
||||
}
|
||||
}
|
||||
- return (TRUE);
|
||||
+
|
||||
+done:
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) {
|
||||
+#ifdef RPCBIND_DEBUG
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
+ return (rc);
|
||||
}
|
||||
|
||||
int pmap_netid2ipprot(const char *netid)
|
||||
diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
|
||||
index 709e3fb..091f530 100644
|
||||
--- a/src/rpcb_svc.c
|
||||
+++ b/src/rpcb_svc.c
|
||||
@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
|
||||
index 5094879..eebbbbe 100644
|
||||
--- a/src/rpcb_svc_4.c
|
||||
+++ b/src/rpcb_svc_4.c
|
||||
@@ -218,7 +218,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
|
||||
svcerr_decode(transp);
|
||||
if (debugging)
|
||||
(void) xlog(LOG_DEBUG, "rpcbind: could not decode\n");
|
||||
- return;
|
||||
+ goto done;
|
||||
}
|
||||
|
||||
if (rqstp->rq_proc == RPCBPROC_SET
|
||||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index 5862c26..9c1c3af 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -612,9 +612,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
struct netconfig *nconf;
|
||||
struct netbuf *caller;
|
||||
struct r_rmtcall_args a;
|
||||
- char *buf_alloc = NULL, *outbufp;
|
||||
- char *outbuf_alloc = NULL;
|
||||
- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
|
||||
+ char outbuf[RPC_BUF_MAX];
|
||||
struct netbuf *na = (struct netbuf *) NULL;
|
||||
struct rpc_msg call_msg;
|
||||
int outlen;
|
||||
@@ -635,36 +633,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
}
|
||||
if (si.si_socktype != SOCK_DGRAM)
|
||||
return; /* Only datagram type accepted */
|
||||
- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
|
||||
- if (sendsz == 0) { /* data transfer not supported */
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- /*
|
||||
- * Should be multiple of 4 for XDR.
|
||||
- */
|
||||
- sendsz = ((sendsz + 3) / 4) * 4;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- buf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- buf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (buf_alloc == NULL) {
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No Memory!\n");
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- a.rmt_args.args = buf_alloc;
|
||||
- } else {
|
||||
- a.rmt_args.args = buf;
|
||||
- }
|
||||
+ sendsz = UDPMSGSIZE;
|
||||
|
||||
call_msg.rm_xid = 0; /* For error checking purposes */
|
||||
+ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
|
||||
if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_decode(transp);
|
||||
@@ -700,11 +672,11 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
|
||||
rpcbs_rmtcall(versnum - 2, reply_type, a.rmt_prog, a.rmt_vers,
|
||||
a.rmt_proc, transp->xp_netid, rbl);
|
||||
-
|
||||
if (rbl == (rpcblist_ptr)NULL) {
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
- xlog(LOG_DEBUG, "not found\n");
|
||||
+ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n",
|
||||
+ a.rmt_prog, a.rmt_vers);
|
||||
#endif
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_noprog(transp);
|
||||
@@ -818,24 +790,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
||||
call_msg.rm_call.cb_prog = a.rmt_prog;
|
||||
call_msg.rm_call.cb_vers = a.rmt_vers;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- outbuf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- outbuf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (outbuf_alloc == NULL) {
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No memory!\n");
|
||||
- goto error;
|
||||
- }
|
||||
- xdrmem_create(&outxdr, outbuf_alloc, sendsz, XDR_ENCODE);
|
||||
- } else {
|
||||
- xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
- }
|
||||
+
|
||||
+ memset(outbuf, '\0', sendsz); /* Zero out the output buffer */
|
||||
+ xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
|
||||
+
|
||||
if (!xdr_callhdr(&outxdr, &call_msg)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_systemerr(transp);
|
||||
@@ -900,10 +858,6 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
outlen = (int) XDR_GETPOS(&outxdr);
|
||||
- if (outbuf_alloc)
|
||||
- outbufp = outbuf_alloc;
|
||||
- else
|
||||
- outbufp = outbuf;
|
||||
|
||||
na = uaddr2taddr(nconf, local_uaddr);
|
||||
if (!na) {
|
||||
@@ -912,7 +866,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
goto error;
|
||||
}
|
||||
|
||||
- if (sendto(fd, outbufp, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
+ if (sendto(fd, outbuf, outlen, 0, (struct sockaddr *)na->buf, na->len)
|
||||
!= outlen) {
|
||||
if (debugging)
|
||||
xlog(LOG_DEBUG,
|
||||
@@ -927,12 +881,16 @@ error:
|
||||
if (call_msg.rm_xid != 0)
|
||||
(void) free_slot_by_xid(call_msg.rm_xid);
|
||||
out:
|
||||
+ if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
+ if (debugging) {
|
||||
+ (void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
+ if (doabort) {
|
||||
+ rpcbind_abort();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
if (local_uaddr)
|
||||
free(local_uaddr);
|
||||
- if (buf_alloc)
|
||||
- free(buf_alloc);
|
||||
- if (outbuf_alloc)
|
||||
- free(outbuf_alloc);
|
||||
if (na) {
|
||||
free(na->buf);
|
||||
free(na);
|
||||
@@ -1094,7 +1052,6 @@ void
|
||||
my_svc_run()
|
||||
{
|
||||
int poll_ret, check_ret;
|
||||
- int n;
|
||||
|
||||
for (;;) {
|
||||
struct pollfd my_pollfd[svc_max_pollfd];
|
||||
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
|
||||
index e7e86da..7b1c74b 100644
|
||||
--- a/systemd/rpcbind.service.in
|
||||
+++ b/systemd/rpcbind.service.in
|
||||
@@ -2,16 +2,17 @@
|
||||
Description=RPC Bind
|
||||
Documentation=man:rpcbind(8)
|
||||
DefaultDependencies=no
|
||||
+RequiresMountsFor=@statedir@
|
||||
|
||||
# Make sure we use the IP addresses listed for
|
||||
# rpcbind.socket, no matter how this unit is started.
|
||||
-Wants=rpcbind.socket
|
||||
-After=rpcbind.socket
|
||||
+Requires=rpcbind.socket
|
||||
+Wants=rpcbind.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
|
||||
-ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
+ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
38
rpcbind.spec
38
rpcbind.spec
|
|
@ -1,6 +1,10 @@
|
|||
# These are macros to be usable outside of the build section
|
||||
%global rpcbind_user_group rpc
|
||||
%global rpcbind_state_dir %{_rundir}/rpcbind
|
||||
|
||||
Name: rpcbind
|
||||
Version: 0.2.4
|
||||
Release: 5%{?dist}
|
||||
Release: 8.rc3%{?dist}
|
||||
Summary: Universal Addresses to RPC Program Number Mapper
|
||||
Group: System Environment/Daemons
|
||||
License: BSD
|
||||
|
|
@ -19,12 +23,13 @@ Requires(post): chkconfig systemd
|
|||
Requires(preun): systemd
|
||||
Requires(postun): systemd coreutils
|
||||
|
||||
Patch001: rpcbind-0.2.4-systemd-statdir.patch
|
||||
Patch001: rpcbind-0.2.5-rc3.patch
|
||||
|
||||
Patch100: rpcbind-0.2.3-systemd-envfile.patch
|
||||
Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
|
||||
Patch102: rpcbind-0.2.4-runstatdir.patch
|
||||
Patch103: rpcbind-0.2.4-systemd-service.patch
|
||||
Patch104: rpcbind-0.2.4-systemd-rundir.patch
|
||||
|
||||
Provides: portmap = %{version}-%{release}
|
||||
Obsoletes: portmap <= 4.0-65.3
|
||||
|
|
@ -44,6 +49,7 @@ RPC calls on a server on that machine.
|
|||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
%patch104 -p1
|
||||
%build
|
||||
%ifarch s390 s390x
|
||||
PIE="-fPIE"
|
||||
|
|
@ -52,16 +58,15 @@ PIE="-fpie"
|
|||
%endif
|
||||
export PIE
|
||||
|
||||
RPCBUSR=rpc
|
||||
RPCBDIR=/run/rpcbind
|
||||
CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
|
||||
|
||||
autoreconf -fisv
|
||||
%configure CFLAGS="$CFLAGS" LDFLAGS="-pie" \
|
||||
--enable-warmstarts \
|
||||
--with-statedir="$RPCBDIR" \
|
||||
--with-rpcuser="$RPCBUSR" \
|
||||
--with-statedir="%rpcbind_state_dir" \
|
||||
--with-rpcuser="%rpcbind_user_group" \
|
||||
--with-nss-modules="files altfiles" \
|
||||
--sbindir=%{_bindir} \
|
||||
--enable-libwrap \
|
||||
--enable-debug
|
||||
|
||||
|
|
@ -73,6 +78,7 @@ mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/etc/sysconfig}
|
|||
mkdir -p %{buildroot}%{_unitdir}
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
mkdir -p %{buildroot}%{_mandir}/man8
|
||||
mkdir -p %{buildroot}%{rpcbind_state_dir}
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
install -m644 %{SOURCE1} %{buildroot}/etc/sysconfig/rpcbind
|
||||
|
|
@ -135,8 +141,28 @@ fi
|
|||
%{_unitdir}/%{name}.service
|
||||
%{_unitdir}/%{name}.socket
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
|
||||
|
||||
%changelog
|
||||
* Sat Dec 16 2017 Steve Dickson <steved@redhat.com> - 0.2.4-8.rc3
|
||||
- Updated to latest upstream RC release: rpcbind-0_2_5-rc3 (bz 1431574)
|
||||
|
||||
* Wed Sep 06 2017 Nils Philippsen <nils@redhat.com> - 0.2.4-8.rc2
|
||||
- create and formally own the state directory so it is available from the time
|
||||
of first installation until reboot
|
||||
|
||||
* Tue May 30 2017 Steve Dickson <steved@redhat.com> - 0.2.4-7.rc2
|
||||
- Updated to latest upstream RC release: rpcbind-0_2_5-rc2 (bz 1450765)
|
||||
|
||||
* Mon May 15 2017 Steve Dickson <steved@redhat.com> - 0.2.4-7.rc1
|
||||
- Fixed typo in memory leaks patch (bz 1448128)
|
||||
|
||||
* Thu May 11 2017 Steve Dickson <steved@redhat.com> - 0.2.4-6.rc1
|
||||
- Fixed memory leaks (bz 1448128)
|
||||
|
||||
* Tue Mar 21 2017 Steve Dickson <steved@redhat.com> - 0.2.4-6
|
||||
- Try creating statdir once when opening lock file fails (bz 1401561)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue