[Box Backup-dev] bin vs sbin

James O'Gorman boxbackup-dev@fluffy.co.uk
Wed, 27 Feb 2008 13:24:03 +0000


--RVlUGXxwBj5SDcM9
Content-Type: multipart/mixed; boundary="C7PTD44AewjTsiSV"
Content-Disposition: inline


--C7PTD44AewjTsiSV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Chris,

On Wed, Feb 27, 2008 at 09:48:40AM +0000, Chris Wilson wrote:
>  bbackupquery is dangerous for a normal user. You can read other users' f=
iles=20
>  (including root's), and delete things from the store. If you have the ke=
ys=20
>  you can cause havoc. bbackupctl allows users to shut down the bbackupd=
=20
>  daemon. I don't think either of these is safe for "normal" users=20
>  (non-admins).

Gotcha.

> >> Also, I think all the package scripts in contrib/ will have to be upda=
ted=20
> >> as well.

Done.

Updated patch attached.

James

--C7PTD44AewjTsiSV
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="sbin.patch"
Content-Transfer-Encoding: quoted-printable

Index: infrastructure/BoxPlatform.pm.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- infrastructure/BoxPlatform.pm.in	(revision 2093)
+++ infrastructure/BoxPlatform.pm.in	(working copy)
@@ -76,7 +76,7 @@
 	}
=20
 	# where to put the files
-	$install_into_dir =3D '@bindir_expanded@';
+	$install_into_dir =3D '@sbindir_expanded@';
=20
 	# if it's Darwin,
 	if($build_os eq 'Darwin')
Index: contrib/suse/bbackupd.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/suse/bbackupd.in	(revision 2093)
+++ contrib/suse/bbackupd.in	(working copy)
@@ -28,7 +28,7 @@
 ### END INIT INFO
=20
 # Check for missing binaries (stale symlinks should not happen)
-BBACKUPD_BIN=3D@bindir_expanded@/bbackupd
+BBACKUPD_BIN=3D@sbindir_expanded@/bbackupd
 if [ ! -x $BBACKUPD_BIN ] ; then
 	echo "$BBACKUPD_BIN not installed"
 	exit 5
Index: contrib/suse/bbstored.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/suse/bbstored.in	(revision 2093)
+++ contrib/suse/bbstored.in	(working copy)
@@ -29,7 +29,7 @@
 #=20
=20
 # Check for missing binaries (stale symlinks should not happen)
-BBSTORED_BIN=3D@bindir_expanded@/bbstored
+BBSTORED_BIN=3D@sbindir_expanded@/bbstored
 if [ ! -x $BBSTORED_BIN ] ; then
 	echo "$BBSTORED_BIN not installed"
 	exit 5
Index: contrib/debian/bbackupd.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/debian/bbackupd.in	(revision 2093)
+++ contrib/debian/bbackupd.in	(working copy)
@@ -2,7 +2,7 @@
=20
 # Start and stop the Box Backup client daemon.
=20
-BBACKUPD=3D@bindir_expanded@/bbackupd
+BBACKUPD=3D@sbindir_expanded@/bbackupd
 CONFIG=3D@sysconfdir_expanded@/box/bbackupd.conf
 PIDFILE=3D@localstatedir_expanded@/bbackupd.pid
=20
Index: contrib/debian/bbstored.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/debian/bbstored.in	(revision 2093)
+++ contrib/debian/bbstored.in	(working copy)
@@ -2,7 +2,7 @@
=20
 # Start and stop the Box Backup server daemon.
=20
-BBSTORED=3D@bindir_expanded@/bbstored
+BBSTORED=3D@sbindir_expanded@/bbstored
 CONFIG=3D@sysconfdir_expanded@/box/bbstored.conf
 PIDFILE=3D@localstatedir_expanded@/bbstored.pid
=20
Index: contrib/redhat/bbackupd.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/redhat/bbackupd.in	(revision 2093)
+++ contrib/redhat/bbackupd.in	(working copy)
@@ -23,7 +23,7 @@
=20
 start() {
 	echo -n $"Starting $prog: "
-	daemon $prog
+	daemon @sbindir_expanded@/$prog
 	RETVAL=3D$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
@@ -32,7 +32,7 @@
=20
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $prog
+	killproc @sbindir_expanded@/$prog
 	RETVAL=3D$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
@@ -40,7 +40,7 @@
 }
=20
 rhstatus() {
-	status $prog
+	status @sbindir_expanded@/$prog
 }
=20
 restart() {
@@ -50,7 +50,7 @@
=20
 reload() {
         echo -n $"Reloading $prog configuration: "
-        killproc $prog -HUP
+        killproc @sbindir_expanded@/$prog -HUP
         retval=3D$?
         echo
         return $RETVAL
Index: contrib/redhat/bbstored.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/redhat/bbstored.in	(revision 2093)
+++ contrib/redhat/bbstored.in	(working copy)
@@ -23,7 +23,7 @@
=20
 start() {
 	echo -n $"Starting $prog: "
-	daemon $prog
+	daemon @sbindir_expanded@/$prog
 	RETVAL=3D$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
@@ -32,7 +32,7 @@
=20
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $prog
+	killproc @sbindir_expanded@/$prog
 	RETVAL=3D$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
@@ -40,7 +40,7 @@
 }
=20
 rhstatus() {
-	status $prog
+	status @sbindir_expanded@/$prog
 }
=20
 restart() {
@@ -50,7 +50,7 @@
=20
 reload() {
         echo -n $"Reloading $prog configuration: "
-        killproc $prog -HUP
+        killproc @sbindir_expanded@/$prog -HUP
         retval=3D$?
         echo
         return $RETVAL
Index: contrib/solaris/bbackupd-smf-method.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/solaris/bbackupd-smf-method.in	(revision 2093)
+++ contrib/solaris/bbackupd-smf-method.in	(working copy)
@@ -5,7 +5,7 @@
=20
         # SMF arguments (start and restart [really "refresh"])
 'start')
-        @bindir_expanded@/bbackupd
+        @sbindir_expanded@/bbackupd
         ;;
=20
 'restart')
Index: contrib/solaris/bbstored-smf-method.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/solaris/bbstored-smf-method.in	(revision 2093)
+++ contrib/solaris/bbstored-smf-method.in	(working copy)
@@ -4,7 +4,7 @@
=20
         # SMF arguments (start and restart [really "refresh"])
 'start')
-        @bindir_expanded@/bbstored
+        @sbindir_expanded@/bbstored
         ;;
=20
 'restart')
Index: contrib/rpm/boxbackup.spec
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- contrib/rpm/boxbackup.spec	(revision 2093)
+++ contrib/rpm/boxbackup.spec	(working copy)
@@ -39,8 +39,8 @@
 Release: 1
 License: BSD
 Group: Applications/Archiving
-Packager: Martin Ebourne <boxbackup-dev@fluffy.co.uk>
-URL: http://www.fluffy.co.uk/boxbackup/
+Packager: Martin Ebourne <boxbackup-dev@boxbackup.org>
+URL: http://www.boxbackup.org/
 Source0: %{ident}.tgz
 Requires: openssl >=3D 0.9.7a
 BuildRoot: %{_tmppath}/%{ident}-%{release}-root
@@ -143,7 +143,7 @@
 %define server_dir parcels/%{ident}-backup-server-linux-gnu
 install %{server_dir}/bbstored $RPM_BUILD_ROOT%{_sbindir}
 install %{server_dir}/bbstoreaccounts $RPM_BUILD_ROOT%{_sbindir}
-install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_bindir}
+install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_sbindir}
 install %{server_dir}/bbstored-config $RPM_BUILD_ROOT%{_sbindir}
 install %{server_dir}/raidfile-config $RPM_BUILD_ROOT%{_sbindir}
=20
Index: configure.ac
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- configure.ac	(revision 2093)
+++ configure.ac	(working copy)
@@ -279,10 +279,10 @@
 saved_exec_prefix=3D$exec_prefix
 test "x$prefix" =3D xNONE && prefix=3D$ac_default_prefix
 test "x$exec_prefix" =3D xNONE && exec_prefix=3D'${prefix}'
-bindir_expanded=3D`       eval "echo $bindir"`
-bindir_expanded=3D`       eval "echo $bindir_expanded"`
-sysconfdir_expanded=3D`   eval "echo $sysconfdir"`
-localstatedir_expanded=3D`eval "echo $localstatedir"`
+eval bindir_expanded=3D`       eval "echo $bindir"`
+eval sbindir_expanded=3D`      eval "echo $sbindir"`
+eval sysconfdir_expanded=3D`   eval "echo $sysconfdir"`
+eval localstatedir_expanded=3D`eval "echo $localstatedir"`
 prefix=3D$saved_prefix
 exec_prefix=3D$saved_exec_prefix
 AC_SUBST([bindir_expanded sysconfdir_expanded localstatedir_expanded])
Index: bin/bbstored/bbstored-config.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- bin/bbstored/bbstored-config.in	(revision 2093)
+++ bin/bbstored/bbstored-config.in	(working copy)
@@ -234,7 +234,7 @@
 4) Create accounts with bbstoreaccounts
=20
 5) Start the backup store daemon with the command
-      @bindir_expanded@/bbstored$daemon_args
+      @sbindir_expanded@/bbstored$daemon_args
    in /etc/rc.local, or your local equivalent.
=20
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: bin/bbackupd/bbackupd-config.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- bin/bbackupd/bbackupd-config.in	(revision 2093)
+++ bin/bbackupd/bbackupd-config.in	(working copy)
@@ -577,7 +577,7 @@
    more files will be backed up. You want to know about this.
=20
 6) Start the backup daemon with the command
-      @bindir_expanded@/bbackupd$daemon_args
+      @sbindir_expanded@/bbackupd$daemon_args
    in /etc/rc.local, or your local equivalent.
    Note that bbackupd must run as root.
 __E
Index: documentation/adminguide.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- documentation/adminguide.xml	(revision 2093)
+++ documentation/adminguide.xml	(working copy)
@@ -96,11 +96,11 @@
         <programlisting>mkdir /tmp/boxbackupRepository                    =
    # Create the directory
 chown _bbstored /tmp/boxbackupRepository/             # Change the owner t=
o the new boxbackup daemon user
=20
-/usr/local/bin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository
+/usr/local/sbin/raidfile-config /etc/box/  1024 /tmp/boxbackupRepository
=20
 #substitute 1024 with the desired blocksize
 #substitute /tmp/boxbackupRepository with a directory that exists where yo=
u want the backup store located
-#/usr/local/bin/raidfile-config --help shows you the options</programlisti=
ng>
+#/usr/local/sbin/raidfile-config --help shows you the options</programlist=
ing>
=20
         <para>Then create the configuration file /etc/box/bbstored.conf The
         hostname is tricky as it is used for two things: The name of the
@@ -111,7 +111,7 @@
         <literal>ListenAddresses</literal> directive in the
         <filename>/etc/box/bbstored.conf</filename> file.</para>
=20
-        <programlisting>/usr/local/bin/bbstored-config /etc/box hostname _=
bbstored</programlisting>
+        <programlisting>/usr/local/sbin/bbstored-config /etc/box hostname =
_bbstored</programlisting>
=20
         <para>This last step outputs 5 instructions that you must execute =
to
         the letter. A lot of questions are raised on the mailing list beca=
use
@@ -164,7 +164,7 @@
=20
           <para>To setup the basic key structure, do the following:</para>
=20
-          <programlisting>/usr/local/bin/bbstored-certs ca init</programli=
sting>
+          <programlisting>/usr/local/sbin/bbstored-certs ca init</programl=
isting>
=20
           <para>(See <ulink url=3D"instguide.xml">OpenSSL notes</ulink> if=
 you
           get an OpenSSL error)</para>
@@ -181,7 +181,7 @@
           request (CSR) for you. Transfer it to the machine with your CA, =
then
           do:</para>
=20
-          <programlisting>/usr/local/bin/bbstored-certs ca sign-server hos=
tname-csr.pem</programlisting>
+          <programlisting>/usr/local/sbin/bbstored-certs ca sign-server ho=
stname-csr.pem</programlisting>
=20
           <para>This signs the certificate for the server. Follow the
           instructions in the output on which files to install on the serv=
er.
@@ -199,7 +199,7 @@
           0, for example, 1 or 75AB23C. Then on the backup store server,
           create the account with:</para>
=20
-          <programlisting>/usr/local/bin/bbstoreaccounts create 75AB23C 0 =
4096M 4505M</programlisting>
+          <programlisting>/usr/local/sbin/bbstoreaccounts create 75AB23C 0=
 4096M 4505M</programlisting>
=20
           <para>This looks complicated. The numbers are, in order:</para>
=20
@@ -261,7 +261,7 @@
=20
           <para>Sign this CSR with this command:</para>
=20
-          <programlisting>/usr/local/bin/bbstored-certs ca sign 75AB23C-cs=
r.pem</programlisting>
+          <programlisting>/usr/local/sbin/bbstored-certs ca sign 75AB23C-c=
sr.pem</programlisting>
=20
           <para>Don't forget to check that the embedded account number is
           correct! Then send the two files back to the user, as instructed=
 by
@@ -345,7 +345,7 @@
           the configuration files and generate a private key and certifica=
te
           request.</para>
=20
-          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy <em=
phasis
+          <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy <e=
mphasis
               role=3D"bold">999 hostname</emphasis> /var/bbackupd <emphasis
               role=3D"bold">/home</emphasis></programlisting>
=20
@@ -407,7 +407,7 @@
           basic bbackupd configuration.</para>
=20
           <para>You can then run the daemon (as root) by running
-          <command>/usr/local/bin/bbackupd</command>, and of course, addin=
g it
+          <command>/usr/local/sbin/bbackupd</command>, and of course, addi=
ng it
           to your system's startup scripts. The first time it's run it will
           upload everything. Interrupting it and restarting it will only
           upload files which were not uploaded before - it's very
@@ -517,7 +517,7 @@
             here -- they may be different for your system.</para>
           </important>
=20
-          <programlisting>/usr/local/bin/bbackupd-config /etc/box lazy 51 =
server.example.com /var/bbackupd /home /etc/samba
+          <programlisting>/usr/local/sbin/bbackupd-config /etc/box lazy 51=
 server.example.com /var/bbackupd /home /etc/samba
=20
 Setup bbackupd config utility.
=20
@@ -579,7 +579,7 @@
    more files will be backed up. You want to know about this.
=20
 6) Start the backup daemon with the command
-      /usr/local/bin/bbackupd
+      /usr/local/sbin/bbackupd
    in /etc/rc.local, or your local equivalent.
    Note that bbackupd must run as root.
=20
@@ -1304,7 +1304,7 @@
=20
         <para>The command line syntax is:</para>
=20
-        <programlisting>/usr/local/bin/bbackupctl [-q] [-c config-file] co=
mmand</programlisting>
+        <programlisting>/usr/local/sbin/bbackupctl [-q] [-c config-file] c=
ommand</programlisting>
=20
         <para>The -q option reduces the amount of output the program emits,
         and -c allows an alternative configuration file to be
@@ -1358,7 +1358,7 @@
         <para>Use bbackupd-config to write a configuration file in snapshot
         mode, and then run the following command as a cron job.</para>
=20
-        <programlisting>/usr/local/bin/bbackupctl -q sync</programlisting>
+        <programlisting>/usr/local/sbin/bbackupctl -q sync</programlisting>
=20
         <para>This will cause the backup daemon to upload all changed files
         immediately. <emphasis role=3D"bold">bbackupctl</emphasis> will ex=
it
@@ -1376,7 +1376,7 @@
           for this account. Either use the usage command in interactive mo=
de,
           or type:</para>
=20
-          <programlisting>/usr/local/bin/bbackupquery -q usage quit</progr=
amlisting>
+          <programlisting>/usr/local/sbin/bbackupquery -q usage quit</prog=
ramlisting>
=20
           <para>to show the space used as a single command.</para>
         </section>
@@ -1388,11 +1388,11 @@
           the limits. To display the space used on the server for an accou=
nt,
           use:</para>
=20
-          <programlisting>/usr/local/bin/bbstoreaccounts info 75AB23C</pro=
gramlisting>
+          <programlisting>/usr/local/sbin/bbstoreaccounts info 75AB23C</pr=
ogramlisting>
=20
           <para>To adjust the soft and hard limits on an account, use:</pa=
ra>
=20
-          <programlisting>/usr/local/bin/bbstoreaccounts setlimit 75AB23C =
new-soft-limit new-hard-limit</programlisting>
+          <programlisting>/usr/local/sbin/bbstoreaccounts setlimit 75AB23C=
 new-soft-limit new-hard-limit</programlisting>
=20
           <para>You do not need to restart the server.</para>
         </section>
@@ -1538,7 +1538,7 @@
           regularly, and check its output. You can run the command manuall=
y as
           follows:</para>
=20
-          <programlisting>/usr/local/bin/bbackupquery "compare -a" quit</p=
rogramlisting>
+          <programlisting>/usr/local/sbin/bbackupquery "compare -a" quit</=
programlisting>
=20
           <para>This command will report all the differences found between=
 the
           store and the files on disc. It will download everything, so may
@@ -1561,7 +1561,7 @@
           <para>If you would like to do a "quick" check which just downloa=
ds
           file checksums and compares against that, then run:</para>
=20
-          <programlisting>/usr/local/bin/bbackupquery "compare -aq" quit</=
programlisting>
+          <programlisting>/usr/local/sbin/bbackupquery "compare -aq" quit<=
/programlisting>
=20
           <para>However, this does not check that the file attributes are
           correct, and since the checksums are generated on the client they
@@ -1595,7 +1595,7 @@
=20
           <para>Type:</para>
=20
-          <programlisting>/usr/local/bin/bbackupquery</programlisting>
+          <programlisting>/usr/local/sbin/bbackupquery</programlisting>
=20
           <para>to run it in interactive mode.</para>
=20
@@ -1628,7 +1628,7 @@
           <para>Firstly, run bbackupquery in interactive mode. It behaves =
in a
           similar manner to a command line sftp client.</para>
=20
-          <programlisting>/usr/local/bin/bbackupquery</programlisting>
+          <programlisting>/usr/local/sbin/bbackupquery</programlisting>
=20
           <para>Then navigate to the directory containing the file you wan=
t,
           using list, cd and pwd.</para>
@@ -1744,14 +1744,14 @@
         <para>First, run the check utility, and see what errors it
         reports.</para>
=20
-        <programlisting>/usr/local/bin/bbstoreaccounts check 1234</program=
listing>
+        <programlisting>/usr/local/sbin/bbstoreaccounts check 1234</progra=
mlisting>
=20
         <para>This will take some time, and use a fair bit of memory (abou=
t 16
         bytes per file and directory). If the output looks plausible and
         reports errors which need fixing, run it again but with the fix
         flag:</para>
=20
-        <programlisting>/usr/local/bin/bbstoreaccounts check 1234 fix</pro=
gramlisting>
+        <programlisting>/usr/local/sbin/bbstoreaccounts check 1234 fix</pr=
ogramlisting>
=20
         <para>This will fix any errors, and remove unrecoverable files.
         Directories will be recreated if necessary.</para>
@@ -1841,7 +1841,7 @@
         configuration file locations to daemons and programs. For
         example</para>
=20
-        <programlisting>/usr/local/bin/bbstored /some/other/dir/bbstored.c=
onfig /usr/local/bin/bbackupquery -c /some/other/dir/bbackupd.config</progr=
amlisting>
+        <programlisting>/usr/local/sbin/bbstored /some/other/dir/bbstored.=
config /usr/local/sbin/bbackupquery -c /some/other/dir/bbackupd.config</pro=
gramlisting>
=20
         <para>(daemons specify the name as the first argument, utility
         programs with the -c option).</para>

--C7PTD44AewjTsiSV--

--RVlUGXxwBj5SDcM9
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iQEVAwUBR8Vkc/8Z3wLA10m9AQJOIAf9G+j9y5eYdWFG6aRE5Ep0B/gXFiaYkDRu
XUr7/tydxHZSW+Ys3VWUUGpnUfi+UoS/6ZnHuYcGvhxcvoa1zyPNsKlCFZlVFxdL
L9Zt9+A5Y2wfBgPo5nDdYEl66obCY1ysDwqYnLYvfa0oIuzDKmbYtViI9P/PMCln
jyj+qtrW2FzLUCSWDm5s0jqnigZ0odsvFmusVG4/RDFOgI5E2dXcUqSan1ib29hd
3xssPv849YkQYdHJHmdz3DyvNlxVKUZh+sglcDVAx5YUSAvdq7XgA9oIh7jSjy35
o74fwUznQ6mUD0ONr6SAba8MtS+CFvq1Z3SxD8R7DGEYiaO+TRoZNQ==
=NQQG
-----END PGP SIGNATURE-----

--RVlUGXxwBj5SDcM9--