svn commit: r835130 - in /websites/staging/vcl/trunk/content: ./ docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html

[buildbot]

Author: buildbot
Date: Mon Oct 15 15:33:49 2012
New Revision: 835130

Log:
Staging update by buildbot for vcl

Modified:
    websites/staging/vcl/trunk/content/   (props changed)
    
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html

Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 15 15:33:49 2012
@@ -1 +1 @@
-1398338
+1398340

Modified: 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
 Mon Oct 15 15:33:49 2012
@@ -173,7 +173,7 @@ cp conf.php secrets.php pubkey.pem keys.
 </pre></div>
 
 
-<p>e. Some LDAP related items have been simplified in the code using 
additional options in $authMechs. For any LDAP entries, add two options. 
"lookupuserbeforeauth" is used if you need VCL to look up the full DN of a user 
and use that when doing the bind that authenticates the user (if you don't know 
what this means, leave it set to 0). If you need to set it to 1, then you will 
need to set "lookupuserfield" to what LDAP attribute to use when looking up the 
user's DN (typically either 'cn', 'uid', or 'samaccountname'). In conf.php, 
<strong>Add the following to each LDAP</strong> array you have in the $authMech 
array.</p>
+<p>e. LDAP related items have been simplified in the code using additional 
options in $authMechs. For any LDAP entries, add two options. 
"lookupuserbeforeauth" is used if you need VCL to look up the full DN of a user 
and use that when doing the bind that authenticates the user (if you don't know 
what this means, leave it set to 0). If you need to set it to 1, then you will 
need to set "lookupuserfield" to what LDAP attribute to use when looking up the 
user's DN (typically either 'cn', 'uid', or 'samaccountname'). In conf.php, 
<strong>Add the following to each LDAP</strong> array you have in the $authMech 
array.</p>
 <div class="codehilite"><pre>    <span 
class="s">&quot;lookupuserbeforeauth&quot;</span> <span class="o">=&gt;</span> 
<span class="mi">0</span><span class="p">,</span>
     <span class="s">&quot;lookupuserfield&quot;</span> <span 
class="o">=&gt;</span> <span class="s">&#39;&#39;</span><span class="p">,</span>
 </pre></div>
@@ -184,8 +184,7 @@ cp conf.php secrets.php pubkey.pem keys.
     <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
     <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
 
-    <span class="o">::</span><span class="p">:</span><span 
class="n">BashLexer</span>
-    <span class="n">NEW</span>
+    <span class="p">:</span><span class="n">NEW</span>
     <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return NULL;&#39;</span><span class="p">);</span>
     <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return NULL;&#39;</span><span class="p">);</span>
 </pre></div>