summaryrefslogtreecommitdiff
path: root/plugin/auth
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-27 18:12:17 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-27 18:12:17 +0300
commitc3f923857a1cfcec4f1d037b20427931f8fe9a51 (patch)
treeda83416098275366755d4a84c9b2d11c020d739f /plugin/auth
parenta213162c0d15dfecaa6ed8eb71eb5095ad6be1c3 (diff)
downloadmariadb-git-c3f923857a1cfcec4f1d037b20427931f8fe9a51.tar.gz
Bug #57774: Typos/ambiguities in the WL1054 comments
Fixed few typos and added better wording as suggested.
Diffstat (limited to 'plugin/auth')
-rw-r--r--plugin/auth/dialog.c6
-rw-r--r--plugin/auth/test_plugin.c28
2 files changed, 12 insertions, 22 deletions
diff --git a/plugin/auth/dialog.c b/plugin/auth/dialog.c
index 54f88dd9b4e..41312f95674 100644
--- a/plugin/auth/dialog.c
+++ b/plugin/auth/dialog.c
@@ -52,7 +52,7 @@
/**
first byte of the question string is the question "type".
- It can be a "ordinary" or a "password" question.
+ It can be an "ordinary" or a "password" question.
The last bit set marks a last question in the authentication exchange.
*/
#define ORDINARY_QUESTION "\2"
@@ -176,7 +176,7 @@ mysql_declare_plugin_end;
This plugin performs a dialog with the user, asking questions and
reading answers. Depending on the client it may be desirable to do it
using GUI, or console, with or without curses, or read answers
- from a smardcard, for example.
+ from a smartcard, for example.
To support all this variety, the dialog plugin has a callback function
"authentication_dialog_ask". If the client has a function of this name
@@ -256,7 +256,7 @@ static int perform_dialog(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
in mysql_change_user() the client sends the first packet, so
the first vio->read_packet() does nothing (pkt == 0).
- We send the "password", assuming the client knows what its doing.
+ We send the "password", assuming the client knows what it's doing.
(in other words, the dialog plugin should be only set as a default
authentication plugin on the client if the first question
asks for a password - which will be sent in clear text, by the way)
diff --git a/plugin/auth/test_plugin.c b/plugin/auth/test_plugin.c
index caea7795833..161062d5b6c 100644
--- a/plugin/auth/test_plugin.c
+++ b/plugin/auth/test_plugin.c
@@ -17,22 +17,12 @@
/**
@file
- dialog client authentication plugin with examples
-
- dialog is a general purpose client authentication plugin, it simply
- asks the user the question, as provided by the server and reports
- the answer back to the server. No encryption is involved,
- the answers are sent in clear text.
-
- Two examples are provided: two_questions server plugin, that asks
- the password and an "Are you sure?" question with a reply "yes, of course".
- It demonstrates the usage of "password" (input is hidden) and "ordinary"
- (input can be echoed) questions, and how to mark the last question,
- to avoid an extra roundtrip.
-
- And three_attempts plugin that gives the user three attempts to enter
- a correct password. It shows the situation when a number of questions
- is not known in advance.
+ Test driver for the mysql-test/t/plugin_auth.test
+
+ This is a set of test plugins used to test the external authentication
+ implementation.
+ See the above test file for more details.
+ This test plugin is based on the dialog plugin example.
*/
#include <my_global.h>
@@ -55,7 +45,7 @@
/********************* SERVER SIDE ****************************************/
/**
- dialog test plugin mimicing the ordinary auth mechanism. Used to test the auth plugin API
+ dialog test plugin mimicking the ordinary auth mechanism. Used to test the auth plugin API
*/
static int auth_test_plugin(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
{
@@ -150,10 +140,10 @@ static int test_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
in mysql_change_user() the client sends the first packet, so
the first vio->read_packet() does nothing (pkt == 0).
- We send the "password", assuming the client knows what its doing.
+ We send the "password", assuming the client knows what it's doing.
(in other words, the dialog plugin should be only set as a default
authentication plugin on the client if the first question
- asks for a password - which will be sent in cleat text, by the way)
+ asks for a password - which will be sent in clear text, by the way)
*/
reply= mysql->passwd;
}