auth_user => authenticate_user

"auth" is an overloaded term that some use to say
"authentication" and some to say "authorization". We distinguish
between authn and authz in RabbitMQ for that reason.

So lets be more specific in user-facing bits.

4 files changed, 13 insertions, 9 deletions

diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index be132b0bcc..e4e19c3906 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -722,20 +722,24 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis><command>auth_user</command> <arg choice="req"><replaceable>username</replaceable></arg> <arg choice="req"><replaceable>password</replaceable></arg></cmdsynopsis></term>
+          <term>
+          <cmdsynopsis>
+            <command>authenticate_user</command> <arg choice="req"><replaceable>username</replaceable></arg> <arg choice="req"><replaceable>password</replaceable></arg>
+          </cmdsynopsis>
+          </term>
           <listitem>
             <variablelist>
               <varlistentry>
                 <term>username</term>
-                <listitem><para>The name of the user to log in to the broker.</para></listitem>
+                <listitem><para>The name of the user.</para></listitem>
               </varlistentry>
               <varlistentry>
                 <term>password</term>
-                <listitem><para>The password of the user to log in to the broker.</para></listitem>
+                <listitem><para>The password of the user.</para></listitem>
               </varlistentry>
             </variablelist>
             <para role="example-prefix">For example:</para>
-            <screen role="example">rabbitmqctl auth_user tonyg verifyit</screen>
+            <screen role="example">rabbitmqctl verify_password tonyg verifyit</screen>
             <para role="example">
               This command instructs the RabbitMQ broker to authenticate the
               user named <command>tonyg</command> with password
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 66e6e92d37..1d98e5a354 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -52,7 +52,7 @@
          delete_user,
          change_password,
          clear_password,
-         auth_user,
+         authenticate_user,
          set_user_tags,
          list_users,
 
@@ -380,7 +380,7 @@ action(clear_password, Node, Args = [Username], _Opts, Inform) ->
     Inform("Clearing password for user \"~s\"", [Username]),
     call(Node, {rabbit_auth_backend_internal, clear_password, Args});
 
-action(auth_user, Node, Args = [Username, _Password], _Opts, Inform) ->
+action(authenticate_user, Node, Args = [Username, _Password], _Opts, Inform) ->
     Inform("Authenticating user \"~s\"", [Username]),
     call(Node, {rabbit_access_control, check_user_pass_login, Args});
 
diff --git a/src/rabbit_ctl_misc.erl b/src/rabbit_ctl_misc.erl
index 119b33555f..92ae111028 100644
--- a/src/rabbit_ctl_misc.erl
+++ b/src/rabbit_ctl_misc.erl
@@ -28,4 +28,4 @@
 
 %%----------------------------------------------------------------------------
 
-print_cmd_result(auth_user, _Result) -> io:format("success~n").
+print_cmd_result(authenticate_user, _Result) -> io:format("Success~n").
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl
index a96a9d8f39..d4072c62c4 100644
--- a/test/src/rabbit_tests.erl
+++ b/test/src/rabbit_tests.erl
@@ -1016,9 +1016,9 @@ test_user_management() ->
     TestTags([]),
 
     %% user authentication
-    ok = control_action(auth_user, ["foo", "baz"]),
+    ok = control_action(authenticate_user, ["foo", "baz"]),
     {refused, _User, _Format, _Params} =
-        control_action(auth_user, ["foo", "bar"]),
+        control_action(authenticate_user, ["foo", "bar"]),
 
     %% vhost creation
     ok = control_action(add_vhost, ["/testhost"]),