s4:rpc_server/samr: Log correct authentication description for samr_ChangePasswordUser2()

We would unconditionally log "samr_ChangePasswordUser3", which was
misleading.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index b581be6361cf3da951a745a0c7e4314be329b62b..9b7e6e21e5148278075f1ddd5f3794aa0ffd0ded 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -301,12 +301,10 @@ done:
 #endif /* HAVE_GNUTLS_PBKDF2 */
 }
 
-/*
-  samr_ChangePasswordUser3
-*/
-NTSTATUS dcesrv_samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
-                                        TALLOC_CTX *mem_ctx,
-                                        struct samr_ChangePasswordUser3 *r)
+static NTSTATUS dcesrv_samr_ChangePasswordUser_impl(struct dcesrv_call_state *dce_call,
+                                                   TALLOC_CTX *mem_ctx,
+                                                   struct samr_ChangePasswordUser3 *r,
+                                                   const char *function_name)
 {
        struct imessaging_context *imsg_ctx =
                dcesrv_imessaging_context(dce_call->conn);
@@ -498,7 +496,7 @@ failed:
                                  lp_ctx,
                                  dce_call->conn->remote_address,
                                  dce_call->conn->local_address,
-                                 "samr_ChangePasswordUser3",
+                                 function_name,
                                  "RC4/DES using NTLM-hash",
                                  r->in.account->string,
                                  user_samAccountName,
@@ -534,6 +532,17 @@ failed:
        return status;
 }
 
+/*
+  samr_ChangePasswordUser3
+*/
+NTSTATUS dcesrv_samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct samr_ChangePasswordUser3 *r)
+{
+       return dcesrv_samr_ChangePasswordUser_impl(dce_call, mem_ctx, r,
+                                                  "samr_ChangePasswordUser3");
+}
+
 /*
   samr_ChangePasswordUser2
 
@@ -558,7 +567,8 @@ NTSTATUS dcesrv_samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call,
        r2.out.dominfo = &dominfo;
        r2.out.reject = &reject;
 
-       return dcesrv_samr_ChangePasswordUser3(dce_call, mem_ctx, &r2);
+       return dcesrv_samr_ChangePasswordUser_impl(dce_call, mem_ctx, &r2,
+                                                  "samr_ChangePasswordUser2");
 }