ITS#6091,6092,6093,5369

diff --git a/CHANGES b/CHANGES
index 59b87c28d8227b33ca7a0d2fc946bf1908301617..332d713d768db22cd5d98974e4117b3671c514e5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@ OpenLDAP 2.4.17 Engineering
                Added test056-monitor (ITS#5540)
                Added test057-memberof-refint (ITS#5395)
                Fixed winsock detection for windows (ITS#6102, ITS#6078)
+               Removed GSSAPI configure option (ITS#6091,ITS#6092,ITS#6093,ITS#5369)
        Documentation
                admin24 relocate configuration examples (ITS#6183)
                admin24 fixed example regex (ITS#6052)

diff --git a/build/top.mk b/build/top.mk
index 86a5ec2bc43494d1d8a29ce2d31fccab69d69f3c..4c6ccb5eccc8c0fe4892790000ba43439f850c26 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -187,10 +187,9 @@ KRB4_LIBS = @KRB4_LIBS@
 KRB5_LIBS = @KRB5_LIBS@
 KRB_LIBS = @KRB4_LIBS@ @KRB5_LIBS@
 SASL_LIBS = @SASL_LIBS@
-GSSAPI_LIBS = @GSSAPI_LIBS@
 TLS_LIBS = @TLS_LIBS@
 AUTH_LIBS = @AUTH_LIBS@
-SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(GSSAPI_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
+SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
 ICU_LIBS = @ICU_LIBS@
 
 MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@

diff --git a/configure.in b/configure.in
index 20d20fc9f03006f155d324c6433a147bd848e5ec..ec9c68f8e293d49374020cd70dc9ac8ca661b042 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -242,8 +242,6 @@ OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl   with Cyrus SASL support],
        auto, [auto yes no] )
 OL_ARG_WITH(fetch,[  --with-fetch                with fetch(3) URL support],
        auto, [auto yes no] )
-OL_ARG_WITH(gssapi,[  --with-gssapi              with GSSAPI support],
-       auto, [auto yes no] )
 OL_ARG_WITH(threads,[  --with-threads    with threads],
        auto, [auto nt posix mach pth lwp yes no manual] )
 OL_ARG_WITH(tls,[  --with-tls            with TLS/SSL support auto|openssl|gnutls],
@@ -581,7 +579,6 @@ SLAPD_SQL_INCLUDES=
 KRB4_LIBS=
 KRB5_LIBS=
 SASL_LIBS=
-GSSAPI_LIBS=
 TLS_LIBS=
 MODULES_LIBS=
 SLAPI_LIBS=
@@ -1145,63 +1142,6 @@ if test $ol_enable_local != no ; then
        fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl GSSAPI
-ol_link_gssapi=no
-
-case $ol_with_gssapi in yes | auto)
-
-       ol_header_gssapi=no
-       AC_CHECK_HEADERS(gssapi/gssapi.h)
-       if test $ac_cv_header_gssapi_gssapi_h = yes ; then
-               ol_header_gssapi=yes
-       else
-               AC_CHECK_HEADERS(gssapi.h)
-               if test $ac_cv_header_gssapi_h = yes ; then
-                       ol_header_gssapi=yes
-               fi
-
-               dnl## not every gssapi has gss_oid_to_str()
-               dnl## as it's not defined in the GSSAPI V2 API
-               dnl## anymore
-               saveLIBS="$LIBS"
-               LIBS="$LIBS $GSSAPI_LIBS"
-               AC_CHECK_FUNCS(gss_oid_to_str)
-               LIBS="$saveLIBS"
-       fi
-
-       if test $ol_header_gssapi = yes ; then
-               dnl## we check for gss_wrap
-               dnl## as it's new to the GSSAPI V2 API
-               AC_CHECK_LIB(gssapi, gss_wrap,
-                            [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi"],
-                            [ol_link_gssapi=no])
-               if test $ol_link_gssapi != yes ; then
-                       AC_CHECK_LIB(gssapi_krb5, gss_wrap,
-                                    [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi_krb5"],
-                                    [ol_link_gssapi=no])
-               fi
-               if test $ol_link_gssapi != yes ; then
-                       AC_CHECK_LIB(gss, gss_wrap,
-                                    [ol_link_gssapi=yes;GSSAPI_LIBS="-lgss"],
-                                    [ol_link_gssapi=no])
-               fi
-       fi
-
-       ;;
-esac
-
-WITH_GSSAPI=no
-if test $ol_link_gssapi = yes; then
-       AC_DEFINE(HAVE_GSSAPI, 1, [define if you have GSSAPI])
-       WITH_GSSAPI=yes
-elif test $ol_with_gssapi = auto ; then
-       AC_MSG_WARN([Could not locate GSSAPI package])
-       AC_MSG_WARN([GSSAPI authentication not supported!])
-elif test $ol_with_gssapi = yes ; then
-       AC_MSG_ERROR([GSSAPI detection failed])
-fi
-
 dnl ----------------------------------------------------------------
 dnl TLS/SSL
        
@@ -3146,7 +3086,6 @@ AC_SUBST(MOD_PERL_LDFLAGS)
 AC_SUBST(KRB4_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)
-AC_SUBST(GSSAPI_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)