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

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_parse

Files:

• parse_net.c (modified) (1 diff)
• parse_samr.c (modified) (3 diffs)
• parse_spoolss.c (modified) (1 diff)

branches/samba-3.0/source/rpc_parse/parse_net.c

@@ -1431 +1431 @@
                          uint32 user_flgs, uint32 acct_flags,
                          uchar user_session_key[16],
-                         uchar lm_session_key[16],
+                         uchar lm_session_key[8],
                          const char *logon_srv, const char *logon_dom,
                          const DOM_SID *dom_sid)

branches/samba-3.0/source/rpc_parse/parse_samr.c

@@ -2174 +2174 @@
 
 /*******************************************************************
+inits a SAMR_Q_GET_DISPENUM_INDEX structure.
+********************************************************************/
+
+void init_samr_q_get_dispenum_index(SAMR_Q_GET_DISPENUM_INDEX * q_e, POLICY_HND *pol,
+                                    uint16 switch_level, const char *name)
+{
+        DEBUG(5, ("init_samr_q_get_dispenum_index\n"));
+
+        q_e->domain_pol = *pol;
+
+        q_e->switch_level = switch_level;
+
+        init_lsa_string(&q_e->name, name);
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_q_get_dispenum_index(const char *desc, SAMR_Q_GET_DISPENUM_INDEX * q_e,
+                                  prs_struct *ps, int depth)
+{
+        if (q_e == NULL)
+                return False;
+
+        prs_debug(ps, depth, desc, "samr_io_q_get_dispenum_index");
+        depth++;
+
+        if(!prs_align(ps))
+                return False;
+
+        if(!smb_io_pol_hnd("domain_pol", &q_e->domain_pol, ps, depth))
+                return False;
+
+        if(!prs_uint16("switch_level", ps, depth, &q_e->switch_level))
+                return False;
+
+        if (!smb_io_lsa_string("name", &q_e->name, ps, depth))
+                return False;
+
+        return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL samr_io_r_get_dispenum_index(const char *desc, SAMR_R_GET_DISPENUM_INDEX * r_u,
+                                  prs_struct *ps, int depth)
+{
+        if (r_u == NULL)
+                return False;
+
+        prs_debug(ps, depth, desc, "samr_io_r_get_dispenum_index");
+        depth++;
+
+        if(!prs_align(ps))
+                return False;
+
+        if(!prs_uint32("idx", ps, depth, &r_u->idx))
+                return False;
+        
+        if(!prs_ntstatus("status", ps, depth, &r_u->status))
+                return False;
+
+        return True;
+}
+
+
+/*******************************************************************
 inits a SAMR_Q_OPEN_GROUP structure.
 ********************************************************************/
@@ -2186 +2256 @@
         q_c->access_mask = access_mask;
         q_c->rid_group = rid;
+}
+
+/*******************************************************************
+inits a SAMR_R_GET_DISPENUM_INDEX structure.
+********************************************************************/
+
+void init_samr_r_get_dispenum_index(SAMR_R_GET_DISPENUM_INDEX * q_e, uint32 idx)
+{
+        DEBUG(5, ("init_samr_r_get_dispenum_index\n"));
+
+        q_e->idx = idx;
 }
 
@@ -5604 +5685 @@
 
 /*************************************************************************
- init_sam_user_infoa
+ init_sam_user_info24
  *************************************************************************/
 

branches/samba-3.0/source/rpc_parse/parse_spoolss.c

@@ -2131 +2131 @@
                 
                 buffer->string_at_end -= ((*devmode)->size + (*devmode)->driverextra);
-                
+
+                /* mz:  we have to align the device mode for VISTA */
+                if (buffer->string_at_end % 4) {
+                        buffer->string_at_end += 4 - (buffer->string_at_end % 4);
+                }
+
                 if(!prs_set_offset(ps, buffer->string_at_end))
                         return False;