current status

bareos · Jan 30, 2019 · bf709f6 · bf709f6
1 parent 32eb05b
commit bf709f6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/core/src/dird/admin.cc b/core/src/dird/admin.cc
@@ -126,7 +126,7 @@ void AdminCleanup(JobControlRecord *jcr, int TermCode)
         schedt,
         sdt,
         edt,
-        BAREOS_BINARY_AND_SERVICES_MESSAGE,
+        BAREOS_SERVICES_MESSAGE,
         TermMsg);
 
    Dmsg0(debuglevel, "Leave AdminCleanup()\n");

diff --git a/core/src/dird/archive.cc b/core/src/dird/archive.cc
@@ -125,7 +125,7 @@ void ArchiveCleanup(JobControlRecord *jcr, int TermCode)
         schedt,
         sdt,
         edt,
-        BAREOS_BINARY_AND_SERVICES_MESSAGE,
+        BAREOS_SERVICES_MESSAGE,
         TermMsg);
 
    Dmsg0(debuglevel, "Leave ArchiveCleanup()\n");

diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc
@@ -1244,7 +1244,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty
         edit_uint64_with_suffix(mr.VolBytes, ec8),
         daemon_status.c_str(),
         secure_erase_status.c_str(),
-        BAREOS_BINARY_AND_SERVICES_MESSAGE,
+        BAREOS_SERVICES_MESSAGE,
         TermMsg);
 }
 } /* namespace directordaemon */
diff --git a/core/src/dird/consolidate.cc b/core/src/dird/consolidate.cc
@@ -358,7 +358,7 @@ void ConsolidateCleanup(JobControlRecord *jcr, int TermCode)
         schedt,
         sdt,
         edt,
-        BAREOS_BINARY_AND_SERVICES_MESSAGE,
+        BAREOS_SERVICES_MESSAGE,
         TermMsg);
 
    Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n");

diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc
@@ -1759,7 +1759,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord *
            edit_uint64_with_suffix(mr->VolBytes, ec5),
            jcr->SDErrors,
            sd_term_msg,
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            term_code);
    } else {
       /*
@@ -1785,7 +1785,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord *
            edt,
            edit_utime(RunTime, elapsed, sizeof(elapsed)),
            jcr->JobPriority,
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            term_code);
    }
 }

diff --git a/core/src/dird/restore.cc b/core/src/dird/restore.cc
@@ -598,7 +598,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter
            edit_uint64_with_commas(jcr->jr.JobBytes, ec3),
            (float)kbps,
            sd_term_msg,
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            TermMsg);
       break;
    default:
@@ -649,7 +649,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter
            fd_term_msg,
            sd_term_msg,
            secure_erase_status.c_str(),
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            TermMsg);
       break;
    }

diff --git a/core/src/dird/verify.cc b/core/src/dird/verify.cc
@@ -587,7 +587,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode)
            jcr->JobErrors,
            fd_term_msg,
            sd_term_msg,
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            TermMsg);
       break;
    default:
@@ -621,7 +621,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode)
            edit_uint64_with_commas(jcr->JobFiles, ec1),
            jcr->JobErrors,
            fd_term_msg,
-           BAREOS_BINARY_AND_SERVICES_MESSAGE,
+           BAREOS_SERVICES_MESSAGE,
            TermMsg);
       break;
    }

diff --git a/core/src/include/version.h b/core/src/include/version.h
@@ -10,16 +10,12 @@
 #endif
 
 #ifndef BAREOS_SERVICES_MESSAGE
-#define BAREOS_SERVICES_MESSAGE "Get official binaries and vendor support on bareos.com"
-#endif
-
-#ifndef BAREOS_BINARY_AND_SERVICES_MESSAGE
-#define BAREOS_BINARY_AND_SERVICES_MESSAGE "self-compiled binaries are UNSUPPORTED by bareos.com. Get official binaries and vendor support on https://bareos.com"
+#define BAREOS_SERVICES_MESSAGE "self-compiled binaries are UNSUPPORTED by bareos.com. Get official binaries and vendor support on https://bareos.com"
 #endif
 
 
 #define PROG_COPYRIGHT "\n" \
-                       BAREOS_BINARY_AND_SERVICES_MESSAGE \
+                       BAREOS_SERVICES_MESSAGE \
                        "\n" \
                        "Copyright (C) 2013-2019 Bareos GmbH & Co. KG\n" \
                        "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n" \