Index: lams_central/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v
diff -u -r1.26.2.7 -r1.26.2.8
--- lams_central/web/login.jsp	12 Jul 2007 02:53:10 -0000	1.26.2.7
+++ lams_central/web/login.jsp	26 Jul 2007 01:40:57 -0000	1.26.2.8
@@ -11,13 +11,18 @@
 		return;
 	}
 
+	// conditions for logging in shib user
 	String shibEnabled = (String) Configuration.get(ConfigurationKeys.SHIB_ENABLED);
 	String shibLoginError = null;
 	if (shibEnabled.equals("true")) {
 		String shibUsername = (String) request.getHeader(Configuration.get(ConfigurationKeys.SHIB_ATTR_LOGIN));
 		shibLoginError = (String) session.getAttribute("shibLoginError");
-		if (shibUsername != null && shibUsername.trim().length() > 0 && shibLoginError != "true") {
-			response.sendRedirect("ShibLogin");
+		// if the shib user failed to login for whatever reason, the 'failed' param is set.  check here so
+		// it doesn't continually try to login.
+		if (request.getParameter("failed") == null && shibLoginError != "true") {
+			if (shibUsername != null && shibUsername.trim().length() > 0) {
+				response.sendRedirect("ShibLogin");
+			}
 		}
 	}