From: Stefan Metzmacher Date: Mon, 10 Oct 2016 15:07:12 +0000 (+0200) Subject: s3:libads: don't use MEMORY:ads_sasl_gssapi_do_bind nor set "KRB5CCNAME" X-Git-Tag: samba-4.3.12~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4e019f42fa24cb9efc2d1463b5dbcaf7e752249;p=thirdparty%2Fsamba.git s3:libads: don't use MEMORY:ads_sasl_gssapi_do_bind nor set "KRB5CCNAME" Most callers just set "KRB5CCNAME", but leave ads->auth.ccache_name = NULL. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12369 Signed-off-by: Stefan Metzmacher Reviewed-by: Günther Deschner Reviewed-by: Uri Simchoni (cherry picked from commit 890b1bbdb8e965c4ff6e35214acc96ffbbff5dfd) --- diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 85a2eb00e98..4e4486f20bf 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -1027,7 +1027,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) { ADS_STATUS status; struct ads_service_principal p; - const char *ccache_name = "MEMORY:ads_sasl_gssapi_do_bind"; status = ads_generate_service_principal(ads, &p); if (!ADS_ERR_OK(status)) { @@ -1046,10 +1045,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) "calling kinit\n", ads_errstr(status))); } - if (ads->auth.ccache_name != NULL) { - ccache_name = ads->auth.ccache_name; - } - setenv(KRB5_ENV_CCNAME, ccache_name, 1); status = ADS_ERROR_KRB5(ads_kinit_password(ads)); if (ADS_ERR_OK(status)) {