s4-samr: fix samr callers after SAMR_FIELD_PASSWORD change.

Guenther

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 80de6134b58c64dccef29940fa5010da21491024..c2db219a06f55a63d465ec92a6c740dc4f927563 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -360,7 +360,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_25(struct libnet_context *ctx, TA
        /* prepare samr_SetUserInfo2 level 25 */
        ZERO_STRUCT(u_info);
        u_info.info25.info = *r->samr_handle.in.info21;
-       u_info.info25.info.fields_present |= SAMR_FIELD_PASSWORD;
+       u_info.info25.info.fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT;
        encode_pw_buffer(u_info.info25.password.data, r->samr_handle.in.newpassword, STR_UNICODE);
 
        status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key);
@@ -451,7 +451,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_23(struct libnet_context *ctx, TA
        /* prepare samr_SetUserInfo2 level 23 */
        ZERO_STRUCT(u_info);
        u_info.info23.info = *r->samr_handle.in.info21;
-       u_info.info23.info.fields_present |= SAMR_FIELD_PASSWORD;
+       u_info.info23.info.fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT;
        encode_pw_buffer(u_info.info23.password.data, r->samr_handle.in.newpassword, STR_UNICODE);
 
        status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key);

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index b68fe1a6d9f45be241955508cf9114942d11aac4..680fb7765968921d853559a8ca1fceb6e52a2c10 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -3511,14 +3511,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                        SET_UINT  (msg, info23.info.country_code, "countryCode");
                IFSET(SAMR_FIELD_CODE_PAGE)    
                        SET_UINT  (msg, info23.info.code_page,    "codePage");
-               IFSET(SAMR_FIELD_PASSWORD) {
+               IFSET(SAMR_FIELD_NT_PASSWORD_PRESENT) {
                        status = samr_set_password(dce_call,
                                                   a_state->sam_ctx,
                                                   a_state->account_dn,
                                                   a_state->domain_state->domain_dn,
                                                   mem_ctx, msg, 
                                                   &r->in.info->info23.password);
-               } else IFSET(SAMR_FIELD_PASSWORD2) {
+               } else IFSET(SAMR_FIELD_LM_PASSWORD_PRESENT) {
                        status = samr_set_password(dce_call,
                                                   a_state->sam_ctx,
                                                   a_state->account_dn,
@@ -3567,14 +3567,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
                        SET_UINT  (msg, info25.info.country_code, "countryCode");
                IFSET(SAMR_FIELD_CODE_PAGE)    
                        SET_UINT  (msg, info25.info.code_page,    "codePage");
-               IFSET(SAMR_FIELD_PASSWORD) {
+               IFSET(SAMR_FIELD_NT_PASSWORD_PRESENT) {
                        status = samr_set_password_ex(dce_call,
                                                      a_state->sam_ctx,
                                                      a_state->account_dn,
                                                      a_state->domain_state->domain_dn,
                                                      mem_ctx, msg, 
                                                      &r->in.info->info25.password);
-               } else IFSET(SAMR_FIELD_PASSWORD2) {
+               } else IFSET(SAMR_FIELD_LM_PASSWORD_PRESENT) {
                        status = samr_set_password_ex(dce_call,
                                                      a_state->sam_ctx,
                                                      a_state->account_dn,

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index f1e7e5a367013ffe6ced2c95c1dbf32172733a91..2207786f1799ca9dca18abac96a66a2fdadd74f5 100644 (file)
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -580,8 +580,8 @@ static bool create_user(TALLOC_CTX *mem_ctx, struct smbcli_state *cli,
                arcfour_crypt_blob(u_info.info23.password.data, 516,
                                   &session_key);
                u_info.info23.info.password_expired = 0;
-               u_info.info23.info.fields_present = SAMR_FIELD_PASSWORD | 
-                                                   SAMR_FIELD_PASSWORD2 |
+               u_info.info23.info.fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+                                                   SAMR_FIELD_LM_PASSWORD_PRESENT |
                                                    SAMR_FIELD_EXPIRED_FLAG;
                sui2.in.user_handle = wks_handle;
                sui2.in.info = &u_info;
@@ -767,7 +767,7 @@ static bool join3(struct smbcli_state *cli,
                        cli_credentials_get_workstation(wks_creds));
                i21->acct_flags = ACB_WSTRUST;
                i21->fields_present = SAMR_FIELD_FULL_NAME |
-                       SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_PASSWORD;
+                       SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_NT_PASSWORD_PRESENT;
                /* this would break the test result expectations
                i21->fields_present |= SAMR_FIELD_EXPIRED_FLAG;
                i21->password_expired = 1;

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 01ff01674c4159e5504a636613bd49a72df868e4..cc3c4156babc01a021e9d39f0612c023706ee21c 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2074,7 +2074,7 @@ bool test_ChangePasswordRandomBytes(struct dcerpc_pipe *p, struct torture_contex
 
        ZERO_STRUCT(u);
 
-       u.info25.info.fields_present = SAMR_FIELD_PASSWORD;
+       u.info25.info.fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT;
 
        set_pw_in_buffer(u.info25.password.data, &new_random_pass);
 
@@ -2669,9 +2669,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
                         * password has been changed, old and new pwdlastset
                         * need to be the same value */
 
-                       if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) &&
-                           !((pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD) ||
-                             (pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD2)))
+                       if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
+                           !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
+                             (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
                        {
                                torture_assert_int_equal(tctx, pwdlastset_old,
                                        pwdlastset_new, "pwdlastset must be equal");
@@ -2732,9 +2732,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
                         * password has been changed, old and new pwdlastset
                         * need to be the same value */
 
-                       if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) &&
-                           !((pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD) ||
-                             (pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD2)))
+                       if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
+                           !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
+                             (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
                        {
                                torture_assert_int_equal(tctx, pwdlastset_old,
                                        pwdlastset_new, "pwdlastset must be equal");
@@ -2787,9 +2787,9 @@ static bool test_user_ops(struct dcerpc_pipe *p,
        int i;
        uint32_t rid;
        const uint32_t password_fields[] = {
-               SAMR_FIELD_PASSWORD,
-               SAMR_FIELD_PASSWORD2,
-               SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2,
+               SAMR_FIELD_NT_PASSWORD_PRESENT,
+               SAMR_FIELD_LM_PASSWORD_PRESENT,
+               SAMR_FIELD_NT_PASSWORD_PRESENT | SAMR_FIELD_LM_PASSWORD_PRESENT,
                0
        };