Changeset 134 for branches/samba-3.0/source/rpc_server

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/rpc_server

Files:

• srv_netlog_nt.c (modified) (2 diffs)
• srv_samr.c (modified) (2 diffs)
• srv_samr_nt.c (modified) (8 diffs)
• srv_spoolss_nt.c (modified) (2 diffs)

branches/samba-3.0/source/rpc_server/srv_netlog_nt.c

@@ -974 +974 @@
                 fstring group_sid_string;
                 unsigned char user_session_key[16];
-                unsigned char lm_session_key[16];
+                unsigned char lm_session_key[8];
                 unsigned char pipe_session_key[16];
 
@@ -1055 +1055 @@
                                 memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
                         }
-                        SamOEMhash(lm_session_key, pipe_session_key, 16);
+                        SamOEMhash(lm_session_key, pipe_session_key, 8);
                         memset(pipe_session_key, '\0', 16);
                 }

branches/samba-3.0/source/rpc_server/srv_samr.c

@@ -1495 +1495 @@
         return True;
 }
+
+/*******************************************************************
+ api_samr_get_dispenum_index
+ ********************************************************************/
+
+static BOOL api_samr_get_dispenum_index(pipes_struct *p)
+{
+        SAMR_Q_GET_DISPENUM_INDEX q_u;
+        SAMR_R_GET_DISPENUM_INDEX r_u;
+        prs_struct *data = &p->in_data.data;
+        prs_struct *rdata = &p->out_data.rdata;
+
+        ZERO_STRUCT(q_u);
+        ZERO_STRUCT(r_u);
+
+        if(!samr_io_q_get_dispenum_index("", &q_u, data, 0)) {
+                DEBUG(0,("api_samr_get_dispenum_index: unable to unmarshall SAMR_Q_GET_DISPENUM_INDEX.\n"));
+                return False;
+        }
+
+        r_u.status = _samr_get_dispenum_index(p, &q_u, &r_u);
+
+        /* store the response in the SMB stream */
+        if(!samr_io_r_get_dispenum_index("", &r_u, rdata, 0)) {
+                DEBUG(0,("api_samr_get_dispenum_index: unable to marshall SAMR_R_GET_DISPENUM_INDEX.\n"));
+                return False;
+        }
+
+        return True;
+}
+
 
 /*******************************************************************
@@ -1556 +1587 @@
       {"SAMR_CONNECT4"          , SAMR_CONNECT4         , api_samr_connect4         },
       {"SAMR_CHGPASSWD_USER3"   , SAMR_CHGPASSWD_USER3  , api_samr_chgpasswd_user3  },
-      {"SAMR_CONNECT5"          , SAMR_CONNECT5         , api_samr_connect5         }
+      {"SAMR_CONNECT5"          , SAMR_CONNECT5         , api_samr_connect5         },
+      {"SAMR_GET_DISPENUM_INDEX", SAMR_GET_DISPENUM_INDEX, api_samr_get_dispenum_index },
+      {"SAMR_GET_DISPENUM_INDEX2",SAMR_GET_DISPENUM_INDEX2, api_samr_get_dispenum_index }
 };
 

branches/samba-3.0/source/rpc_server/srv_samr_nt.c

@@ -1339 +1339 @@
                 return disp_ret;
 
-        /* calculate the total size */
-        total_data_size=num_account*struct_size;
+        temp_size = num_account * struct_size;
 
         if (num_account) {
                 r_u->status = STATUS_MORE_ENTRIES;
         } else {
+                r_u->status = NT_STATUS_OK;
+        }
+
+        if (num_account < max_entries) {
                 r_u->status = NT_STATUS_OK;
         }
@@ -3368 +3371 @@
  ********************************************************************/
 
-static BOOL set_user_info_pw(uint8 *pass, struct samu *pwd)
+static BOOL set_user_info_pw(uint8 *pass, struct samu *pwd,
+                            int level)
 {
         uint32 len;
@@ -3426 +3430 @@
         ZERO_STRUCT(plaintext_buf);
 
-        /* restore last set time as this is an admin change, not a user pw change */
-        pdb_set_pass_last_set_time (pwd, last_set_time, last_set_state);
+        /*
+         * A level 25 change does reset the pwdlastset field, a level 24
+         * change does not. I know this is probably not the full story, but
+         * it is needed to make XP join LDAP correctly, without it the later
+         * auth2 check can fail with PWD_MUST_CHANGE.
+         */
+        if (level != 25) {
+                /*
+                 * restore last set time as this is an admin change, not a
+                 * user pw change
+                 */
+                pdb_set_pass_last_set_time (pwd, last_set_time,
+                                            last_set_state);
+        }
  
         DEBUG(5,("set_user_info_pw: pdb_update_pwd()\n"));
@@ -3592 +3608 @@
                         dump_data(100, (char *)ctr->info.id24->pass, 516);
 
-                        if (!set_user_info_pw(ctr->info.id24->pass, pwd))
+                        if (!set_user_info_pw(ctr->info.id24->pass, pwd, 
+                                              switch_value))
                                 r_u->status = NT_STATUS_ACCESS_DENIED;
                         break;
@@ -3609 +3626 @@
                                 goto done;
                         }
-                        if (!set_user_info_pw(ctr->info.id25->pass, pwd))
+                        if (!set_user_info_pw(ctr->info.id25->pass, pwd,
+                                              switch_value))
                                 r_u->status = NT_STATUS_ACCESS_DENIED;
                         break;
@@ -3621 +3639 @@
                         dump_data(100, (char *)ctr->info.id26->pass, 516);
 
-                        if (!set_user_info_pw(ctr->info.id26->pass, pwd))
+                        if (!set_user_info_pw(ctr->info.id26->pass, pwd,
+                                              switch_value))
                                 r_u->status = NT_STATUS_ACCESS_DENIED;
                         break;
@@ -3778 +3797 @@
                         dump_data(100, (char *)ctr->info.id26->pass, 516);
 
-                        if (!set_user_info_pw(ctr->info.id26->pass, pwd))
+                        if (!set_user_info_pw(ctr->info.id26->pass, pwd,
+                                              switch_value))
                                 r_u->status = NT_STATUS_ACCESS_DENIED;
                         break;
@@ -5062 +5082 @@
         return r_u->status;
 }
+
+/*******************************************************************
+ _samr_get_dispenum_index
+ ********************************************************************/
+
+NTSTATUS _samr_get_dispenum_index(pipes_struct *p, SAMR_Q_GET_DISPENUM_INDEX *q_u, SAMR_R_GET_DISPENUM_INDEX *r_u)
+{
+        struct samr_info *info = NULL;
+        uint32 max_entries = (uint32) -1;
+        uint32 enum_context = 0;
+        int i;
+        uint32 num_account = 0;
+        struct samr_displayentry *entries = NULL;
+        fstring account_name;
+
+        DEBUG(5, ("_samr_get_dispenum_index: %d\n", __LINE__));
+
+        r_u->status = NT_STATUS_UNSUCCESSFUL;
+
+        /* find the policy handle.  open a policy on it. */
+        if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)(void *)&info))
+                return NT_STATUS_INVALID_HANDLE;
+
+        if ((q_u->switch_level < 1) || (q_u->switch_level > 3)) {
+                DEBUG(0,("_samr_get_dispenum_index: Unknown info level (%u)\n",
+                         (unsigned int)q_u->switch_level ));
+                return NT_STATUS_INVALID_INFO_CLASS;
+        }
+
+        if (!rpcstr_pull_unistr2_fstring(account_name, &q_u->name.unistring)) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        become_root();
+
+        /* The following done as ROOT. Don't return without unbecome_root(). */
+
+        switch (q_u->switch_level) {
+        case 0x1:
+                if (info->disp_info->users == NULL) {
+                        info->disp_info->users = pdb_search_users(ACB_NORMAL);
+                        if (info->disp_info->users == NULL) {
+                                unbecome_root();
+                                return NT_STATUS_ACCESS_DENIED;
+                        }
+                        DEBUG(10,("_samr_get_dispenum_index: starting user enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                } else {
+                        DEBUG(10,("_samr_get_dispenum_index: using cached user enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                }
+
+                num_account = pdb_search_entries(info->disp_info->users,
+                                                 enum_context, max_entries,
+                                                 &entries);
+                break;
+        case 0x2:
+                if (info->disp_info->machines == NULL) {
+                        info->disp_info->machines =
+                                pdb_search_users(ACB_WSTRUST|ACB_SVRTRUST);
+                        if (info->disp_info->machines == NULL) {
+                                unbecome_root();
+                                return NT_STATUS_ACCESS_DENIED;
+                        }
+                        DEBUG(10,("_samr_get_dispenum_index: starting machine enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                } else {
+                        DEBUG(10,("_samr_get_dispenum_index: using cached machine enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                }
+
+                num_account = pdb_search_entries(info->disp_info->machines,
+                                                 enum_context, max_entries,
+                                                 &entries);
+                break;
+        case 0x3:
+                if (info->disp_info->groups == NULL) {
+                        info->disp_info->groups = pdb_search_groups();
+                        if (info->disp_info->groups == NULL) {
+                                unbecome_root();
+                                return NT_STATUS_ACCESS_DENIED;
+                        }
+                        DEBUG(10,("_samr_get_dispenum_index: starting group enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                } else {
+                        DEBUG(10,("_samr_get_dispenum_index: using cached group enumeration at index %u\n",
+                                (unsigned  int)enum_context ));
+                }
+
+                num_account = pdb_search_entries(info->disp_info->groups,
+                                                 enum_context, max_entries,
+                                                 &entries);
+                break;
+        default:
+                unbecome_root();
+                smb_panic("info class changed");
+                break;
+        }
+        unbecome_root();
+
+        /* Ensure we cache this enumeration. */
+        set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
+
+        DEBUG(10,("_samr_get_dispenum_index: looking for :%s\n", account_name));
+
+        for (i=0; i<num_account; i++) {
+                if (strequal(entries[i].account_name, account_name)) {
+                        DEBUG(10,("_samr_get_dispenum_index: found %s at idx %d\n",
+                                account_name, i));
+
+                        init_samr_r_get_dispenum_index(r_u, i);
+
+                        return NT_STATUS_OK;
+                }
+        }
+
+        /* assuming account_name lives at the very end */
+        init_samr_r_get_dispenum_index(r_u, num_account);
+
+        return NT_STATUS_OK;
+}

branches/samba-3.0/source/rpc_server/srv_spoolss_nt.c

@@ -511 +511 @@
 
                 printer = NULL;
-                result = get_a_printer( NULL, &printer, 2, sname );
+
+                /* This call doesn't fill in the location or comment from
+                 * a CUPS server for efficiency with large numbers of printers.
+                 * JRA.
+                 */
+                result = get_a_printer_search( NULL, &printer, 2, sname );
                 if ( !W_ERROR_IS_OK(result) ) {
                         DEBUG(0,("set_printer_hnd_name: failed to lookup printer [%s] -- result [%s]\n",
@@ -9472 +9477 @@
                 
         /* copy data into the reply */
-        
-        r_u->ctr.size           = r_u->needed;
+
+        /* mz: Vista x64 returns 0x6f7 (The stub received bad data), if the
+           response buffer size is != the offered buffer size
+
+                r_u->ctr.size           = r_u->needed;
+        */
+        r_u->ctr.size           = in_size;
 
         r_u->ctr.size_of_array  = r_u->returned;