diff options
| author | Thorsten Kukuk <kukuk@suse.de> | 2015-05-07 16:14:04 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2015-05-07 23:31:01 -0400 |
| commit | 7b7337b7e6541649a82b09a5c268c7fe6404fbf4 (patch) | |
| tree | 02006bf10ac1ae8d425da13b68afc2fbdac8d5f6 /tirpc | |
| parent | 9a7748e8e02ce5f91869879387f1829232bd3dd7 (diff) | |
| download | ti-rpc-7b7337b7e6541649a82b09a5c268c7fe6404fbf4.tar.gz | |
Fix Build w/gssapi disabled
A regression was introduced by commit d5259e75 that
broke the --disable-gssapi configuration flag
causing numerous compile errors.
This patch fixes those errors but then the config
flag is used it breaks API with previous releases.
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'tirpc')
| -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 |
3 files changed, 21 insertions, 1 deletions
diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h index 1dbb391..8f37454 100644 --- a/tirpc/rpc/rpc.h +++ b/tirpc/rpc/rpc.h @@ -35,6 +35,8 @@ #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> @@ -60,7 +62,7 @@ #include <rpc/auth_des.h> /* protocol for des style cred */ #endif /* HAVE_AUTHDES */ -#ifdef HAVE_RPCSEC_GSS +#ifdef HAVE_GSSAPI #include <rpc/auth_gss.h> /* RPCSEC_GSS */ #endif diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h index 44b38bf..dbd8cc9 100644 --- a/tirpc/rpc/svc_auth.h +++ b/tirpc/rpc/svc_auth.h @@ -41,6 +41,10 @@ #ifndef _RPC_SVC_AUTH_H #define _RPC_SVC_AUTH_H +#include <tirpc-features.h> + +#ifdef HAVE_GSSAPI + #include <rpc/rpcsec_gss.h> typedef struct { @@ -51,6 +55,8 @@ typedef struct { u_int seq_num; } svc_rpc_gss_parms_t; +#endif /* HAVE_GSSAPI */ + /* * Interface to server-side authentication flavors. */ @@ -63,8 +69,10 @@ 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 new file mode 100644 index 0000000..72e18bc --- /dev/null +++ b/tirpc/tirpc-features.h.in @@ -0,0 +1,10 @@ +#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 */ |