mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
69 lines
1.7 KiB
Diff
69 lines
1.7 KiB
Diff
From c0e38c9fd1b2c6785af90c86b26a07724c2488e8 Mon Sep 17 00:00:00 2001
|
|
From: Nick Alcock <nick.alcock@oracle.com>
|
|
Date: Thu, 25 May 2017 12:45:35 -0400
|
|
Subject: [PATCH 4/6] rpcbind: fix building without --enable-debug
|
|
|
|
All if (debugging) stanzas and their accompanying xlog()s and aborts
|
|
should be within #ifdef RPCBIND_DEBUG.
|
|
|
|
Fixes a compilation failure due to non-inclusion of <syslog.h> in the
|
|
non-debugging case.
|
|
|
|
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
---
|
|
src/pmap_svc.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
|
index 26c31d0..a53dd5f 100644
|
|
--- a/src/pmap_svc.c
|
|
+++ b/src/pmap_svc.c
|
|
@@ -263,12 +263,14 @@ done_change:
|
|
rpcbs_unset(RPCBVERS_2_STAT, ans);
|
|
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);
|
|
}
|
|
@@ -347,12 +349,14 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
|
|
|
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);
|
|
}
|
|
@@ -385,12 +389,14 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
|
|
|
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);
|
|
}
|
|
--
|
|
2.13.0
|
|
|