summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-06 10:25:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-06 10:25:35 +0100
commitc2dea994f7e8737cb598f8a49f20ef5347ceab45 (patch)
treeeead2bf7081165f066d276d8d896d2818eac5b3b
parentbe49c58d77ce855f902728b0c68fc10bafee6257 (diff)
rpcbind: fix for new libtirpc from buildroot
-rw-r--r--package/rpcbind/patches/patch-src_rpcb_svc_com_c20
-rw-r--r--package/rpcbind/patches/patch-src_security_c29
2 files changed, 47 insertions, 2 deletions
diff --git a/package/rpcbind/patches/patch-src_rpcb_svc_com_c b/package/rpcbind/patches/patch-src_rpcb_svc_com_c
new file mode 100644
index 000000000..d62181ce4
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_rpcb_svc_com_c
@@ -0,0 +1,20 @@
+--- rpcbind-0.2.3.orig/src/rpcb_svc_com.c 2015-04-27 16:07:43.000000000 +0200
++++ rpcbind-0.2.3/src/rpcb_svc_com.c 2015-11-29 16:56:25.496204447 +0100
+@@ -1274,10 +1274,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/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
index 1222754ad..8f2d32330 100644
--- a/package/rpcbind/patches/patch-src_security_c
+++ b/package/rpcbind/patches/patch-src_security_c
@@ -1,5 +1,5 @@
---- rpcbind-0.2.3.orig/src/security.c 2015-04-27 09:07:43.000000000 -0500
-+++ rpcbind-0.2.3/src/security.c 2015-06-27 16:49:53.302652574 -0500
+--- rpcbind-0.2.3.orig/src/security.c 2015-04-27 16:07:43.000000000 +0200
++++ rpcbind-0.2.3/src/security.c 2015-11-29 16:56:17.948705887 +0100
@@ -20,14 +20,6 @@
/*
* XXX for special case checks in check_callit.
@@ -23,3 +23,28 @@
#include "rpcbind.h"
+@@ -325,24 +316,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt
+ args->rmt_proc != MOUNTPROC_UMNT)
+ break;
+ goto deny;
+- case YPBINDPROG:
+- if (args->rmt_proc != YPBINDPROC_SETDOM)
+- break;
+- /* FALLTHROUGH */
+- case YPPASSWDPROG:
+ case NFS_PROGRAM:
+ case RQUOTAPROG:
+ goto deny;
+- case YPPROG:
+- switch (args->rmt_proc) {
+- case YPPROC_ALL:
+- case YPPROC_MATCH:
+- case YPPROC_FIRST:
+- case YPPROC_NEXT:
+- goto deny;
+- default:
+- break;
+- }
+ default:
+ break;
+ }