File autofs-5.1.1-leave_auth_destroy.patch of Package autofs.6209
From: Ian Kent <raven@themaw.net>
Subject: autofs-5.1.1 - revert fix libtirpc name clash
Git-commit: 6c7fb07b90957c0847050248f20aa38287ebb8dd
Patch-mainline: 5.1.2
Commit 09d4edb2 introduced a substitution maro for the tirpc macro
auth_destroy() because it contained an unconditional call to a function
log_debug() which clashed with an autofs function of the same name.
AFAICS that was never in a actual libtirpc release, the call in a release
was auth_log_debug() which doesn't clash with any autofs functions.
So revert this change.
Signed-off-by: Ian Kent <raven@themaw.net>
---
lib/rpc_subs.c | 10 ----------
1 file changed, 10 deletions(-)
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -34,16 +34,6 @@
#include <poll.h>
#ifdef WITH_LIBTIRPC
-#undef auth_destroy
-#define auth_destroy(auth) \
- do { \
- int refs; \
- if ((refs = auth_put((auth))) == 0) \
- ((*((auth)->ah_ops->ah_destroy))(auth));\
- } while (0)
-#endif
-
-#ifdef WITH_LIBTIRPC
const rpcprog_t rpcb_prog = RPCBPROG;
const rpcvers_t rpcb_version = RPCBVERS;
#else