From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 3 Oct 2004 09:10:29 +0000 (+0000)
Subject: Final changes
X-Git-Tag: Release-1.35.6~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d43e16f99e4400d2374bf902b5b3236da82881b1;p=bacula%2Fbacula

Final changes


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1627 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 353dcb9578..da13ee62dc 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -17,7 +17,7 @@ Version 1.35                Kern (see below)
   block numbers in btape "test".  Possibly adjust in Bacula.
 - Fix possible bug in update volumefrompool (email 9/28 from
   jesk@killall.org
-- Look into failing Excludes in Win32
+- Make restore check if the file size restored is correct.
 
 - Document a get out of jail procedure if everything breaks if 
   you lost/broke the Catalog -- do the same for "I know my
@@ -1369,3 +1369,5 @@ Block Position: 0
 - List verify options for DiskToCatalog in doc.
 - Turn on transactions if multiple connections are on in DB.
 - Fix storage overrides in Run directives.
+- Look into failing Excludes in Win32
+
diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index edd1182153..644c545872 100644
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -19,7 +19,7 @@
  *  
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2001-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -301,7 +301,7 @@ static bool do_label(JCR *jcr, int relabel)
    poolname = get_memory(dir->msglen+1);
    mtype = get_memory(dir->msglen+1);
    if (relabel) {
-      if (sscanf(dir->msg, "relabel %127s OldName=%127s NewName=%127s PoolName=127%s MediaType=%127s Slot=%d",
+      if (sscanf(dir->msg, "relabel %127s OldName=%127s NewName=%127s PoolName=%127s MediaType=%127s Slot=%d",
 	  dname.c_str(), oldname, newname, poolname, mtype, &slot) == 6) {
 	 ok = true;
       }