From a46d452926cea70bb59ba470cfc5cb2cde88c027 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Nov 2002 00:35:04 +0000
Subject: make sure that if kerberos fails we can fall back on NTLMSSP for SASL
 (This used to be commit 69dba08c40c9739137b4f01d38be5228edc6dd6e)

---
 source3/libads/sasl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3/libads')

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index dacf8f7da8..16ad397d0e 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -196,8 +196,11 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
 		status = ads_sasl_spnego_krb5_bind(ads, principal);
 		if (ADS_ERR_OK(status))
 			return status;
-		if (ads_kinit_password(ads) == 0)
-			return ads_sasl_spnego_krb5_bind(ads, principal);
+		if (ads_kinit_password(ads) == 0) {
+			status = ads_sasl_spnego_krb5_bind(ads, principal);
+		}
+		if (ADS_ERR_OK(status))
+			return status;
 	}
 #endif
 
-- 
cgit