[Libtirpc-devel] [PATCH] rpcbind: always use inline rpcsvc constants

[Mike G. <fl...@ge...>]

Modern versions of glibc no longer provide the rpcsvc headers, so
there's very little point in trying to use them.

Signed-off-by: Mike Gilbert <fl...@ge...>
---
 configure.ac   |  5 +----
 src/security.c | 37 ++++++++++++++-----------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7bfe4f1..dd90ff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,10 +63,7 @@ AS_IF([test x$enable_libwrap = xyes], [
 
 AC_SEARCH_LIBS([pthread_create], [pthread])
 
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $TIRPC_CFLAGS"
-AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
-CPPFLAGS="$SAVE_CPPFLAGS"
+AC_CHECK_HEADERS([nss.h])
 
 # make sbindir available for substitution in config file
 # 2 "evals" needed to expand variable names
diff --git a/src/security.c b/src/security.c
index c54ce26..8a12019 100644
--- a/src/security.c
+++ b/src/security.c
@@ -22,29 +22,20 @@
 /*
  * XXX for special case checks in check_callit.
  */
-#ifdef HAVE_RPCSVC_MOUNT_H
-#include <rpcsvc/mount.h>
-#include <rpcsvc/rquota.h>
-#include <rpcsvc/nfs_prot.h>
-#include <rpcsvc/yp.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yppasswd.h>
-#else
-# define MOUNTPROC_MNT	1
-# define MOUNTPROC_UMNT	3
-# define NFS_PROGRAM	100003
-# define YPPROG		100004
-# define MOUNTPROG	100005
-# define YPBINDPROG	100007
-# define YPPASSWDPROG	100009
-# define RQUOTAPROG	100011
-
-# define YPBINDPROC_SETDOM	2
-# define YPPROC_MATCH	3
-# define YPPROC_FIRST	4
-# define YPPROC_NEXT	5
-# define YPPROC_ALL	8
-#endif
+#define MOUNTPROC_MNT	1
+#define MOUNTPROC_UMNT	3
+#define NFS_PROGRAM	100003
+#define YPPROG		100004
+#define MOUNTPROG	100005
+#define YPBINDPROG	100007
+#define YPPASSWDPROG	100009
+#define RQUOTAPROG	100011
+
+#define YPBINDPROC_SETDOM	2
+#define YPPROC_MATCH	3
+#define YPPROC_FIRST	4
+#define YPPROC_NEXT	5
+#define YPPROC_ALL	8
 
 #include "rpcbind.h"
 
-- 
2.25.0