From bd085c5e84a5488a92aadf2fa7a5e34cba26d6ae Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 19 Apr 2018 11:26:20 +0200 Subject: [PATCH] Remove old Bacula Systems notices --- bacula/src/dird/dir_plugins.c | 2 +- bacula/src/filed/fd_plugins.c | 2 +- bacula/src/filed/win_efs.c | 22 ++++++++++--------- bacula/src/stored/sd_plugins.c | 2 +- .../src/win32/win32_installer/winbacula.nsi | 8 +++---- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/bacula/src/dird/dir_plugins.c b/bacula/src/dird/dir_plugins.c index 44d6b6876f..c43e0d82b9 100644 --- a/bacula/src/dird/dir_plugins.c +++ b/bacula/src/dird/dir_plugins.c @@ -205,7 +205,7 @@ static bool is_plugin_compatible(Plugin *plugin) } if (strcmp(info->plugin_license, "Bacula AGPLv3") != 0 && strcmp(info->plugin_license, "AGPLv3") != 0 && - strcmp(info->plugin_license, "Bacula Systems(R) SA") != 0) { + strcmp(info->plugin_license, "Bacula") != 0) { Jmsg(NULL, M_ERROR, 0, _("Plugin license incompatible. Plugin=%s license=%s\n"), plugin->file, info->plugin_license); Dmsg2(50, "Plugin license incompatible. Plugin=%s license=%s\n", diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c index 066541b2c5..ff4d5de90c 100644 --- a/bacula/src/filed/fd_plugins.c +++ b/bacula/src/filed/fd_plugins.c @@ -1364,7 +1364,7 @@ static bool is_plugin_compatible(Plugin *plugin) } if (strcmp(info->plugin_license, "Bacula AGPLv3") != 0 && strcmp(info->plugin_license, "AGPLv3") != 0 && - strcmp(info->plugin_license, "Bacula Systems(R) SA") != 0) { + strcmp(info->plugin_license, "Bacula") != 0) { Jmsg(NULL, M_ERROR, 0, _("Plugin license incompatible. Plugin=%s license=%s\n"), plugin->file, info->plugin_license); Dmsg2(50, "Plugin license incompatible. Plugin=%s license=%s\n", diff --git a/bacula/src/filed/win_efs.c b/bacula/src/filed/win_efs.c index 860a21af15..b485980c8d 100644 --- a/bacula/src/filed/win_efs.c +++ b/bacula/src/filed/win_efs.c @@ -1,18 +1,20 @@ /* - Bacula® - The Network Backup Solution + Bacula(R) - The Network Backup Solution - Copyright (C) 2000-2014 Bacula Systems SA - All rights reserved. + Copyright (C) 2000-2018 Kern Sibbald - The main author of Bacula is Kern Sibbald, with contributions from many - others, a complete list can be found in the file AUTHORS. + The original author of Bacula is Kern Sibbald, with contributions + from many others, a complete list can be found in the file AUTHORS. - Licensees holding a valid Bacula Systems SA license may use this file - and others of this release in accordance with the proprietary license - agreement provided in the LICENSE file. Redistribution of any part of - this release is not permitted. + You may use this file and others of this release according to the + license defined in the LICENSE file, which includes the Affero General + Public License, v3.0 ("AGPLv3") and some additional permissions and + terms pursuant to its AGPLv3 Section 7. - Bacula® is a registered trademark of Kern Sibbald. + This notice must be preserved when any source code is + conveyed and/or propagated. + + Bacula(R) is a registered trademark of Kern Sibbald. */ /* * Bacula File Daemon Windows EFS restore diff --git a/bacula/src/stored/sd_plugins.c b/bacula/src/stored/sd_plugins.c index ada4c26e6c..8c70440b82 100644 --- a/bacula/src/stored/sd_plugins.c +++ b/bacula/src/stored/sd_plugins.c @@ -254,7 +254,7 @@ static bool is_plugin_compatible(Plugin *plugin) } if (strcmp(info->plugin_license, "Bacula AGPLv3") != 0 && strcmp(info->plugin_license, "AGPLv3") != 0 && - strcmp(info->plugin_license, "Bacula Systems(R) SA") != 0) { + strcmp(info->plugin_license, "Bacula") != 0) { Jmsg(NULL, M_ERROR, 0, _("Plugin license incompatible. Plugin=%s license=%s\n"), plugin->file, info->plugin_license); Dmsg2(000, "Plugin license incompatible. Plugin=%s license=%s\n", diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi index e88602023d..2d112f3db0 100644 --- a/bacula/src/win32/win32_installer/winbacula.nsi +++ b/bacula/src/win32/win32_installer/winbacula.nsi @@ -704,7 +704,7 @@ Section "-Finish" ${EndIf} ; Write the uninstall keys for Windows & create Start Menu entry - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula Systems(R) Enterprise" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayVersion" "${VERSION}" ${StrTok} $R0 "${VERSION}" "." 0 0 @@ -713,9 +713,9 @@ Section "-Finish" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMinor" $R0 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoRepair" 1 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://www.baculasystems.com" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.baculasystems.com" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.baculasystems.com" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://www.bacula.org" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.bacula.org" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.baculas.org" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteUninstaller "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\Bacula\Uninstall Bacula.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 -- 2.39.2