From 620b04aae11389a2d309542a9b3b7e3459afaca7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 1 Mar 2014 21:47:07 +0000
Subject: [PATCH] Change vsftpd 'empty' directory to FHS compatible location.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12805 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  5 +++++
 server/major/vsftpd.xml            | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2c10ddae75..7812474c89 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,11 @@
     <listitem>
       <para>March 1st, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move vsftpd 'empty' directory to FHS
+          compliant location. Fixes 
+          <ulink url="&blfs-ticket-root;4721">#4721</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Add a patch to remove ifconfig and hostname
           when installing net-tools. Fixes 
diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml
index ce0c808492..d72cb4945e 100644
--- a/server/major/vsftpd.xml
+++ b/server/major/vsftpd.xml
@@ -10,6 +10,7 @@
   <!ENTITY vsftpd-size          "196 KB">
   <!ENTITY vsftpd-buildsize     "1.8 MB">
   <!ENTITY vsftpd-time          "less than 0.1 SBU">
+  <!ENTITY vsftpd-empty         "/usr/share/vsftpd/empty">
 ]>
 
 <sect1 id="vsftpd" xreflabel="vsftpd-&vsftpd-version;">
@@ -80,10 +81,10 @@
     class="username">root</systemitem> user, create the needed directories,
     users, and groups with the following commands:</para>
 
-<screen role="root"><userinput>install -v -d -m 0755 /var/ftp/empty &amp;&amp;
-install -v -d -m 0755 /home/ftp      &amp;&amp;
-groupadd -g 47 vsftpd                &amp;&amp;
-groupadd -g 45 ftp                   &amp;&amp;
+<screen role="root"><userinput>install -v -d -m 0755 &vsftpd-empty; &amp;&amp;
+install -v -d -m 0755 /home/ftp               &amp;&amp;
+groupadd -g 47 vsftpd                         &amp;&amp;
+groupadd -g 45 ftp                            &amp;&amp;
 
 useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
 useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
@@ -118,7 +119,7 @@ install -v -m 644 vsftpd.conf   /etc</userinput></screen>
     directory that anonymous users will use (<filename
     class='directory'>/home/ftp</filename>)
     and the directory the daemon will chroot into
-    (<filename class='directory'>/var/ftp/empty</filename>).</para>
+    (<filename class='directory'>&vsftpd-empty;</filename>).</para>
 
     <note>
       <para><filename class="directory">/home/ftp</filename> should not be
@@ -173,7 +174,7 @@ install -v -m 644 vsftpd.conf   /etc</userinput></screen>
 <literal>background=YES
 listen=YES
 nopriv_user=vsftpd
-secure_chroot_dir=/var/ftp/empty</literal>
+secure_chroot_dir=&vsftpd-empty;</literal>
 EOF</userinput></screen>
 
     </sect3>
@@ -202,7 +203,7 @@ EOF</userinput></screen>
       <seglistitem>
         <seg>vsftpd</seg>
         <seg>None</seg>
-        <seg>/var/ftp, /var/ftp/empty, /home/ftp</seg>
+        <seg>//usr/share/vsftpd, /home/ftp</seg>
       </seglistitem>
     </segmentedlist>