summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorklemens <ka7@github.com>2017-02-26 16:49:47 +0100
committerSergey Vojtovich <svoj@mariadb.org>2017-03-07 13:38:06 +0400
commit7be541f281225aae8e04bff4210b67688be080bc (patch)
treef6ba5f7862669d13b4c425d44baa7528f42da1d3 /plugin
parente823023e4bb48b0db9ee91477076fc20db704769 (diff)
downloadmariadb-git-7be541f281225aae8e04bff4210b67688be080bc.tar.gz
spelling fixes
Diffstat (limited to 'plugin')
-rw-r--r--plugin/auth_gssapi/README.md4
-rw-r--r--plugin/auth_pam/mapper/pam_user_map.c4
-rw-r--r--plugin/aws_key_management/CMakeLists.txt2
-rw-r--r--plugin/server_audit/plugin_audit_v4.h2
-rw-r--r--plugin/win_auth_client/handshake_client.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/plugin/auth_gssapi/README.md b/plugin/auth_gssapi/README.md
index 7f678400f0d..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
@@ -124,6 +124,6 @@ Send resulting GSSAPI blob to server.
3. Server : receive blob from client, execute ```gss_accept_sec_context()/ AcceptSecurityContext()```, send resulting blob back to client
-4. Perform 2. and 3. can until both client and server decide that authentication is done, or until some error occured. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
+4. Perform 2. and 3. can until both client and server decide that authentication is done, or until some error occurred. If authentication was successful, GSSAPI context (an opaque structure) is generated on both client and server sides.
5. Server : Client name is extracted from the context, and compared to the name provided by client(with or without realm). If name matches, plugin returns success.
diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c
index b4db8ece06e..e62be946c4a 100644
--- a/plugin/auth_pam/mapper/pam_user_map.c
+++ b/plugin/auth_pam/mapper/pam_user_map.c
@@ -6,7 +6,7 @@
gcc pam_user_map.c -shared -lpam -fPIC -o pam_user_map.so
Install as appropriate (for example, in /lib/security/).
- Add to your /etc/pam.d/mysql (preferrably, at the end) this line:
+ Add to your /etc/pam.d/mysql (preferably, at the end) this line:
=========================================================
auth required pam_user_map.so
=========================================================
@@ -15,7 +15,7 @@ auth required pam_user_map.so
in the format: orig_user_name: mapped_user_name
@user's_group_name: mapped_user_name
=========================================================
-#comments and emtpy lines are ignored
+#comments and empty lines are ignored
john: jack
bob: admin
top: accounting
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt
index 0e6c9b648ad..62d359569c6 100644
--- a/plugin/aws_key_management/CMakeLists.txt
+++ b/plugin/aws_key_management/CMakeLists.txt
@@ -10,7 +10,7 @@
# Give message why the building this plugin is skipped (only if -DVERBOSE is defined)
-# or if plugin is explicitely requested to build. Then bail out.
+# or if plugin is explicitly requested to build. Then bail out.
MACRO(SKIP_AWS_PLUGIN msg)
IF(VERBOSE OR "${PLUGIN_AWS_KEY_MANAGEMENT}" MATCHES "^(STATIC|DYNAMIC)$")
MESSAGE(STATUS "Can't build aws_key_management - ${msg}")
diff --git a/plugin/server_audit/plugin_audit_v4.h b/plugin/server_audit/plugin_audit_v4.h
index 5f8e43b3811..f8662c23e6b 100644
--- a/plugin/server_audit/plugin_audit_v4.h
+++ b/plugin/server_audit/plugin_audit_v4.h
@@ -232,7 +232,7 @@ struct mysql_event_parse
/** input: the original query text */
MYSQL_LEX_CSTRING query;
- /** output: returns the null-terminated rewriten query allocated by my_malloc() */
+ /** output: returns the null-terminated rewritten query allocated by my_malloc() */
MYSQL_LEX_CSTRING *rewritten_query;
};
diff --git a/plugin/win_auth_client/handshake_client.cc b/plugin/win_auth_client/handshake_client.cc
index e3435f19de6..856dda76217 100644
--- a/plugin/win_auth_client/handshake_client.cc
+++ b/plugin/win_auth_client/handshake_client.cc
@@ -216,7 +216,7 @@ int Handshake_client::write_packet(Blob &data)
an empty blob is returned and @c error() gives non-zero error code.
When invoked for the first time (in the first round of the handshake)
- there is no data from the server (data blob is null) and the intial
+ there is no data from the server (data blob is null) and the initial
packet is generated without an input.
@return Data to be sent to the server next or null blob if no more data