From: Stelian Pop <stelian@popies.net>
Date: Sun, 31 Oct 1999 19:48:25 +0000 (+0000)
Subject: For incrementals, we *must* read dumpdates (fail if it's not there!).
X-Git-Tag: release_0_4b8~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=60f5ede9f87288e50fc52fbe12dd70fcd67d322d;p=dump.git

For incrementals, we *must* read dumpdates (fail if it's not there!).
---

diff --git a/CHANGES b/CHANGES
index 7f99d5f..607a400 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.9 1999/10/30 22:55:45 tiniou Exp $
+$Id: CHANGES,v 1.10 1999/10/31 19:48:25 tiniou Exp $
 
 Changes between versions 0.4b7 and 0.4b8 (released ???????????????)
 ===================================================================
@@ -22,6 +22,11 @@ Changes between versions 0.4b7 and 0.4b8 (released ???????????????)
 	bypass the security limitations of rcmd). Now you can do remote
 	backups without being root (or making dump setuid root).
 
+6.	Modified again the way dumpdates works. For incremental dumps,
+	we need to read dumpdates even if we are not using 'u' option.
+	Thanks to Bdale Garbee <bdale@gag.com> for his ideas on how
+	this should work.
+
 Changes between versions 0.4b6 and 0.4b7 (released October 8, 1999)
 ===================================================================
 
diff --git a/dump/itime.c b/dump/itime.c
index f0fa414..6279225 100644
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: itime.c,v 1.6 1999/10/13 09:57:19 stelian Exp $";
+	"$Id: itime.c,v 1.7 1999/10/31 19:48:28 tiniou Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -168,10 +168,10 @@ getdumptime(int createdumpdates)
 	spcl.c_ddate = 0;
 	lastlevel = '0';
 
-	/* if we're not going to update dumpdates, there's no point in reading
-	   it, particularly since /var might not be mounted... wait until here
-	   to benefit from the initialization of variables needed by parent */
-	if (!uflag && level == lastlevel)
+	/* If this is a level 0 dump, there's no point in trying to read
+	   dumpdates.  It may not exist yet, or may not be mounted.  For
+	   incrementals, we *must* read dumpdates (fail if it's not there!) */
+	if (level == lastlevel)
 		return;
 	initdumptimes(createdumpdates);
 	if (ddatev == NULL)