From f78adc44cb44e75e53b0966585074e76f6e270c9 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 25 Sep 2008 19:41:31 +0000
Subject: [PATCH] Fix for issue 3496 SASL/GSSAPI authentication fails over startTLS. Always make the protocol value match what was written in the login.conf file.

---
 opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java b/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
index 8763c57..ff34857 100644
--- a/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
+++ b/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
@@ -271,7 +271,7 @@
 
         saslProperties.put(Sasl.REUSE, "false");
 
-        saslServer = Sasl.createSaslServer(SASL_MECHANISM_GSSAPI, protocol,
+        saslServer = Sasl.createSaslServer(SASL_MECHANISM_GSSAPI, "ldap",
                                            serverFQDN, saslProperties, this);
       }
       catch (Exception e)

--
Gitblit v1.10.0