diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 01:40:16 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:22:30 +0000 |
| commit | 53476abce829f14b9d591a9bf160bc07cffaa768 (patch) | |
| tree | 60288c4d65ece9f57a50aa017440659e1b902273 /plugin | |
| parent | 8fe04a3df37d65254142c6d1297eda32c1013f7f (diff) | |
| download | mariadb-git-53476abce829f14b9d591a9bf160bc07cffaa768.tar.gz | |
Windows, compiling : use /permissive- switch to improve conformance
fix a couple "initialization skipped by goto" and other new errors.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/server_plugin.cc | 2 | ||||
| -rw-r--r-- | plugin/auth_gssapi/server_plugin.h | 2 | ||||
| -rw-r--r-- | plugin/auth_gssapi/sspi_server.cc | 4 | ||||
| -rw-r--r-- | plugin/win_auth_client/handshake.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugin/auth_gssapi/server_plugin.cc b/plugin/auth_gssapi/server_plugin.cc index b991c764f05..5db86cffbe4 100644 --- a/plugin/auth_gssapi/server_plugin.cc +++ b/plugin/auth_gssapi/server_plugin.cc @@ -56,7 +56,7 @@ static int first_packet_len; */ char *srv_principal_name; char *srv_keytab_path; -char *srv_mech_name=(char *)""; +const char *srv_mech_name=""; unsigned long srv_mech; /** diff --git a/plugin/auth_gssapi/server_plugin.h b/plugin/auth_gssapi/server_plugin.h index 1348835e653..6284a319d03 100644 --- a/plugin/auth_gssapi/server_plugin.h +++ b/plugin/auth_gssapi/server_plugin.h @@ -37,7 +37,7 @@ typedef enum extern unsigned long srv_mech; extern char *srv_principal_name; -extern char *srv_mech_name; +extern const char *srv_mech_name; extern char *srv_keytab_path; /* Check, with GSSAPI/SSPI username of logged on user. diff --git a/plugin/auth_gssapi/sspi_server.cc b/plugin/auth_gssapi/sspi_server.cc index 140c6adf733..16f20b9b3b7 100644 --- a/plugin/auth_gssapi/sspi_server.cc +++ b/plugin/auth_gssapi/sspi_server.cc @@ -163,7 +163,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio, const char *user, size_t user_len, int co } sspi_ret= AcquireCredentialsHandle( srv_principal_name, - srv_mech_name, + (LPSTR)srv_mech_name, SECPKG_CRED_INBOUND, NULL, NULL, @@ -287,7 +287,7 @@ int plugin_init() ret = AcquireCredentialsHandle( srv_principal_name, - srv_mech_name, + (LPSTR)srv_mech_name, SECPKG_CRED_INBOUND, NULL, NULL, diff --git a/plugin/win_auth_client/handshake.h b/plugin/win_auth_client/handshake.h index bbad5ca36bc..66d492f79ab 100644 --- a/plugin/win_auth_client/handshake.h +++ b/plugin/win_auth_client/handshake.h @@ -100,7 +100,7 @@ public: Handshake(const char *ssp, side_t side); virtual ~Handshake(); - int Handshake::packet_processing_loop(); + int packet_processing_loop(); bool virtual is_complete() const { |