diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
commit | be85d3e61bb4217453a6879cb28d9bd369ad17dd (patch) | |
tree | c1ec0aab43cf0df71d88b8278367a79aabc43f52 /plugin/win_auth_client | |
parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'plugin/win_auth_client')
-rw-r--r-- | plugin/win_auth_client/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/common.cc | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/common.h | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/handshake.cc | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/handshake.h | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/handshake_client.cc | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/log_client.cc | 2 | ||||
-rw-r--r-- | plugin/win_auth_client/plugin_client.cc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/plugin/win_auth_client/CMakeLists.txt b/plugin/win_auth_client/CMakeLists.txt index 5d72d24d6ad..435c5b8966a 100644 --- a/plugin/win_auth_client/CMakeLists.txt +++ b/plugin/win_auth_client/CMakeLists.txt @@ -11,7 +11,7 @@ # # 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 +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA IF(WIN32) # diff --git a/plugin/win_auth_client/common.cc b/plugin/win_auth_client/common.cc index 007a511171a..4fbddd28c9d 100644 --- a/plugin/win_auth_client/common.cc +++ b/plugin/win_auth_client/common.cc @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "common.h" #include <sddl.h> // for ConvertSidToStringSid() diff --git a/plugin/win_auth_client/common.h b/plugin/win_auth_client/common.h index cd7dc8c2e66..8aeb1cd2144 100644 --- a/plugin/win_auth_client/common.h +++ b/plugin/win_auth_client/common.h @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef COMMON_H #define COMMON_H diff --git a/plugin/win_auth_client/handshake.cc b/plugin/win_auth_client/handshake.cc index 8e6af8408ae..cd63ee263a7 100644 --- a/plugin/win_auth_client/handshake.cc +++ b/plugin/win_auth_client/handshake.cc @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "handshake.h" diff --git a/plugin/win_auth_client/handshake.h b/plugin/win_auth_client/handshake.h index 66d492f79ab..2eac0afb785 100644 --- a/plugin/win_auth_client/handshake.h +++ b/plugin/win_auth_client/handshake.h @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef HANDSHAKE_H #define HANDSHAKE_H diff --git a/plugin/win_auth_client/handshake_client.cc b/plugin/win_auth_client/handshake_client.cc index 7969a6f3c49..28a228cc210 100644 --- a/plugin/win_auth_client/handshake_client.cc +++ b/plugin/win_auth_client/handshake_client.cc @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "handshake.h" diff --git a/plugin/win_auth_client/log_client.cc b/plugin/win_auth_client/log_client.cc index ec7210a8a97..2e878510105 100644 --- a/plugin/win_auth_client/log_client.cc +++ b/plugin/win_auth_client/log_client.cc @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> #include "common.h" diff --git a/plugin/win_auth_client/plugin_client.cc b/plugin/win_auth_client/plugin_client.cc index c7dcb92e62d..37bd1bc5c32 100644 --- a/plugin/win_auth_client/plugin_client.cc +++ b/plugin/win_auth_client/plugin_client.cc @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> #include <mysql.h> |