File autofs-5.0.8-revert-fix-libtirpc-name-clash.patch of Package autofs.3591

autofs-5.0.6 - fix libtirpc name clash

From: Ian Kent <ikent@redhat.com>

The tirpc function auth_destroy() is a macro definition in tirpc/rpc/auth.h
which includes an unconditional call to a function log_debug() which clashes
with an autofs function of the same name and has a different call signature.

To fix it redefine auth_destroy() and exclude the debug log call.
---

 CHANGELOG      |    1 +
 lib/rpc_subs.c |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)


Index: autofs-5.0.9/lib/rpc_subs.c
===================================================================
--- autofs-5.0.9.orig/lib/rpc_subs.c
+++ autofs-5.0.9/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
Index: autofs-5.0.9/CHANGELOG
===================================================================
--- autofs-5.0.9.orig/CHANGELOG
+++ autofs-5.0.9/CHANGELOG
@@ -181,7 +181,6 @@
 - fix kernel verion check of version components.
 - dont retry ldap connect if not required.
 - fix initialization in rpc create_client().
-- fix libtirpc name clash.
 - check if /etc/mtab is a link to /proc/self/mounts.
 - fix nfs4 contacts portmap.
 - make autofs wait longer for shutdown completion.