s3:libads: remove unused fallback to gss_acquire_cred()

Heimdal and all supported versions of MIT krb5 prove gss_krb5_import_cred(),
so we don't need an #ifdef here.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Mar  6 11:44:54 CET 2017 on sn-devel-144

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 8570788e801dd081adbca7b6af44ed4fff870f35..cb630fac4af83a9147a75bafecb3caaeb635ea93 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -365,7 +365,6 @@ static ADS_STATUS ads_init_gssapi_cred(ADS_STRUCT *ads, gss_cred_id_t *cred)
                return ADS_ERROR_KRB5(kerr);
        }
 
-#ifdef HAVE_GSS_KRB5_IMPORT_CRED
        kerr = krb5_cc_resolve(kctx, ads->auth.ccache_name, &kccache);
        if (kerr) {
                status = ADS_ERROR_KRB5(kerr);
@@ -377,32 +376,6 @@ static ADS_STATUS ads_init_gssapi_cred(ADS_STRUCT *ads, gss_cred_id_t *cred)
                status = ADS_ERROR_GSS(maj, min);
                goto done;
        }
-#else
-       /* We need to fallback to overriding the default creds.
-        * This operation is not thread safe as it changes the process
-        * environment variable, but we do not have any better option
-        * with older kerberos libraries */
-       {
-               const char *oldccname = NULL;
-
-               oldccname = getenv("KRB5CCNAME");
-               setenv("KRB5CCNAME", ads->auth.ccache_name, 1);
-
-               maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
-                                      NULL, GSS_C_INITIATE, cred, NULL, NULL);
-
-               if (oldccname) {
-                       setenv("KRB5CCNAME", oldccname, 1);
-               } else {
-                       unsetenv("KRB5CCNAME");
-               }
-
-               if (maj != GSS_S_COMPLETE) {
-                       status = ADS_ERROR_GSS(maj, min);
-                       goto done;
-               }
-       }
-#endif
 
        status = ADS_SUCCESS;