Merge remote-tracking branch 'origin/closedown-4.2.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/HPCCClientTools/CT_Mods/CT_ECL_CLI.xml

@@ -497,6 +497,14 @@ ecl publish --target=roxie --name=FindPersonService --no-activate findperson.ecl
                 </row>
 
                 <row>
+                  <entry>--allow-foreign</entry>
+
+                  <entry>Specifies to allow the use of foreign files in a
+                  Roxie query. If a Roxie query references foreign files and
+                  this is not enabled, publish will fail.</entry>
+                </row>
+
+                <row>
                   <entry>--timeLimit=&lt;sec&gt;</entry>
 
                   <entry>Value to set for query timeLimit
@@ -1313,6 +1321,14 @@ ecl queries copy //192.168.1.10:8010/thor/findperson thor
                 </row>
 
                 <row>
+                  <entry>--allow-foreign</entry>
+
+                  <entry>Specifies to allow the use of foreign files in a
+                  Roxie query. If a Roxie query references foreign files and
+                  this is not enabled, copy will fail.</entry>
+                </row>
+
+                <row>
                   <entry>-O, --overwrite</entry>
 
                   <entry>Whether to overwrite existing information - true if
@@ -1600,6 +1616,14 @@ ecl packagemap add roxie mypackagemap.pkg --daliip=192.168.11.11
                 </row>
 
                 <row>
+                  <entry>--allow-foreign</entry>
+
+                  <entry>Specifies to allow the use of foreign files. If a
+                  packagemap references foreign files and this is not enabled,
+                  packagemap add will fail.</entry>
+                </row>
+
+                <row>
                   <entry>--pmid=&lt;packagemapid&gt;</entry>
 
                   <entry>id of package map - defaults to filename if not

docs/Installing_and_RunningTheHPCCPlatform/Inst-Mods/hpcc_ldap.xml

@@ -503,7 +503,7 @@
         <?dbfo keep-together="always"?>
 
         <para>In the Navigator pane, click on the <emphasis role="bold">Roxie
-        Clusrer – myroxie </emphasis><graphic
+        Cluster – myroxie </emphasis><graphic
         fileref="../../images/LDAP_007.jpg" vendor="configmgrSS" /></para>
 
         <para><orderedlist continuation="restarts" numeration="loweralpha">
@@ -552,5 +552,29 @@
           </tbody>
         </tgroup>
       </informaltable></para>
+
+    <sect3>
+      <title>Using the addScopes tool</title>
+
+      <para>When a new ESP user account is created, a private
+      “hpccinternal::&lt;user&gt;” file scope is also created granting new
+      users full access to that scope and restricting access to other users.
+      This file scope is used to store temporary HPCC files such as spill
+      files and temp files. </para>
+
+      <para>If you are enabling LDAP file scope security and already have user
+      accounts, you should run the addScopes utility program to create the
+      hpccinternal::&lt;user&gt; scope for those existing users. </para>
+
+      <para>Users which already have this scope defined are ignored and so it
+      can be used on both new and legacy ESP user accounts safely. </para>
+
+      <para>The tool is located in the <emphasis
+      role="bold">/opt/HPCCSystems/bin/</emphasis> folder and to run it you
+      must pass the location of <emphasis role="bold">daliconf.xml</emphasis>,
+      for example: </para>
+
+      <para><programlisting>/opt/HPCCSystems/bin/addScopes /var/lib/HPCCSystems/mydali/daliconf.xml</programlisting></para>
+    </sect3>
   </sect2>
 </sect1>

initfiles/bin/init_roxie

@@ -42,6 +42,7 @@ export restarts=0
 
 ulimit -c unlimited
 ulimit -n $NUM_ROXIE_HANDLES
+ulimit -r 4
 
 killed() {
     if [ -n "$1" ]; then