* Couple of minor updates to BackupPC_Admin, documentation and ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 97c083d..4789d2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,11 @@
 * Fixed CGI browse navigation bug that causes BackupPC_Admin to wedge
   when directories were selected in a certain order.
 
 * Fixed CGI browse navigation bug that causes BackupPC_Admin to wedge
   when directories were selected in a certain order.
 

+* Fixed BackupPC::PoolWrite so that it can recover when the initial
+  file size is wrong.  This is needed since rsync could write a file
+  whose size is different from the initial size returned in the
+  file list when that file is updated while rsync is running.
+

 * Added binmode(STDIN) to BackupPC_tarExtract, suggested by Pat LoPresti
   to fix a problem a RedHat8 with perl 5.8.0.  It's unclear why this
   helps, but it should be benign.  See:
 * Added binmode(STDIN) to BackupPC_tarExtract, suggested by Pat LoPresti
   to fix a problem a RedHat8 with perl 5.8.0.  It's unclear why this
   helps, but it should be benign.  See:

diff --git a/cgi-bin/BackupPC_Admin b/cgi-bin/BackupPC_Admin
index b077bcc..e068f98 100755 (executable)
--- a/cgi-bin/BackupPC_Admin
+++ b/cgi-bin/BackupPC_Admin
@@ -39,7 +39,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.0.0beta2, released 13 Apr 2003.
+# Version 2.0.0beta2, released 11 May 2003.

 #
 # See http://backuppc.sourceforge.net.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -76,7 +76,7 @@ $User   = $ENV{REMOTE_USER};
 
 if ( !defined($bpc) ) {
     ErrorExit($Lang->{BackupPC__Lib__new_failed__check_apache_error_log})
 
 if ( !defined($bpc) ) {
     ErrorExit($Lang->{BackupPC__Lib__new_failed__check_apache_error_log})

-       if ( !($bpc = BackupPC::Lib->new) );
+       if ( !($bpc = BackupPC::Lib->new(undef, undef, 1)) );

     $TopDir = $bpc->TopDir();
     $BinDir = $bpc->BinDir();
     %Conf   = $bpc->Conf();
     $TopDir = $bpc->TopDir();
     $BinDir = $bpc->BinDir();
     %Conf   = $bpc->Conf();


@@ -100,7 +100,16 @@ $ENV{PATH} = $Conf{MyPath};
 #
 if ( $Conf{BackupPCUserVerify}
         && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))[2]) ) {
 #
 if ( $Conf{BackupPCUserVerify}
         && $> != (my $uid = (getpwnam($Conf{BackupPCUser}))[2]) ) {

-    ErrorExit(eval("qq{$Lang->{Wrong_user__my_userid_is___}}"));
+    ErrorExit(eval("qq{$Lang->{Wrong_user__my_userid_is___}}"), <<EOF);
+This script needs to run as the user specified in \$Conf{BackupPCUser},
+which is set to $Conf{BackupPCUser}.
+<p>
+This is an installation problem.  If you are using mod_perl then
+it appears that Apache is not running as user $Conf{BackupPCUser}.
+If you are not using mod_perl, then most like setuid is not working
+properly on BackupPC_Admin.  Check the permissions on
+$Conf{CgiDir}/BackupPC_Admin and look at the documentation.
+EOF

 }
 
 if ( !defined($Hosts) || $bpc->HostsMTime() != $HostsMTime ) {
 }
 
 if ( !defined($Hosts) || $bpc->HostsMTime() != $HostsMTime ) {


@@ -1611,6 +1620,16 @@ sub ErrorExit
     $Conf{CgiNavBarBgColor}  ||= "#ddeeee";
     $Conf{CgiHeaderBgColor}  ||= "#99cc33";
 
     $Conf{CgiNavBarBgColor}  ||= "#ddeeee";
     $Conf{CgiHeaderBgColor}  ||= "#99cc33";
 

+    if ( 1 || !defined($ENV{REMOTE_USER}) ) {
+       $mesg .= <<EOF;
+<p>
+Note: \$ENV{REMOTE_USER} is not set, which could mean there is an
+installation problem.  BackupPC_Admin expects Apache to authenticate
+the user and pass their user name into this script as the REMOTE_USER
+environment variable.  See the documentation.
+EOF
+    }
+

     $bpc->ServerMesg("log User $User (host=$In{host}) got CGI error: $head")
                             if ( defined($bpc) );
     if ( !defined($Lang->{Error}) ) {
     $bpc->ServerMesg("log User $User (host=$In{host}) got CGI error: $head")
                             if ( defined($bpc) );
     if ( !defined($Lang->{Error}) ) {

diff --git a/doc-src/BackupPC.pod b/doc-src/BackupPC.pod
index ea46308..4dd898c 100644 (file)
--- a/doc-src/BackupPC.pod
+++ b/doc-src/BackupPC.pod
@@ -41,7 +41,7 @@ cancel backups and browse and restore files from backups.
 =item *
 
 The http/cgi user interface has internationalization (i18n) support,
 =item *
 
 The http/cgi user interface has internationalization (i18n) support,

-currently prodiving English, French and Spanish.
+currently providing English, French and Spanish.

 
 =item *
 
 
 =item *
 


@@ -346,7 +346,7 @@ implementation effort. The program xdelta (v1) on SourceForge (see
 L<http://sourceforge.net/projects/xdelta>) uses an rsync algorithm for
 doing efficient binary file deltas.  Rather than using an external
 program, File::RsyncP will eventually get the necessary delta
 L<http://sourceforge.net/projects/xdelta>) uses an rsync algorithm for
 doing efficient binary file deltas.  Rather than using an external
 program, File::RsyncP will eventually get the necessary delta

-generataion code from rsync.
+generation code from rsync.

 
 =back
 
 
 =back
 


@@ -2695,6 +2695,10 @@ do the tar octal conversion for file sizes from 2GB-4GB.  BackupPC_tarExtract
 knows about this bug and can recover the correct file size.  So smbclient
 transport works up to 4GB file sizes.
 
 knows about this bug and can recover the correct file size.  So smbclient
 transport works up to 4GB file sizes.
 

+Rsync running on Cygwin is limited to either 2GB or 4GB file sizes.
+More testing needs to be done to verify the file size limit for
+rsync on various platforms.
+

 =back
 
 =item Some tape backup systems aren't smart about hard links
 =back
 
 =item Some tape backup systems aren't smart about hard links


@@ -3014,7 +3018,7 @@ for zip download, in addition to some CGI cleanup, for v1.5.0.
 
 Javier Gonzalez provided the Spanish translation, es.pm.
 
 
 Javier Gonzalez provided the Spanish translation, es.pm.
 

-Manfred provided the German translation, de.pm.
+Manfred Herrmann provided the German translation, de.pm.

 
 Many people have reported bugs, made useful suggestions and helped
 with testing; see the ChangeLog and the mail lists.
 
 Many people have reported bugs, made useful suggestions and helped
 with testing; see the ChangeLog and the mail lists.