Index: lams_central/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v
diff -u -r1.26.2.6 -r1.26.2.7
--- lams_central/web/login.jsp	7 Jun 2007 04:46:23 -0000	1.26.2.6
+++ lams_central/web/login.jsp	12 Jul 2007 02:53:10 -0000	1.26.2.7
@@ -11,10 +11,14 @@
 		return;
 	}
 
-	String shibUsername = (String) request.getHeader("LAMS-Login");
-	String shibLoginExists = (String) session.getAttribute("shibLoginExists");
-	if (shibUsername != null && shibUsername.trim().length()>0 && shibLoginExists != "true") {
-		response.sendRedirect("ShibLogin");
+	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");
+		}
 	}
 
 	/*String webAuthUser = (String) session.getAttribute("WEBAUTH_USER");
@@ -132,13 +136,13 @@
 						</div>
 					</c:if>
 					<c:if test="${!empty param.failed}">
-						<% if (shibLoginExists == "false") { %>
+						<% if (shibLoginError == "false") { %>
 							<br/>
 						<% } %>
 					</c:if>
-					<% if (shibLoginExists == "true") { %>
+					<% if (shibLoginError == "true") { %>
 						<div class="warning-login">
-							<fmt:message key="shibboleth.username.taken"/>: <%= shibUsername %>
+							<fmt:message key="shibboleth.login.error"/>
 						</div>
 					<% } %>
 				 <p class="first"><fmt:message key="label.username"/>: