From a6c1f3eac09542babb58904aeea6f0ced560ccb9 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Wed, 31 May 2006 22:21:50 +0000
Subject: [PATCH] Continuation of fix to identity id problem when a
 startSearchContext is not configured.

---
 .../src/com/novell/casa/authtoksvc/PwdAuthenticate.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
index 5cb2804c..d723cf19 100644
--- a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
+++ b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
@@ -182,7 +182,14 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
                if ((new InitialDirContext(env2)) != null)
                {
                   // The password must be valid, set the identity Id.
-                  identId = sr.getName() + "," + m_svcConfig.getSetting(SvcConfig.StartSearchContext);
+                  if (searchContext.equals(""))
+                  {
+                     identId = sr.getName();
+                  }
+                  else
+                  {
+                     identId = sr.getName() + "," + searchContext;
+                  }
                   break;
                }
             }