rename rpccli_samr_chgpasswd3 to rpccli_samr_chgpasswd_user3.

Guenther
(This used to be commit b1209a039b45985e0b28777e04cba5bcc3de061e)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 30db25b4780cdfd799fbd9e62d9953eb6acaa606..42277277b0d2c2b7184c6599846bde11b25e90e9 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7156,13 +7156,13 @@ NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli,
                                         DATA_BLOB old_nt_hash_enc_blob,
                                         DATA_BLOB new_lm_password_blob,
                                         DATA_BLOB old_lm_hash_enc_blob);
-NTSTATUS rpccli_samr_chgpasswd3(struct rpc_pipe_client *cli,
-                               TALLOC_CTX *mem_ctx,
-                               const char *username,
-                               const char *newpassword,
-                               const char *oldpassword,
-                               struct samr_DomInfo1 **dominfo1,
-                               struct samr_ChangeReject **reject);
+NTSTATUS rpccli_samr_chgpasswd_user3(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *username,
+                                    const char *newpassword,
+                                    const char *oldpassword,
+                                    struct samr_DomInfo1 **dominfo1,
+                                    struct samr_ChangeReject **reject);
 void get_query_dispinfo_params(int loop_count, uint32 *max_entries,
                               uint32 *max_size);
 NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli,

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 3ff2ef9d0715713295db49bd500699419158fc8e..d0c71c5bb1a162afda3a118ddd3cf1a05c854d43 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -127,13 +127,13 @@ NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli,
 
 /* change password 3 */
 
-NTSTATUS rpccli_samr_chgpasswd3(struct rpc_pipe_client *cli,
-                               TALLOC_CTX *mem_ctx,
-                               const char *username,
-                               const char *newpassword,
-                               const char *oldpassword,
-                               struct samr_DomInfo1 **dominfo1,
-                               struct samr_ChangeReject **reject)
+NTSTATUS rpccli_samr_chgpasswd_user3(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *username,
+                                    const char *newpassword,
+                                    const char *oldpassword,
+                                    struct samr_DomInfo1 **dominfo1,
+                                    struct samr_ChangeReject **reject)
 {
        NTSTATUS status;
 
@@ -149,7 +149,7 @@ NTSTATUS rpccli_samr_chgpasswd3(struct rpc_pipe_client *cli,
 
        struct lsa_String server, account;
 
-       DEBUG(10,("rpccli_samr_chgpasswd3\n"));
+       DEBUG(10,("rpccli_samr_chgpasswd_user3\n"));
 
        init_lsa_String(&server, cli->srv_name_slash);
        init_lsa_String(&account, username);

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 711ca80dcc531daec0617e735acca2225ff0e974..a3e8e9bb6b09e578c75b9b48caef71eff279a811 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -2522,12 +2522,12 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
                goto done;
 
        /* Change user password */
-       result = rpccli_samr_chgpasswd3(cli, mem_ctx,
-                                       user,
-                                       newpass,
-                                       oldpass,
-                                       &info,
-                                       &reject);
+       result = rpccli_samr_chgpasswd_user3(cli, mem_ctx,
+                                            user,
+                                            newpass,
+                                            oldpass,
+                                            &info,
+                                            &reject);
 
        if (NT_STATUS_EQUAL(result, NT_STATUS_PASSWORD_RESTRICTION)) {
 

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 40bd8694331390b86d5b177d0cf9ba45aaf5e201..f7001f7716e78adf06fbbf684aedd61caaf8d16b 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2066,12 +2066,12 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact
                goto done;
        }
 
-       result = rpccli_samr_chgpasswd3(cli, state->mem_ctx,
-                                       user,
-                                       newpass,
-                                       oldpass,
-                                       &info,
-                                       &reject);
+       result = rpccli_samr_chgpasswd_user3(cli, state->mem_ctx,
+                                            user,
+                                            newpass,
+                                            oldpass,
+                                            &info,
+                                            &reject);
 
        /* Windows 2003 returns NT_STATUS_PASSWORD_RESTRICTION */
 
@@ -2098,7 +2098,7 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact
                   (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) ||
                   (NT_STATUS_EQUAL(result, NT_STATUS_NOT_IMPLEMENTED))) {
 
-               DEBUG(10,("Password change with chgpasswd3 failed with: %s, retrying chgpasswd_user2\n",
+               DEBUG(10,("Password change with chgpasswd_user3 failed with: %s, retrying chgpasswd_user2\n",
                        nt_errstr(result)));
                
                result = rpccli_samr_chgpasswd_user2(cli, state->mem_ctx, user, newpass, oldpass);