Changeset 228 for branches/samba-3.2.x/source/rpc_client

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/rpc_client

Files:

• cli_pipe.c (modified) (1 diff)
• init_samr.c (modified) (3 diffs)

branches/samba-3.2.x/source/rpc_client/cli_pipe.c

@@ -2222 +2222 @@
 
         if (fnum == -1) {
-                DEBUG(1,("cli_rpc_pipe_open: cli_nt_create failed on pipe %s "
+                DEBUG(3,("cli_rpc_pipe_open: cli_nt_create failed on pipe %s "
                          "to machine %s.  Error was %s\n",
                          result->pipe_name, cli->desthost,

branches/samba-3.2.x/source/rpc_client/init_samr.c

@@ -411 +411 @@
                            uint8_t lm_password_set,
                            uint8_t password_expired,
-                           uint8_t data[516],
-                           uint8_t pw_len)
+                           struct samr_CryptPassword *pwd_buf)
 {
         memset(r, '\0', sizeof(*r));
@@ -445 +444 @@
                               password_expired);
 
-        memcpy(r->password.data, data, sizeof(r->password.data));
+        r->password = *pwd_buf;
 }
 
@@ -453 +452 @@
 
 void init_samr_user_info24(struct samr_UserInfo24 *r,
-                           uint8_t data[516],
-                           uint8_t pw_len)
+                           struct samr_CryptPassword *pwd_buf,
+                           uint8_t password_expired)
 {
         DEBUG(10, ("init_samr_user_info24:\n"));
 
-        memcpy(r->password.data, data, sizeof(r->password.data));
-        r->pw_len = pw_len;
-}
+        r->password = *pwd_buf;
+        r->password_expired = password_expired;
+}
+
+/*************************************************************************
+ init_samr_user_info25
+ *************************************************************************/
+
+void init_samr_user_info25(struct samr_UserInfo25 *r,
+                           NTTIME last_logon,
+                           NTTIME last_logoff,
+                           NTTIME last_password_change,
+                           NTTIME acct_expiry,
+                           NTTIME allow_password_change,
+                           NTTIME force_password_change,
+                           const char *account_name,
+                           const char *full_name,
+                           const char *home_directory,
+                           const char *home_drive,
+                           const char *logon_script,
+                           const char *profile_path,
+                           const char *description,
+                           const char *workstations,
+                           const char *comment,
+                           struct lsa_BinaryString *parameters,
+                           uint32_t rid,
+                           uint32_t primary_gid,
+                           uint32_t acct_flags,
+                           uint32_t fields_present,
+                           struct samr_LogonHours logon_hours,
+                           uint16_t bad_password_count,
+                           uint16_t logon_count,
+                           uint16_t country_code,
+                           uint16_t code_page,
+                           uint8_t nt_password_set,
+                           uint8_t lm_password_set,
+                           uint8_t password_expired,
+                           struct samr_CryptPasswordEx *pwd_buf)
+{
+        DEBUG(10, ("init_samr_user_info25:\n"));
+
+        memset(r, '\0', sizeof(*r));
+        init_samr_user_info21(&r->info,
+                              last_logon,
+                              last_logoff,
+                              last_password_change,
+                              acct_expiry,
+                              allow_password_change,
+                              force_password_change,
+                              account_name,
+                              full_name,
+                              home_directory,
+                              home_drive,
+                              logon_script,
+                              profile_path,
+                              description,
+                              workstations,
+                              comment,
+                              parameters,
+                              rid,
+                              primary_gid,
+                              acct_flags,
+                              fields_present,
+                              logon_hours,
+                              bad_password_count,
+                              logon_count,
+                              country_code,
+                              code_page,
+                              nt_password_set,
+                              lm_password_set,
+                              password_expired);
+
+        r->password = *pwd_buf;
+}
+
+/*************************************************************************
+ init_samr_user_info26
+ *************************************************************************/
+
+void init_samr_user_info26(struct samr_UserInfo26 *r,
+                           struct samr_CryptPasswordEx *pwd_buf,
+                           uint8_t password_expired)
+{
+        DEBUG(10, ("init_samr_user_info26:\n"));
+
+        r->password = *pwd_buf;
+        r->password_expired = password_expired;
+}
+
+/*************************************************************************
+ inits a samr_CryptPasswordEx structure
+ *************************************************************************/
+
+void init_samr_CryptPasswordEx(const char *pwd,
+                               DATA_BLOB *session_key,
+                               struct samr_CryptPasswordEx *pwd_buf)
+{
+        /* samr_CryptPasswordEx */
+
+        uchar pwbuf[532];
+        struct MD5Context md5_ctx;
+        uint8_t confounder[16];
+        DATA_BLOB confounded_session_key = data_blob(NULL, 16);
+
+        encode_pw_buffer(pwbuf, pwd, STR_UNICODE);
+
+        generate_random_buffer((uint8_t *)confounder, 16);
+
+        MD5Init(&md5_ctx);
+        MD5Update(&md5_ctx, confounder, 16);
+        MD5Update(&md5_ctx, session_key->data,
+                            session_key->length);
+        MD5Final(confounded_session_key.data, &md5_ctx);
+
+        SamOEMhashBlob(pwbuf, 516, &confounded_session_key);
+        memcpy(&pwbuf[516], confounder, 16);
+
+        memcpy(pwd_buf->data, pwbuf, sizeof(pwbuf));
+        data_blob_free(&confounded_session_key);
+}
+
+/*************************************************************************
+ inits a samr_CryptPassword structure
+ *************************************************************************/
+
+void init_samr_CryptPassword(const char *pwd,
+                             DATA_BLOB *session_key,
+                             struct samr_CryptPassword *pwd_buf)
+{
+        /* samr_CryptPassword */
+
+        encode_pw_buffer(pwd_buf->data, pwd, STR_UNICODE);
+        SamOEMhashBlob(pwd_buf->data, 516, session_key);
+}