diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2015-06-10 14:07:06 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2015-06-16 11:34:38 -0400 |
| commit | c261332cedc58f73c623d350bbce23e2de015af3 (patch) | |
| tree | 8dfbb9164566666202ed30b0ab1491078cbc1e5d /tirpc/rpc | |
| parent | cc9148f915b745c0a4e3849f9576e0dfe8eae1b2 (diff) | |
| download | ti-rpc-c261332cedc58f73c623d350bbce23e2de015af3.tar.gz | |
Revert commit 4ba9ce277dd6 ('configure.ac: Allow for disabling auth DES')
AUTH_DES is a part of legacy glibc SunRPC, and cannot be optional.
Adding an autoconf macro (HAVE_AUTHDES) into libtirpc source files
is OK, but adding such a macro into installed header files is wrong.
Reported-by: Thorsten Kukuk <kukuk@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'tirpc/rpc')
| -rw-r--r-- | tirpc/rpc/auth.h | 10 | ||||
| -rw-r--r-- | tirpc/rpc/rpc.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h index 1b6c699..434d35c 100644 --- a/tirpc/rpc/auth.h +++ b/tirpc/rpc/auth.h @@ -163,8 +163,6 @@ union des_block { char c[8]; }; typedef union des_block des_block; - -#ifdef HAVE_AUTHDES #ifdef __cplusplus extern "C" { #endif @@ -172,7 +170,6 @@ extern bool_t xdr_des_block(XDR *, des_block *); #ifdef __cplusplus } #endif -#endif /* HAVE_AUTHDES */ /* * Authentication info. Opaque to client. @@ -319,8 +316,6 @@ extern AUTH *authnone_create(void); /* takes no parameters */ #ifdef __cplusplus } #endif - -#ifdef HAVE_AUTHDES /* * DES style authentication * AUTH *authsecdes_create(servername, window, timehost, ckey) @@ -338,7 +333,6 @@ extern AUTH *authdes_seccreate (const char *, const u_int, const char *, #ifdef __cplusplus } #endif -#endif /* HAVE_AUTHDES */ #ifdef __cplusplus extern "C" { @@ -362,9 +356,7 @@ extern int host2netname(char *, const char *, const char *); extern int user2netname(char *, const uid_t, const char *); extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *); extern int netname2host(char *, char *, const int); -#ifdef HAVE_AUTHDES extern void passwd2des ( char *, char * ); -#endif /* HAVE_AUTHDES */ #ifdef __cplusplus } #endif @@ -379,9 +371,7 @@ extern "C" { #endif extern int key_decryptsession(const char *, des_block *); extern int key_encryptsession(const char *, des_block *); -#ifdef HAVE_AUTHDES extern int key_gendes(des_block *); -#endif /* HAVE_AUTHDES */ extern int key_setsecret(const char *); extern int key_secretkey_is_set(void); #ifdef __cplusplus diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h index 392a7b9..19373bc 100644 --- a/tirpc/rpc/rpc.h +++ b/tirpc/rpc/rpc.h @@ -52,13 +52,11 @@ #include <rpc/rpc_msg.h> /* protocol for rpc messages */ #include <rpc/auth_unix.h> /* protocol for unix style cred */ -#ifdef HAVE_AUTHDES /* * Uncomment-out the next line if you are building the rpc library with * DES Authentication (see the README file in the secure_rpc/ directory). */ #include <rpc/auth_des.h> /* protocol for des style cred */ -#endif /* HAVE_AUTHDES */ /* Server side only remote procedure callee */ #include <rpc/svc_auth.h> /* service side authenticator */ |