s3-samr: fix init_samr_user_info2{1,3,5} callers.

Guenther

diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index 6a9e6d16828b6eb1a2d4e10ff52f652a28e292b2..7f48b1fdf9614e011cd83b6bc86aaba84166453a 100644 (file)
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -391,8 +391,8 @@ void init_samr_user_info21(struct samr_UserInfo21 *r,
                           uint16_t logon_count,
                           uint16_t country_code,
                           uint16_t code_page,
-                          uint8_t nt_password_set,
                           uint8_t lm_password_set,
+                          uint8_t nt_password_set,
                           uint8_t password_expired)
 {
        r->last_logon = last_logon;
@@ -420,8 +420,8 @@ void init_samr_user_info21(struct samr_UserInfo21 *r,
        r->logon_count = logon_count;
        r->country_code = country_code;
        r->code_page = code_page;
-       r->nt_password_set = nt_password_set;
        r->lm_password_set = lm_password_set;
+       r->nt_password_set = nt_password_set;
        r->password_expired = password_expired;
 }
 
@@ -455,8 +455,8 @@ void init_samr_user_info23(struct samr_UserInfo23 *r,
                           uint16_t logon_count,
                           uint16_t country_code,
                           uint16_t code_page,
-                          uint8_t nt_password_set,
                           uint8_t lm_password_set,
+                          uint8_t nt_password_set,
                           uint8_t password_expired,
                           struct samr_CryptPassword *pwd_buf)
 {
@@ -487,8 +487,8 @@ void init_samr_user_info23(struct samr_UserInfo23 *r,
                              logon_count,
                              country_code,
                              code_page,
-                             nt_password_set,
                              lm_password_set,
+                             nt_password_set,
                              password_expired);
 
        r->password = *pwd_buf;
@@ -538,8 +538,8 @@ void init_samr_user_info25(struct samr_UserInfo25 *r,
                           uint16_t logon_count,
                           uint16_t country_code,
                           uint16_t code_page,
-                          uint8_t nt_password_set,
                           uint8_t lm_password_set,
+                          uint8_t nt_password_set,
                           uint8_t password_expired,
                           struct samr_CryptPasswordEx *pwd_buf)
 {
@@ -572,8 +572,8 @@ void init_samr_user_info25(struct samr_UserInfo25 *r,
                              logon_count,
                              country_code,
                              code_page,
-                             nt_password_set,
                              lm_password_set,
+                             nt_password_set,
                              password_expired);
 
        r->password = *pwd_buf;

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index cbcd4de60c37efcf279ecaf0daca4c9aa70d6441..f5e477f668ef94c46a1a99b2c17d249589f778c3 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2607,8 +2607,8 @@ static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
                              pdb_get_logon_count(pw),
                              0, /* country_code */
                              0, /* code_page */
-                             0, /* nt_password_set */
                              0, /* lm_password_set */
+                             0, /* nt_password_set */
                              password_expired);
 
        return NT_STATUS_OK;