kes Don't print clock skew message in FD if less than 3 seconds diff.

kes  Add a bit of VSS info to status client.
kes  Make a gross first cut of Vista VSS, using Win2003 code.

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

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 4a095228125c60355e863cab00aa701209185fcd..ad0d4d68bde1b1298e56202e4ecfb7a03f006f52 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -1217,7 +1217,8 @@ static int level_cmd(JCR *jcr)
       Dmsg2(100, "rt=%s adj=%s\n", edit_uint64(rt, ed1), edit_uint64(bt_adj, ed2));
       adj = btime_to_utime(bt_adj);
       since_time += adj;              /* adjust for clock difference */
-      if (adj != 0) {
+      /* Don't notify if time within 3 seconds */
+      if (adj > 3 || adj < -3) {
          int type;
          if (adj > 600 || adj < -600) {
             type = M_WARNING;

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 497c7cc215fd0388d2b64471f5c99efc72de9a71..00549fe0e0fba6da3024e6521d221be6dff7f30d 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -86,7 +86,7 @@ void output_status(void sendit(const char *msg, int len, void *sarg), void *arg)
       if (!privs) {
          privs = enable_backup_privileges(NULL, 1);
       }
-      len = Mmsg(msg, "Priv 0x%x\n", privs);
+      len = Mmsg(msg, "VSS=%s Priv 0x%x\n", g_pVSSClient?"yes":"no", privs);
       sendit(msg.c_str(), len, arg);
       len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
                  p_OpenProcessToken?"":"!",

diff --git a/bacula/src/version.h b/bacula/src/version.h
index fc544442a1d3d32c86171b484669b206a3d8f1bc..ddd9938c56aef7aa196e097dcb12c490c9478516 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.1.20"
-#define BDATE   "20 June 2007"
-#define LSMDATE "20Jun07"
+#define VERSION "2.1.21"
+#define BDATE   "21 June 2007"
+#define LSMDATE "21Jun07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index a21830100da84b41a0eee71aaf01928aca18d6b8..d47a1ada9ed94426e238303b58cc719919273e28 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,12 @@
               Technical notes on version 2.1
 
 General:
+21Jun07
+kes  Don't print clock skew message in FD if less than 3 seconds diff.
+kes  Add a bit of VSS info to status client.
+kes  Make a gross first cut of Vista VSS, using Win2003 code.
+
+Release: 2.1.18 beta
 20Jun07
 kes  Fixed bug #886 (multidrive autochanger: SD doesn't use drive with
      loaded tape but uses first drive).