From fdf46b99eb84bb09a58ef4d568538fb48ba535ee Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 14 Nov 2009 15:20:19 +0000
Subject: [PATCH] Corrected sample code for request-header authentication.

---
 docs/manual/src/docbook/preauth.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/manual/src/docbook/preauth.xml b/docs/manual/src/docbook/preauth.xml
index 762264749f..a8fc73f57f 100644
--- a/docs/manual/src/docbook/preauth.xml
+++ b/docs/manual/src/docbook/preauth.xml
@@ -137,16 +137,19 @@
       <section>
         <title>Siteminder Example Configuration</title>
         <para> A typical configuration using this filter would look like this: <programlisting><![CDATA[
+  <security:http>
+    <!-- Additional http configuration omitted -->
+    <security:custom-filter ref="siteminderFilter" />
+  </security:http>
+  
 	<bean id="siteminderFilter" class=
 "org.springframework.security.web.authentication.preauth.header.RequestHeaderAuthenticationFilter">
-    <security:custom-filter position="PRE_AUTH_FILTER" />
     <property name="principalRequestHeader" value="SM_USER"/>
     <property name="authenticationManager" ref="authenticationManager" />
   </bean>
 
   <bean id="preauthAuthProvider"
 class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
-    <security:custom-authentication-provider />      
     <property name="preAuthenticatedUserDetailsService">
       <bean id="userDetailsServiceWrapper" 
           class="org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper">
@@ -155,7 +158,9 @@ class="org.springframework.security.web.authentication.preauth.PreAuthenticatedA
     </property>
 	</bean>
 	
-	<security:authentication-manager alias="authenticationManager" />
+	<security:authentication-manager alias="authenticationManager">
+	  <security:authentication-provider ref="preauthAuthProvider" />
+	</security-authentication-manager>
 ]]>  
 </programlisting> We've assumed here that the security namespace is being used for
           configuration (hence the user of the <literal>custom-filter</literal>,