rename rpccli_samr_chgpasswd_user to rpccli_samr_chgpasswd_user2.

Guenther
(This used to be commit 5b4650d56c04be0c498413f17afb2cf6d0e7d548)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1aca7f436d545bc8f9bb26db5ecb9abf2dc713db..30db25b4780cdfd799fbd9e62d9953eb6acaa606 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7144,11 +7144,11 @@ uint32 reg_init_regval_buffer( REGVAL_BUFFER *buf2, REGISTRY_VALUE *val );
 
 /* The following definitions come from rpc_client/cli_samr.c  */
 
-NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx,
-                                   const char *username,
-                                   const char *newpassword,
-                                   const char *oldpassword);
+NTSTATUS rpccli_samr_chgpasswd_user2(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *username,
+                                    const char *newpassword,
+                                    const char *oldpassword);
 NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli,
                                         TALLOC_CTX *mem_ctx,
                                         const char *username,

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 8f7cbf265e96fd89578f26d5f8366a2df0c03ce3..3b82e5767f02a3d582ccbe71efd3450a47fa8981 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -177,8 +177,8 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
                }
        }
 
-       result = rpccli_samr_chgpasswd_user(pipe_hnd, talloc_tos(),
-                                           user_name, new_passwd, old_passwd);
+       result = rpccli_samr_chgpasswd_user2(pipe_hnd, talloc_tos(),
+                                            user_name, new_passwd, old_passwd);
        if (NT_STATUS_IS_OK(result)) {
                /* Great - it all worked! */
                cli_shutdown(cli);
@@ -207,7 +207,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
        pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &result);
 
        if ( pipe_hnd &&
-               (NT_STATUS_IS_OK(result = rpccli_samr_chgpasswd_user(
+               (NT_STATUS_IS_OK(result = rpccli_samr_chgpasswd_user2(
                                         pipe_hnd, talloc_tos(), user_name,
                                         new_passwd, old_passwd)))) {
                /* Great - it all worked! */

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 21fecc41963721490d5bd4f22767b51f78948543..3ff2ef9d0715713295db49bd500699419158fc8e 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -25,11 +25,11 @@
 
 /* User change password */
 
-NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx,
-                                   const char *username,
-                                   const char *newpassword,
-                                   const char *oldpassword)
+NTSTATUS rpccli_samr_chgpasswd_user2(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *username,
+                                    const char *newpassword,
+                                    const char *oldpassword)
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct samr_CryptPassword new_nt_password;
@@ -43,7 +43,7 @@ NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli,
        uchar new_lanman_hash[16];
        struct lsa_String server, account;
 
-       DEBUG(10,("rpccli_samr_chgpasswd_user\n"));
+       DEBUG(10,("rpccli_samr_chgpasswd_user2\n"));
 
        init_lsa_String(&server, cli->srv_name_slash);
        init_lsa_String(&account, username);
@@ -149,7 +149,7 @@ NTSTATUS rpccli_samr_chgpasswd3(struct rpc_pipe_client *cli,
 
        struct lsa_String server, account;
 
-       DEBUG(10,("rpccli_samr_chgpasswd_user3\n"));
+       DEBUG(10,("rpccli_samr_chgpasswd3\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 cc92fef7e5636bf3a8312e44c833af9f2ad38fd1..711ca80dcc531daec0617e735acca2225ff0e974 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -2463,7 +2463,7 @@ static NTSTATUS cmd_samr_chgpasswd2(struct rpc_pipe_client *cli,
                goto done;
 
        /* Change user password */
-       result = rpccli_samr_chgpasswd_user(cli, mem_ctx, user, newpass, oldpass);
+       result = rpccli_samr_chgpasswd_user2(cli, mem_ctx, user, newpass, oldpass);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index f548a04d3540f6c760e440ac32c25a53e16d6634..40bd8694331390b86d5b177d0cf9ba45aaf5e201 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2093,15 +2093,15 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact
                got_info = True;
        }
 
-       /* only fallback when the chgpasswd3 call is not supported */
+       /* only fallback when the chgpasswd_user3 call is not supported */
        if ((NT_STATUS_EQUAL(result, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR))) ||
                   (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_user\n", 
+               DEBUG(10,("Password change with chgpasswd3 failed with: %s, retrying chgpasswd_user2\n",
                        nt_errstr(result)));
                
-               result = rpccli_samr_chgpasswd_user(cli, state->mem_ctx, user, newpass, oldpass);
+               result = rpccli_samr_chgpasswd_user2(cli, state->mem_ctx, user, newpass, oldpass);
 
                /* Windows 2000 returns NT_STATUS_ACCOUNT_RESTRICTION.
                   Map to the same status code as Windows 2003. */