- Include msvcr71.dll in distribution.

- Add VSS to status line in Win32 FD if enabled.

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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 3230194f8d899e6456c8a6dc0ea35c6dfeb6db6f..579c9fe05b8fa83b7e7b1e68886e4b22ed4d0423 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -5,6 +5,8 @@ General:
 
 Changes to 1.37.30:
 14Jul05
+- Include msvcr71.dll in distribution.
+- Add VSS to status line in Win32 FD if enabled.
 - Get VSS build scripts working with Thorsten's help.
 - Unlink the bootstrap file after sending it to
   the FD.

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 398ad673198cbd08f9f2da01a1036780b7f0700a..275399949d1ee80dd7838530fd4b30b788ad5dc5 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -7,22 +7,17 @@
  *
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2001-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -48,6 +43,11 @@ static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
 #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
 static int privs = 0;
 #endif
+#ifdef WIN32_VSS
+#define VSS " VSS"
+#else
+#define VSS ""
+#endif
 
 /*
  * General status generator
@@ -62,8 +62,8 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
 
    msg = (char *)get_pool_memory(PM_MESSAGE);
    found = 0;
-   len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
-              HOST_OS, DISTNAME, DISTVER);
+   len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ")" VSS " %s %s %s\n", 
+              my_name, HOST_OS, DISTNAME, DISTVER);
    sendit(msg, len, arg);
    bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),