diff options
| author | Steve Dickson <steved@redhat.com> | 2016-04-27 11:53:02 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-04-29 10:33:42 -0400 |
| commit | bf97c20a6c3b8d037663e23a39bcf2f003ec12ee (patch) | |
| tree | f4f9a2d5e98e176cf63764c8afbfd71c462f3a9e | |
| parent | 31ca7d4f6aaa799fce013ea1d6ab3a44bf4baa9e (diff) | |
| download | nfs-utils-bf97c20a6c3b8d037663e23a39bcf2f003ec12ee.tar.gz nfs-utils-bf97c20a6c3b8d037663e23a39bcf2f003ec12ee.tar.xz nfs-utils-bf97c20a6c3b8d037663e23a39bcf2f003ec12ee.zip | |
Remove rpcsecgss library support
librpcsecgss has not been used in years
so and there is no longer an upstream for
it so the support for the library has
been removed
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | aclocal/librpcsecgss.m4 | 21 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | utils/gssd/gssd.c | 15 |
3 files changed, 5 insertions, 34 deletions
diff --git a/aclocal/librpcsecgss.m4 b/aclocal/librpcsecgss.m4 deleted file mode 100644 index e833141..0000000 --- a/aclocal/librpcsecgss.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl Checks for rpcsecgss library and headers -dnl KRB5LIBS must be set before this function is invoked. -dnl -AC_DEFUN([AC_LIBRPCSECGSS], [ - - dnl libtirpc provides an rpcsecgss API - if test "$enable_tirpc" = no; then - - dnl Check for library, but do not add -lrpcsecgss to LIBS - AC_CHECK_LIB([rpcsecgss], [authgss_create_default], [librpcsecgss=1], - [AC_MSG_ERROR([librpcsecgss not found.])]) - - AC_CHECK_LIB([rpcsecgss], [authgss_set_debug_level], - [AC_DEFINE([HAVE_AUTHGSS_SET_DEBUG_LEVEL], 1, - [Define to 1 if you have the `authgss_set_debug_level' function.])]) - - AC_DEFINE([HAVE_AUTHGSS_FREE_PRIVATE_DATA], 1, - [Define to 1 if your rpcsec library provides authgss_free_private_data,]) - fi - -])dnl diff --git a/configure.ac b/configure.ac index 25d2ba4..b87ee68 100644 --- a/configure.ac +++ b/configure.ac @@ -382,9 +382,6 @@ if test "$enable_gss" = yes; then dnl Check for Kerberos V5 AC_KERBEROS_V5 - dnl Invoked after AC_KERBEROS_V5; AC_LIBRPCSECGSS needs to have KRBLIBS set - AC_LIBRPCSECGSS - dnl librpcsecgss already has a dependency on libgssapi, dnl but we need to make sure we get the right version if test "$enable_gss" = yes; then diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 7ba27b1..810f872 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -866,21 +866,16 @@ main(int argc, char *argv[]) progname = argv[0]; initerr(progname, verbosity, fg); -#ifdef HAVE_AUTHGSS_SET_DEBUG_LEVEL - if (verbosity && rpc_verbosity == 0) - rpc_verbosity = verbosity; - authgss_set_debug_level(rpc_verbosity); -#elif HAVE_LIBTIRPC_SET_DEBUG +#ifdef HAVE_LIBTIRPC_SET_DEBUG /* - * Only set the libtirpc debug level if explicitly requested via -r... - * gssd is chatty enough as it is. + * Only set the libtirpc debug level if explicitly requested via -r. */ if (rpc_verbosity > 0) libtirpc_set_debug(progname, rpc_verbosity, fg); #else - if (rpc_verbosity > 0) - printerr(0, "Warning: rpcsec_gss library does not " - "support setting debug level\n"); + if (rpc_verbosity > 0) + printerr(0, "Warning: libtirpc does not " + "support setting debug levels\n"); #endif if (gssd_check_mechs() != 0) |