WL#16403 Addendum 1: Fixed the copyright headers for some of the new

files Approved-by: Bjorn Munch <bjorn.munch@oracle.com> Change-Id: I8aa58f6d01f731fa7a221478009267d3ef5cec08
mysql · Sep 14, 2024 · 53cc65d · 53cc65d
1 parent 0aceadd
commit 53cc65d
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 20 deletions.
diff --git a/components/keyrings/keyring_file/option_usage.cc b/components/keyrings/keyring_file/option_usage.cc
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "option_usage.h"
 #include <cassert>
@@ -54,4 +73,4 @@ bool keyring_file_component_option_usage_deinit() {
 
 bool keyring_file_component_option_usage_set(unsigned long every_nth) {
   return option_usage->set_sampled(true, every_nth);
-}
+}
diff --git a/components/keyrings/keyring_file/option_usage.h b/components/keyrings/keyring_file/option_usage.h
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #ifndef KEYRING_FILE_COMPONENT_OPTION_USAGE_H
 #define KEYRING_FILE_COMPONENT_OPTION_USAGE_H

diff --git a/components/validate_password/option_usage.cc b/components/validate_password/option_usage.cc
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "option_usage.h"
 #include <cassert>
@@ -49,4 +68,4 @@ bool validate_password_component_option_usage_deinit() {
 
 bool validate_password_component_option_usage_set(unsigned long every_nth) {
   return option_usage->set_sampled(true, every_nth);
-}
+}
diff --git a/components/validate_password/option_usage.h b/components/validate_password/option_usage.h
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #ifndef VALIDATE_PASSWORD_COMPONENT_OPTION_USAGE_H
 #define VALIDATE_PASSWORD_COMPONENT_OPTION_USAGE_H

diff --git a/plugin/connection_control/option_usage.cc b/plugin/connection_control/option_usage.cc
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "option_usage.h"
 #include <string>

diff --git a/plugin/connection_control/option_usage.h b/plugin/connection_control/option_usage.h
@@ -1,6 +1,25 @@
-/*
-  Copyright (c) 2024, Oracle and/or its affiliates.
-*/
+/* Copyright (c) 2024, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is designed to work with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have either included with
+the program or referenced in the documentation.
+
+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, version 2.0, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #ifndef CONNECTION_CONTROL_PLUGIN_OPTION_USAGE_H
 #define CONNECTION_CONTROL_PLUGIN_OPTION_USAGE_H