diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /plugin/auth_gssapi | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'plugin/auth_gssapi')
| -rw-r--r-- | plugin/auth_gssapi/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/auth_gssapi/README.md b/plugin/auth_gssapi/README.md index b2c17353fc5..ea8deaafa94 100644 --- a/plugin/auth_gssapi/README.md +++ b/plugin/auth_gssapi/README.md @@ -108,7 +108,7 @@ mysql --plugin-dir=/path/to/plugin-dir -u usr1 - **gssapi-mech-name** (Windows only) - Name of the SSPI package used by server. Can be either 'Kerberos' or 'Negotiate'. Defaults to 'Negotiate' (both Kerberos and NTLM users can connect) Set it to 'Kerberos', to prevent less secure NTLM in domain environments, but leave it as default(Negotiate) - to allow non-domain environment (e.g if server does not run in domain enviroment). + to allow non-domain environment (e.g if server does not run in domain environment). #Implementation |