summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2016-10-10 17:07:12 +0200
committerKarolin Seeger <kseeger@samba.org>2016-10-20 14:06:17 +0200
commit20173352cf707dc4fab8d4ae97d2fb90253242b9 (patch)
treea012d159033d1fac1e7162bf81fc6575b8734e95
parentd4e019f42fa24cb9efc2d1463b5dbcaf7e752249 (diff)
downloadsamba-20173352cf707dc4fab8d4ae97d2fb90253242b9.tar.gz
s3:libads: don't use MEMORY:ads_sasl_spnego_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 <metze@samba.org> Reviewed-by: Günther Deschner <gd@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Oct 13 00:35:21 CEST 2016 on sn-devel-144 (cherry picked from commit a5f895a53016af71db53967062728fec5bc307ca) Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-3-test): Thu Oct 20 14:06:17 CEST 2016 on sn-devel-104
-rw-r--r--source3/libads/sasl.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 4e4486f20bf..39c60c3e14d 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -749,11 +749,6 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) &&
got_kerberos_mechanism)
{
- const char *ccache_name = "MEMORY:ads_sasl_spnego_bind";
- if (ads->auth.ccache_name != NULL) {
- ccache_name = ads->auth.ccache_name;
- }
-
if (ads->auth.password == NULL ||
ads->auth.password[0] == '\0')
{
@@ -771,7 +766,6 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
"calling kinit\n", ads_errstr(status)));
}
- setenv(KRB5_ENV_CCNAME, ccache_name, 1);
status = ADS_ERROR_KRB5(ads_kinit_password(ads));
if (ADS_ERR_OK(status)) {