diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/svc_auth_gss.c | 5 | ||||
| -rw-r--r-- | tirpc/rpc/rpc.h | 4 | ||||
| -rw-r--r-- | tirpc/rpc/svc_auth.h | 8 | ||||
| -rw-r--r-- | tirpc/tirpc-features.h.in | 10 |
7 files changed, 4 insertions, 32 deletions
@@ -34,8 +34,6 @@ libtirpc.pc lib*.a src/libtirpc.la src/libtirpc_la-*.lo -tirpc/stamp-h2 -tirpc/tirpc-features.h # generic editor backup et al *~ .stgitmail.txt diff --git a/Makefile.am b/Makefile.am index 2bce3b0..2bf725c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,11 +4,9 @@ ACLOCAL_AMFLAGS = -I m4 noinst_HEADERS = tirpc/reentrant.h \ tirpc/getpeereid.h \ tirpc/libc_private.h \ - tirpc/un-namespace.h \ - tirpc/tirpc-features.h.in + tirpc/un-namespace.h nobase_include_HEADERS = tirpc/netconfig.h \ - tirpc/tirpc-features.h \ tirpc/rpcsvc/crypt.x \ tirpc/rpcsvc/crypt.h \ tirpc/rpc/xdr.h \ diff --git a/configure.ac b/configure.ac index 290c635..711b054 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,6 @@ AC_ARG_ENABLE(gssapi, AM_CONDITIONAL(GSS, test "x$enable_gssapi" = xyes) if test "x$enable_gssapi" = xyes; then - AC_DEFINE([HAVE_GSSAPI], [1], [Define to 1 if GSSAPI is enabled]) GSSAPI_CFLAGS=`krb5-config --cflags gssapi` GSSAPI_LIBS=`krb5-config --libs gssapi` AC_SUBST([GSSAPI_CFLAGS]) @@ -42,7 +41,7 @@ AC_ARG_ENABLE(symvers, AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes) AC_PROG_CC -AC_CONFIG_HEADERS([config.h tirpc/tirpc-features.h]) +AC_CONFIG_HEADERS([config.h]) AC_PROG_LIBTOOL AC_HEADER_DIRENT AC_PREFIX_DEFAULT(/usr) diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c index e0a5c6a..d95eae1 100644 --- a/src/svc_auth_gss.c +++ b/src/svc_auth_gss.c @@ -34,11 +34,8 @@ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> + #include <unistd.h> #include <stdio.h> #include <stdlib.h> diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h index 8f37454..1dbb391 100644 --- a/tirpc/rpc/rpc.h +++ b/tirpc/rpc/rpc.h @@ -35,8 +35,6 @@ #ifndef _TIRPC_RPC_H #define _TIRPC_RPC_H -#include <tirpc-features.h> - #include <rpc/types.h> /* some typedefs */ #include <sys/socket.h> #include <netinet/in.h> @@ -62,7 +60,7 @@ #include <rpc/auth_des.h> /* protocol for des style cred */ #endif /* HAVE_AUTHDES */ -#ifdef HAVE_GSSAPI +#ifdef HAVE_RPCSEC_GSS #include <rpc/auth_gss.h> /* RPCSEC_GSS */ #endif diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h index dbd8cc9..44b38bf 100644 --- a/tirpc/rpc/svc_auth.h +++ b/tirpc/rpc/svc_auth.h @@ -41,10 +41,6 @@ #ifndef _RPC_SVC_AUTH_H #define _RPC_SVC_AUTH_H -#include <tirpc-features.h> - -#ifdef HAVE_GSSAPI - #include <rpc/rpcsec_gss.h> typedef struct { @@ -55,8 +51,6 @@ typedef struct { u_int seq_num; } svc_rpc_gss_parms_t; -#endif /* HAVE_GSSAPI */ - /* * Interface to server-side authentication flavors. */ @@ -69,10 +63,8 @@ typedef struct SVCAUTH { int (*svc_ah_destroy)(struct SVCAUTH *); } *svc_ah_ops; caddr_t svc_ah_private; -#ifdef HAVE_GSSAPI svc_rpc_gss_parms_t svc_gss_params; rpc_gss_rawcred_t raw_cred; -#endif } SVCAUTH; #define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ diff --git a/tirpc/tirpc-features.h.in b/tirpc/tirpc-features.h.in deleted file mode 100644 index 72e18bc..0000000 --- a/tirpc/tirpc-features.h.in +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _TIRPC_FEATURES_H -#define _TIRPC_FEATURES_H - -/* Define to 1 if DES authentication is enabled */ -#undef HAVE_AUTHDES - -/* Define to 1 if GSSAPI is enabled */ -#undef HAVE_GSSAPI - -#endif /* _TIRPC_FEATURES_H */ |