SAM database "set user info".

[samba.git] / source3 / rpc_parse / parse_misc.c

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 12501a5e57b6e8049d4071453b83e322e122059d..64cbdef7169158b08a882ae6b1542388a0f778fe 100644 (file)
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -118,11 +118,11 @@ void smb_io_enum_hnd(char *desc,  ENUM_HND *hnd, prs_struct *ps, int depth)
 /*******************************************************************
 reads or writes a DOM_SID structure.
 ********************************************************************/
-void smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)
+BOOL smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)
 {
        int i;
 
-       if (sid == NULL) return;
+       if (sid == NULL) return False;
 
        prs_debug(ps, depth, desc, "smb_io_dom_sid");
        depth++;
@@ -143,6 +143,8 @@ void smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)
        if (sid->num_auths > MAXSUBAUTHS) sid->num_auths = MAXSUBAUTHS;
 
        prs_uint32s(False, "sub_auths ", ps, depth, sid->sub_auths, sid->num_auths);
+
+       return True;
 }
 
 /*******************************************************************
@@ -150,7 +152,7 @@ creates a DOM_SID2 structure.
 ********************************************************************/
 void make_dom_sid2(DOM_SID2 *sid2, DOM_SID *sid)
 {
-        sid_copy(&sid2->sid, sid);
+        sid2->sid = *sid;
        sid2->num_auths = sid2->sid.num_auths;
 }
 
@@ -202,14 +204,45 @@ void smb_io_strhdr(char *desc,  STRHDR *hdr, prs_struct *ps, int depth)
        if (hdr->str_str_len > MAX_STRINGLEN) hdr->str_str_len = MAX_STRINGLEN;
 }
 
+/*******************************************************************
+creates a STRHDR2 structure.
+********************************************************************/
+void make_strhdr2(STRHDR2 *hdr, uint32 max_len, uint32 len, uint32 buffer)
+{
+       hdr->str_max_len = max_len;
+       hdr->str_str_len = len;
+       hdr->buffer      = buffer;
+}
+
+/*******************************************************************
+reads or writes a STRHDR2 structure.
+********************************************************************/
+void smb_io_strhdr2(char *desc, STRHDR2 *hdr, prs_struct *ps, int depth)
+{
+       if (hdr == NULL) return;
+
+       prs_debug(ps, depth, desc, "smb_io_strhdr");
+       depth++;
+
+       prs_align(ps);
+       
+       prs_uint32("str_str_len", ps, depth, &(hdr->str_str_len));
+       prs_uint32("str_max_len", ps, depth, &(hdr->str_max_len));
+       prs_uint32("buffer     ", ps, depth, &(hdr->buffer     ));
+
+       /* oops! XXXX maybe issue a warning that this is happening... */
+       if (hdr->str_max_len > MAX_STRINGLEN) hdr->str_max_len = MAX_STRINGLEN;
+       if (hdr->str_str_len > MAX_STRINGLEN) hdr->str_str_len = MAX_STRINGLEN;
+}
+
 /*******************************************************************
 creates a UNIHDR structure.
 ********************************************************************/
-void make_uni_hdr(UNIHDR *hdr, int max_len, int len, uint32 buffer)
+void make_uni_hdr(UNIHDR *hdr, int len)
 {
        hdr->uni_str_len = 2 * len;
-       hdr->uni_max_len = 2 * max_len;
-       hdr->buffer      = buffer;
+       hdr->uni_max_len = 2 * len;
+       hdr->buffer      = len != 0 ? 1 : 0;
 }
 
 /*******************************************************************
@@ -301,9 +334,9 @@ void smb_io_hdrbuf(char *desc,  BUFHDR *hdr, prs_struct *ps, int depth)
 /*******************************************************************
 creates a UNIHDR2 structure.
 ********************************************************************/
-void make_uni_hdr2(UNIHDR2 *hdr, int max_len, int len, uint16 terminate)
+void make_uni_hdr2(UNIHDR2 *hdr, int len)
 {
-       make_uni_hdr(&(hdr->unihdr), max_len, len, terminate);
+       make_uni_hdr(&(hdr->unihdr), len);
        hdr->buffer = len > 0 ? 1 : 0;
 }
 
@@ -425,19 +458,17 @@ void smb_io_buffer3(char *desc,  BUFFER3 *buf3, prs_struct *ps, int depth)
 /*******************************************************************
 creates a BUFFER2 structure.
 ********************************************************************/
-void make_buffer2(BUFFER2 *str, uint8 *buf, int len)
+void make_buffer2(BUFFER2 *str, const char *buf, int len)
 {
        ZERO_STRUCTP(str);
 
-       /* max buffer size (allocated size) */
+       /* set up string lengths. */
        str->buf_max_len = len;
        str->undoc       = 0;
-       str->buf_len = buf != NULL ? len : 0;
+       str->buf_len     = len;
 
-       if (buf != NULL)
-       {
-               memcpy(str->buffer, buf, MIN(str->buf_len, sizeof(str->buffer)));
-       }
+       /* store the string (wide chars) */
+       ascii_to_unistr(str->buffer, buf, len);
 }
 
 /*******************************************************************
@@ -671,16 +702,6 @@ void smb_io_dom_rid3(char *desc,  DOM_RID3 *rid3, prs_struct *ps, int depth)
        prs_uint32("unk     ", ps, depth, &(rid3->unk     ));
 }
 
-/*******************************************************************
-creates a DOM_RID4 structure.
-********************************************************************/
-void make_dom_rid4(DOM_RID4 *rid4, uint16 unknown, uint16 attr, uint32 rid)
-{
-       rid4->unknown = unknown;
-       rid4->attr    = attr;
-       rid4->rid     = rid;
-}
-
 /*******************************************************************
 makes a DOM_CLNT_SRV structure.
 ********************************************************************/
@@ -741,8 +762,9 @@ static void smb_io_clnt_srv(char *desc,  DOM_CLNT_SRV *log, prs_struct *ps, int
 /*******************************************************************
 makes a DOM_LOG_INFO structure.
 ********************************************************************/
-void make_log_info(DOM_LOG_INFO *log, char *logon_srv, char *acct_name,
-               uint16 sec_chan, char *comp_name)
+void make_log_info(DOM_LOG_INFO *log,
+               const char *logon_srv, const char *acct_name,
+               uint16 sec_chan, const char *comp_name)
 {
        if (log == NULL) return;
 
@@ -1048,4 +1070,3 @@ void smb_io_unistr3(char *desc,  UNISTR3 *name, prs_struct *ps, int depth)
        prs_unistr3(True, "unistr", name, ps, depth);
 }
 
-