Initial import
[samba] / source / rpc_parse / parse_net.c
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
new file mode 100644 (file)
index 0000000..3bd6977
--- /dev/null
@@ -0,0 +1,3463 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-1997,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
+ *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Jean François Micouleau           2002.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_PARSE
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+static BOOL net_io_neg_flags(const char *desc, NEG_FLAGS *neg, prs_struct *ps, int depth)
+{
+       if (neg == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_neg_flags");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("neg_flags", ps, depth, &neg->neg_flags))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NETLOGON_INFO_3 structure.
+********************************************************************/
+
+static void init_netinfo_3(NETLOGON_INFO_3 *info, uint32 flags, uint32 logon_attempts)
+{
+       info->flags          = flags;
+       info->logon_attempts = logon_attempts;
+       info->reserved_1     = 0x0;
+       info->reserved_2     = 0x0;
+       info->reserved_3     = 0x0;
+       info->reserved_4     = 0x0;
+       info->reserved_5     = 0x0;
+}
+
+/*******************************************************************
+ Reads or writes a NETLOGON_INFO_3 structure.
+********************************************************************/
+
+static BOOL net_io_netinfo_3(const char *desc,  NETLOGON_INFO_3 *info, prs_struct *ps, int depth)
+{
+       if (info == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_netinfo_3");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("flags         ", ps, depth, &info->flags))
+               return False;
+       if(!prs_uint32("logon_attempts", ps, depth, &info->logon_attempts))
+               return False;
+       if(!prs_uint32("reserved_1    ", ps, depth, &info->reserved_1))
+               return False;
+       if(!prs_uint32("reserved_2    ", ps, depth, &info->reserved_2))
+               return False;
+       if(!prs_uint32("reserved_3    ", ps, depth, &info->reserved_3))
+               return False;
+       if(!prs_uint32("reserved_4    ", ps, depth, &info->reserved_4))
+               return False;
+       if(!prs_uint32("reserved_5    ", ps, depth, &info->reserved_5))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits a NETLOGON_INFO_1 structure.
+********************************************************************/
+
+static void init_netinfo_1(NETLOGON_INFO_1 *info, uint32 flags, uint32 pdc_status)
+{
+       info->flags      = flags;
+       info->pdc_status = pdc_status;
+}
+
+/*******************************************************************
+ Reads or writes a NETLOGON_INFO_1 structure.
+********************************************************************/
+
+static BOOL net_io_netinfo_1(const char *desc, NETLOGON_INFO_1 *info, prs_struct *ps, int depth)
+{
+       if (info == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_netinfo_1");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("flags     ", ps, depth, &info->flags))
+               return False;
+       if(!prs_uint32("pdc_status", ps, depth, &info->pdc_status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NETLOGON_INFO_2 structure.
+********************************************************************/
+
+static void init_netinfo_2(NETLOGON_INFO_2 *info, uint32 flags, uint32 pdc_status,
+                               uint32 tc_status, const char *trusted_dc_name)
+{
+       info->flags      = flags;
+       info->pdc_status = pdc_status;
+       info->ptr_trusted_dc_name = 1;
+       info->tc_status  = tc_status;
+
+       if (trusted_dc_name != NULL)
+               init_unistr2(&info->uni_trusted_dc_name, trusted_dc_name, UNI_STR_TERMINATE);
+       else
+               init_unistr2(&info->uni_trusted_dc_name, "", UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Reads or writes a NETLOGON_INFO_2 structure.
+********************************************************************/
+
+static BOOL net_io_netinfo_2(const char *desc, NETLOGON_INFO_2 *info, prs_struct *ps, int depth)
+{
+       if (info == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_netinfo_2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("flags              ", ps, depth, &info->flags))
+               return False;
+       if(!prs_uint32("pdc_status         ", ps, depth, &info->pdc_status))
+               return False;
+       if(!prs_uint32("ptr_trusted_dc_name", ps, depth, &info->ptr_trusted_dc_name))
+               return False;
+       if(!prs_uint32("tc_status          ", ps, depth, &info->tc_status))
+               return False;
+
+       if (info->ptr_trusted_dc_name != 0) {
+               if(!smb_io_unistr2("unistr2", &info->uni_trusted_dc_name, info->ptr_trusted_dc_name, ps, depth))
+                       return False;
+       }
+
+       if(!prs_align(ps))
+               return False;
+
+       return True;
+}
+
+static BOOL net_io_ctrl_data_info_5(const char *desc, CTRL_DATA_INFO_5 *info, prs_struct *ps, int depth)
+{
+       if (info == NULL)
+               return False;
+               
+       prs_debug(ps, depth, desc, "net_io_ctrl_data_info_5");
+       depth++;
+       
+       if ( !prs_uint32( "function_code", ps, depth, &info->function_code ) )
+               return False;
+       
+       if(!prs_uint32("ptr_domain", ps, depth, &info->ptr_domain))
+               return False;
+               
+       if ( info->ptr_domain ) {
+               if(!smb_io_unistr2("domain", &info->domain, info->ptr_domain, ps, depth))
+                       return False;
+       }
+               
+       return True;
+}
+
+static BOOL net_io_ctrl_data_info_6(const char *desc, CTRL_DATA_INFO_6 *info, prs_struct *ps, int depth)
+{
+       if (info == NULL)
+               return False;
+               
+       prs_debug(ps, depth, desc, "net_io_ctrl_data_info_6");
+       depth++;
+       
+       if ( !prs_uint32( "function_code", ps, depth, &info->function_code ) )
+               return False;
+       
+       if(!prs_uint32("ptr_domain", ps, depth, &info->ptr_domain))
+               return False;
+               
+       if ( info->ptr_domain ) {
+               if(!smb_io_unistr2("domain", &info->domain, info->ptr_domain, ps, depth))
+                       return False;
+       }
+               
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_LOGON_CTRL2 structure.
+********************************************************************/
+
+BOOL net_io_q_logon_ctrl2(const char *desc, NET_Q_LOGON_CTRL2 *q_l, prs_struct *ps, int depth)
+{
+       if (q_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_logon_ctrl2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("ptr          ", ps, depth, &q_l->ptr))
+               return False;
+
+       if(!smb_io_unistr2 ("", &q_l->uni_server_name, q_l->ptr, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("function_code", ps, depth, &q_l->function_code))
+               return False;
+       if(!prs_uint32("query_level  ", ps, depth, &q_l->query_level))
+               return False;
+       switch ( q_l->function_code ) {
+               case NETLOGON_CONTROL_REDISCOVER:
+                       if ( !net_io_ctrl_data_info_5( "ctrl_data_info5", &q_l->info.info5, ps, depth) ) 
+                               return False;
+                       break;
+                       
+               case NETLOGON_CONTROL_TC_QUERY:
+                       if ( !net_io_ctrl_data_info_6( "ctrl_data_info6", &q_l->info.info6, ps, depth) ) 
+                               return False;
+                       break;
+
+               default:
+                       DEBUG(0,("net_io_q_logon_ctrl2: unknown function_code [%d]\n",
+                               q_l->function_code));
+                       return False;
+       }
+       
+       return True;
+}
+
+/*******************************************************************
+ Inits an NET_Q_LOGON_CTRL2 structure.
+********************************************************************/
+
+void init_net_q_logon_ctrl2(NET_Q_LOGON_CTRL2 *q_l, const char *srv_name,
+                           uint32 query_level)
+{
+       DEBUG(5,("init_q_logon_ctrl2\n"));
+
+       q_l->function_code = 0x01;
+       q_l->query_level = query_level;
+
+       init_unistr2(&q_l->uni_server_name, srv_name, UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Inits an NET_R_LOGON_CTRL2 structure.
+********************************************************************/
+
+void init_net_r_logon_ctrl2(NET_R_LOGON_CTRL2 *r_l, uint32 query_level,
+                           uint32 flags, uint32 pdc_status, 
+                           uint32 logon_attempts, uint32 tc_status, 
+                           const char *trusted_domain_name)
+{
+       r_l->switch_value  = query_level; 
+
+       switch (query_level) {
+       case 1:
+               r_l->ptr = 1; /* undocumented pointer */
+               init_netinfo_1(&r_l->logon.info1, flags, pdc_status);   
+               r_l->status = NT_STATUS_OK;
+               break;
+       case 2:
+               r_l->ptr = 1; /* undocumented pointer */
+               init_netinfo_2(&r_l->logon.info2, flags, pdc_status,
+                              tc_status, trusted_domain_name); 
+               r_l->status = NT_STATUS_OK;
+               break;
+       case 3:
+               r_l->ptr = 1; /* undocumented pointer */
+               init_netinfo_3(&r_l->logon.info3, flags, logon_attempts);       
+               r_l->status = NT_STATUS_OK;
+               break;
+       default:
+               DEBUG(2,("init_r_logon_ctrl2: unsupported switch value %d\n",
+                       r_l->switch_value));
+               r_l->ptr = 0; /* undocumented pointer */
+
+               /* take a guess at an error code... */
+               r_l->status = NT_STATUS_INVALID_INFO_CLASS;
+               break;
+       }
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_LOGON_CTRL2 structure.
+********************************************************************/
+
+BOOL net_io_r_logon_ctrl2(const char *desc, NET_R_LOGON_CTRL2 *r_l, prs_struct *ps, int depth)
+{
+       if (r_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_logon_ctrl2");
+       depth++;
+
+       if(!prs_uint32("switch_value ", ps, depth, &r_l->switch_value))
+               return False;
+       if(!prs_uint32("ptr          ", ps, depth, &r_l->ptr))
+               return False;
+
+       if (r_l->ptr != 0) {
+               switch (r_l->switch_value) {
+               case 1:
+                       if(!net_io_netinfo_1("", &r_l->logon.info1, ps, depth))
+                               return False;
+                       break;
+               case 2:
+                       if(!net_io_netinfo_2("", &r_l->logon.info2, ps, depth))
+                               return False;
+                       break;
+               case 3:
+                       if(!net_io_netinfo_3("", &r_l->logon.info3, ps, depth))
+                               return False;
+                       break;
+               default:
+                       DEBUG(2,("net_io_r_logon_ctrl2: unsupported switch value %d\n",
+                               r_l->switch_value));
+                       break;
+               }
+       }
+
+       if(!prs_ntstatus("status       ", ps, depth, &r_l->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_LOGON_CTRL structure.
+********************************************************************/
+
+BOOL net_io_q_logon_ctrl(const char *desc, NET_Q_LOGON_CTRL *q_l, prs_struct *ps, 
+                        int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_q_logon_ctrl");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("ptr          ", ps, depth, &q_l->ptr))
+               return False;
+
+       if(!smb_io_unistr2 ("", &q_l->uni_server_name, q_l->ptr, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("function_code", ps, depth, &q_l->function_code))
+               return False;
+       if(!prs_uint32("query_level  ", ps, depth, &q_l->query_level))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an NET_Q_LOGON_CTRL structure.
+********************************************************************/
+
+void init_net_q_logon_ctrl(NET_Q_LOGON_CTRL *q_l, const char *srv_name,
+                          uint32 query_level)
+{
+       DEBUG(5,("init_q_logon_ctrl\n"));
+
+       q_l->function_code = 0x01; /* ??? */
+       q_l->query_level = query_level;
+
+       init_unistr2(&q_l->uni_server_name, srv_name, UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Inits an NET_R_LOGON_CTRL structure.
+********************************************************************/
+
+void init_net_r_logon_ctrl(NET_R_LOGON_CTRL *r_l, uint32 query_level,
+                          uint32 flags, uint32 pdc_status)
+{
+       DEBUG(5,("init_r_logon_ctrl\n"));
+
+       r_l->switch_value  = query_level; /* should only be 0x1 */
+
+       switch (query_level) {
+       case 1:
+               r_l->ptr = 1; /* undocumented pointer */
+               init_netinfo_1(&r_l->logon.info1, flags, pdc_status);   
+               r_l->status = NT_STATUS_OK;
+               break;
+       default:
+               DEBUG(2,("init_r_logon_ctrl: unsupported switch value %d\n",
+                       r_l->switch_value));
+               r_l->ptr = 0; /* undocumented pointer */
+
+               /* take a guess at an error code... */
+               r_l->status = NT_STATUS_INVALID_INFO_CLASS;
+               break;
+       }
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_LOGON_CTRL structure.
+********************************************************************/
+
+BOOL net_io_r_logon_ctrl(const char *desc, NET_R_LOGON_CTRL *r_l, prs_struct *ps, 
+                        int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_r_logon_ctrl");
+       depth++;
+
+       if(!prs_uint32("switch_value ", ps, depth, &r_l->switch_value))
+               return False;
+       if(!prs_uint32("ptr          ", ps, depth, &r_l->ptr))
+               return False;
+
+       if (r_l->ptr != 0) {
+               switch (r_l->switch_value) {
+               case 1:
+                       if(!net_io_netinfo_1("", &r_l->logon.info1, ps, depth))
+                               return False;
+                       break;
+               default:
+                       DEBUG(2,("net_io_r_logon_ctrl: unsupported switch value %d\n",
+                               r_l->switch_value));
+                       break;
+               }
+       }
+
+       if(!prs_ntstatus("status       ", ps, depth, &r_l->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an NET_R_GETDCNAME structure.
+********************************************************************/
+void init_net_q_getdcname(NET_Q_GETDCNAME *r_t, const char *logon_server,
+                         const char *domainname)
+{
+       DEBUG(5,("init_r_getdcname\n"));
+
+       r_t->ptr_logon_server = (logon_server != NULL);
+       init_unistr2(&r_t->uni_logon_server, logon_server, UNI_STR_TERMINATE);
+       r_t->ptr_domainname = (domainname != NULL);
+       init_unistr2(&r_t->uni_domainname, domainname, UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_GETDCNAME structure.
+********************************************************************/
+
+BOOL net_io_q_getdcname(const char *desc, NET_Q_GETDCNAME *r_t, prs_struct *ps,
+                       int depth)
+{
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_getdcname");
+       depth++;
+
+       if (!prs_uint32("ptr_logon_server", ps, depth, &r_t->ptr_logon_server))
+               return False;
+
+       if (!smb_io_unistr2("logon_server", &r_t->uni_logon_server,
+                           r_t->ptr_logon_server, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_domainname", ps, depth, &r_t->ptr_domainname))
+               return False;
+
+       if (!smb_io_unistr2("domainname", &r_t->uni_domainname,
+                           r_t->ptr_domainname, ps, depth))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits an NET_R_GETDCNAME structure.
+********************************************************************/
+void init_net_r_getdcname(NET_R_GETDCNAME *r_t, const char *dcname)
+{
+       DEBUG(5,("init_r_getdcname\n"));
+
+       init_unistr2(&r_t->uni_dcname, dcname, UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_GETDCNAME structure.
+********************************************************************/
+
+BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps,
+                       int depth)
+{
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_getdcname");
+       depth++;
+
+       if (!prs_uint32("ptr_dcname", ps, depth, &r_t->ptr_dcname))
+               return False;
+
+       if (!smb_io_unistr2("dcname", &r_t->uni_dcname,
+                           r_t->ptr_dcname, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_ntstatus("status", ps, depth, &r_t->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an NET_R_TRUST_DOM_LIST structure.
+********************************************************************/
+
+void init_r_trust_dom(NET_R_TRUST_DOM_LIST *r_t,
+                       uint32 num_doms, const char *dom_name)
+{
+       unsigned int i = 0;
+
+       DEBUG(5,("init_r_trust_dom\n"));
+
+       for (i = 0; i < MAX_TRUST_DOMS; i++) {
+               r_t->uni_trust_dom_name[i].uni_str_len = 0;
+               r_t->uni_trust_dom_name[i].uni_max_len = 0;
+       }
+       if (num_doms > MAX_TRUST_DOMS)
+               num_doms = MAX_TRUST_DOMS;
+
+       for (i = 0; i < num_doms; i++) {
+               fstring domain_name;
+               fstrcpy(domain_name, dom_name);
+               strupper_m(domain_name);
+               init_unistr2(&r_t->uni_trust_dom_name[i], domain_name, UNI_STR_TERMINATE);
+               /* the use of UNISTR2 here is non-standard. */
+               r_t->uni_trust_dom_name[i].offset = 0x1;
+       }
+       
+       r_t->status = NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_TRUST_DOM_LIST structure.
+********************************************************************/
+
+BOOL net_io_r_trust_dom(const char *desc, NET_R_TRUST_DOM_LIST *r_t, prs_struct *ps, int depth)
+{
+       uint32 value;
+
+       if (r_t == NULL)
+                return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_trust_dom");
+       depth++;
+
+       /* temporary code to give a valid response */
+       value=2;
+       if(!prs_uint32("status", ps, depth, &value))
+                return False;
+
+       value=1;
+       if(!prs_uint32("status", ps, depth, &value))
+                return False;
+       value=2;
+       if(!prs_uint32("status", ps, depth, &value))
+                return False;
+
+       value=0;
+       if(!prs_uint32("status", ps, depth, &value))
+                return False;
+
+       value=0;
+       if(!prs_uint32("status", ps, depth, &value))
+                return False;
+
+/* old non working code */
+#if 0
+       int i;
+
+       for (i = 0; i < MAX_TRUST_DOMS; i++) {
+               if (r_t->uni_trust_dom_name[i].uni_str_len == 0)
+                       break;
+               if(!smb_io_unistr2("", &r_t->uni_trust_dom_name[i], True, ps, depth))
+                        return False;
+       }
+
+       if(!prs_ntstatus("status", ps, depth, &r_t->status))
+                return False;
+#endif
+       return True;
+}
+
+
+/*******************************************************************
+ Reads or writes an NET_Q_TRUST_DOM_LIST structure.
+********************************************************************/
+
+BOOL net_io_q_trust_dom(const char *desc, NET_Q_TRUST_DOM_LIST *q_l, prs_struct *ps, int depth)
+{
+       if (q_l == NULL)
+                return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_trust_dom");
+       depth++;
+
+       if(!prs_uint32("ptr          ", ps, depth, &q_l->ptr))
+                return False;
+       if(!smb_io_unistr2 ("", &q_l->uni_server_name, q_l->ptr, ps, depth))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an NET_Q_REQ_CHAL structure.
+********************************************************************/
+
+void init_q_req_chal(NET_Q_REQ_CHAL *q_c,
+                    const char *logon_srv, const char *logon_clnt,
+                    const DOM_CHAL *clnt_chal)
+{
+       DEBUG(5,("init_q_req_chal: %d\n", __LINE__));
+
+       q_c->undoc_buffer = 1; /* don't know what this buffer is */
+
+       init_unistr2(&q_c->uni_logon_srv, logon_srv , UNI_STR_TERMINATE);
+       init_unistr2(&q_c->uni_logon_clnt, logon_clnt, UNI_STR_TERMINATE);
+
+       memcpy(q_c->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
+
+       DEBUG(5,("init_q_req_chal: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_REQ_CHAL structure.
+********************************************************************/
+
+BOOL net_io_q_req_chal(const char *desc,  NET_Q_REQ_CHAL *q_c, prs_struct *ps, int depth)
+{
+       if (q_c == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_req_chal");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!prs_uint32("undoc_buffer", ps, depth, &q_c->undoc_buffer))
+               return False;
+
+       if(!smb_io_unistr2("", &q_c->uni_logon_srv, True, ps, depth)) /* logon server unicode string */
+               return False;
+       if(!smb_io_unistr2("", &q_c->uni_logon_clnt, True, ps, depth)) /* logon client unicode string */
+               return False;
+
+       if(!smb_io_chal("", &q_c->clnt_chal, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_req_chal(const char *desc, NET_R_REQ_CHAL *r_c, prs_struct *ps, int depth)
+{
+       if (r_c == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_req_chal");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_chal("", &r_c->srv_chal, ps, depth)) /* server challenge */
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_auth(const char *desc, NET_Q_AUTH *q_a, prs_struct *ps, int depth)
+{
+       if (q_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_auth");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_log_info ("", &q_a->clnt_id, ps, depth)) /* client identification info */
+               return False;
+       if(!smb_io_chal("", &q_a->clnt_chal, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_auth(const char *desc, NET_R_AUTH *r_a, prs_struct *ps, int depth)
+{
+       if (r_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_auth");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_chal("", &r_a->srv_chal, ps, depth)) /* server challenge */
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_a->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NET_Q_AUTH_2 struct.
+********************************************************************/
+
+void init_q_auth_2(NET_Q_AUTH_2 *q_a,
+               const char *logon_srv, const char *acct_name, uint16 sec_chan, const char *comp_name,
+               const DOM_CHAL *clnt_chal, uint32 clnt_flgs)
+{
+       DEBUG(5,("init_q_auth_2: %d\n", __LINE__));
+
+       init_log_info(&q_a->clnt_id, logon_srv, acct_name, sec_chan, comp_name);
+       memcpy(q_a->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
+       q_a->clnt_flgs.neg_flags = clnt_flgs;
+
+       DEBUG(5,("init_q_auth_2: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_auth_2(const char *desc, NET_Q_AUTH_2 *q_a, prs_struct *ps, int depth)
+{
+       if (q_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_auth_2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_log_info ("", &q_a->clnt_id, ps, depth)) /* client identification info */
+               return False;
+       if(!smb_io_chal("", &q_a->clnt_chal, ps, depth))
+               return False;
+       if(!net_io_neg_flags("", &q_a->clnt_flgs, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_auth_2(const char *desc, NET_R_AUTH_2 *r_a, prs_struct *ps, int depth)
+{
+       if (r_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_auth_2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_chal("", &r_a->srv_chal, ps, depth)) /* server challenge */
+               return False;
+       if(!net_io_neg_flags("", &r_a->srv_flgs, ps, depth))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_a->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NET_Q_AUTH_3 struct.
+********************************************************************/
+
+void init_q_auth_3(NET_Q_AUTH_3 *q_a,
+               const char *logon_srv, const char *acct_name, uint16 sec_chan, const char *comp_name,
+               const DOM_CHAL *clnt_chal, uint32 clnt_flgs)
+{
+       DEBUG(5,("init_q_auth_3: %d\n", __LINE__));
+
+       init_log_info(&q_a->clnt_id, logon_srv, acct_name, sec_chan, comp_name);
+       memcpy(q_a->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
+       q_a->clnt_flgs.neg_flags = clnt_flgs;
+
+       DEBUG(5,("init_q_auth_3: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_auth_3(const char *desc, NET_Q_AUTH_3 *q_a, prs_struct *ps, int depth)
+{
+       if (q_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_auth_3");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_log_info ("", &q_a->clnt_id, ps, depth)) /* client identification info */
+               return False;
+       if(!smb_io_chal("", &q_a->clnt_chal, ps, depth))
+               return False;
+       if(!net_io_neg_flags("", &q_a->clnt_flgs, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_auth_3(const char *desc, NET_R_AUTH_3 *r_a, prs_struct *ps, int depth)
+{
+       if (r_a == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_auth_3");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_chal("srv_chal", &r_a->srv_chal, ps, depth)) /* server challenge */
+               return False;
+       if(!net_io_neg_flags("srv_flgs", &r_a->srv_flgs, ps, depth))
+               return False;
+       if (!prs_uint32("unknown", ps, depth, &r_a->unknown))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_a->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits a NET_Q_SRV_PWSET.
+********************************************************************/
+
+void init_q_srv_pwset(NET_Q_SRV_PWSET *q_s,
+               const char *logon_srv, const char *sess_key, const char *acct_name, 
+                uint16 sec_chan, const char *comp_name,
+               DOM_CRED *cred, const uchar hashed_mach_pwd[16])
+{
+       unsigned char nt_cypher[16];
+       
+       DEBUG(5,("init_q_srv_pwset\n"));
+       
+       /* Process the new password. */
+       cred_hash3( nt_cypher, hashed_mach_pwd, (const unsigned char *)sess_key, 1);
+
+       init_clnt_info(&q_s->clnt_id, logon_srv, acct_name, sec_chan, comp_name, cred);
+
+       memcpy(q_s->pwd, nt_cypher, sizeof(q_s->pwd)); 
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_srv_pwset(const char *desc, NET_Q_SRV_PWSET *q_s, prs_struct *ps, int depth)
+{
+       if (q_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_srv_pwset");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_clnt_info("", &q_s->clnt_id, ps, depth)) /* client identification/authentication info */
+               return False;
+       if(!prs_uint8s (False, "pwd", ps, depth, q_s->pwd, 16)) /* new password - undocumented */
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_srv_pwset(const char *desc, NET_R_SRV_PWSET *r_s, prs_struct *ps, int depth)
+{
+       if (r_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_srv_pwset");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+    
+       if(!smb_io_cred("", &r_s->srv_cred, ps, depth)) /* server challenge */
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_s->status))
+               return False;
+
+       return True;
+}
+
+/*************************************************************************
+ Init DOM_SID2 array from a string containing multiple sids
+ *************************************************************************/
+
+static int init_dom_sid2s(TALLOC_CTX *ctx, const char *sids_str, DOM_SID2 **ppsids)
+{
+       const char *ptr;
+       pstring s2;
+       int count = 0;
+
+       DEBUG(4,("init_dom_sid2s: %s\n", sids_str ? sids_str:""));
+
+       *ppsids = NULL;
+
+       if(sids_str) {
+               int number;
+               DOM_SID2 *sids;
+
+               /* Count the number of valid SIDs. */
+               for (count = 0, ptr = sids_str; next_token(&ptr, s2, NULL, sizeof(s2)); ) {
+                       DOM_SID tmpsid;
+                       if (string_to_sid(&tmpsid, s2))
+                               count++;
+               }
+
+               /* Now allocate space for them. */
+               *ppsids = TALLOC_ZERO_ARRAY(ctx, DOM_SID2, count);
+               if (*ppsids == NULL)
+                       return 0;
+
+               sids = *ppsids;
+
+               for (number = 0, ptr = sids_str; next_token(&ptr, s2, NULL, sizeof(s2)); ) {
+                       DOM_SID tmpsid;
+                       if (string_to_sid(&tmpsid, s2)) {
+                               /* count only valid sids */
+                               init_dom_sid2(&sids[number], &tmpsid);
+                               number++;
+                       }
+               }
+       }
+
+       return count;
+}
+
+/*******************************************************************
+ Inits a NET_ID_INFO_1 structure.
+********************************************************************/
+
+void init_id_info1(NET_ID_INFO_1 *id, const char *domain_name,
+                               uint32 param_ctrl, uint32 log_id_low, uint32 log_id_high,
+                               const char *user_name, const char *wksta_name,
+                               const char *sess_key,
+                               unsigned char lm_cypher[16], unsigned char nt_cypher[16])
+{
+       unsigned char lm_owf[16];
+       unsigned char nt_owf[16];
+
+       DEBUG(5,("init_id_info1: %d\n", __LINE__));
+
+       id->ptr_id_info1 = 1;
+
+       id->param_ctrl = param_ctrl;
+       init_logon_id(&id->logon_id, log_id_low, log_id_high);
+
+
+       if (lm_cypher && nt_cypher) {
+               unsigned char key[16];
+#ifdef DEBUG_PASSWORD
+               DEBUG(100,("lm cypher:"));
+               dump_data(100, (char *)lm_cypher, 16);
+
+               DEBUG(100,("nt cypher:"));
+               dump_data(100, (char *)nt_cypher, 16);
+#endif
+
+               memset(key, 0, 16);
+               memcpy(key, sess_key, 8);
+
+               memcpy(lm_owf, lm_cypher, 16);
+               SamOEMhash(lm_owf, key, 16);
+               memcpy(nt_owf, nt_cypher, 16);
+               SamOEMhash(nt_owf, key, 16);
+
+#ifdef DEBUG_PASSWORD
+               DEBUG(100,("encrypt of lm owf password:"));
+               dump_data(100, (char *)lm_owf, 16);
+
+               DEBUG(100,("encrypt of nt owf password:"));
+               dump_data(100, (char *)nt_owf, 16);
+#endif
+               /* set up pointers to cypher blocks */
+               lm_cypher = lm_owf;
+               nt_cypher = nt_owf;
+       }
+
+       init_owf_info(&id->lm_owf, lm_cypher);
+       init_owf_info(&id->nt_owf, nt_cypher);
+
+       init_unistr2(&id->uni_domain_name, domain_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_domain_name, &id->uni_domain_name);
+       init_unistr2(&id->uni_user_name, user_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_user_name, &id->uni_user_name);
+       init_unistr2(&id->uni_wksta_name, wksta_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_wksta_name, &id->uni_wksta_name);
+}
+
+/*******************************************************************
+ Reads or writes an NET_ID_INFO_1 structure.
+********************************************************************/
+
+static BOOL net_io_id_info1(const char *desc,  NET_ID_INFO_1 *id, prs_struct *ps, int depth)
+{
+       if (id == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_id_info1");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("ptr_id_info1", ps, depth, &id->ptr_id_info1))
+               return False;
+
+       if (id->ptr_id_info1 != 0) {
+               if(!smb_io_unihdr("unihdr", &id->hdr_domain_name, ps, depth))
+                       return False;
+
+               if(!prs_uint32("param_ctrl", ps, depth, &id->param_ctrl))
+                       return False;
+               if(!smb_io_logon_id("", &id->logon_id, ps, depth))
+                       return False;
+
+               if(!smb_io_unihdr("unihdr", &id->hdr_user_name, ps, depth))
+                       return False;
+               if(!smb_io_unihdr("unihdr", &id->hdr_wksta_name, ps, depth))
+                       return False;
+
+               if(!smb_io_owf_info("", &id->lm_owf, ps, depth))
+                       return False;
+               if(!smb_io_owf_info("", &id->nt_owf, ps, depth))
+                       return False;
+
+               if(!smb_io_unistr2("unistr2", &id->uni_domain_name,
+                               id->hdr_domain_name.buffer, ps, depth))
+                       return False;
+               if(!smb_io_unistr2("unistr2", &id->uni_user_name,
+                               id->hdr_user_name.buffer, ps, depth))
+                       return False;
+               if(!smb_io_unistr2("unistr2", &id->uni_wksta_name,
+                               id->hdr_wksta_name.buffer, ps, depth))
+                       return False;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+Inits a NET_ID_INFO_2 structure.
+
+This is a network logon packet. The log_id parameters
+are what an NT server would generate for LUID once the
+user is logged on. I don't think we care about them.
+
+Note that this has no access to the NT and LM hashed passwords,
+so it forwards the challenge, and the NT and LM responses (24
+bytes each) over the secure channel to the Domain controller
+for it to say yea or nay. This is the preferred method of 
+checking for a logon as it doesn't export the password
+hashes to anyone who has compromised the secure channel. JRA.
+********************************************************************/
+
+void init_id_info2(NET_ID_INFO_2 * id, const char *domain_name,
+                  uint32 param_ctrl,
+                  uint32 log_id_low, uint32 log_id_high,
+                  const char *user_name, const char *wksta_name,
+                  const uchar lm_challenge[8],
+                  const uchar * lm_chal_resp, size_t lm_chal_resp_len,
+                  const uchar * nt_chal_resp, size_t nt_chal_resp_len)
+{
+
+       DEBUG(5,("init_id_info2: %d\n", __LINE__));
+
+       id->ptr_id_info2 = 1;
+
+       id->param_ctrl = param_ctrl;
+       init_logon_id(&id->logon_id, log_id_low, log_id_high);
+
+       memcpy(id->lm_chal, lm_challenge, sizeof(id->lm_chal));
+       init_str_hdr(&id->hdr_nt_chal_resp, nt_chal_resp_len, nt_chal_resp_len, (nt_chal_resp != NULL) ? 1 : 0);
+       init_str_hdr(&id->hdr_lm_chal_resp, lm_chal_resp_len, lm_chal_resp_len, (lm_chal_resp != NULL) ? 1 : 0);
+
+       init_unistr2(&id->uni_domain_name, domain_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_domain_name, &id->uni_domain_name);
+       init_unistr2(&id->uni_user_name, user_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_user_name, &id->uni_user_name);
+       init_unistr2(&id->uni_wksta_name, wksta_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&id->hdr_wksta_name, &id->uni_wksta_name);
+
+       init_string2(&id->nt_chal_resp, (const char *)nt_chal_resp, nt_chal_resp_len, nt_chal_resp_len);
+       init_string2(&id->lm_chal_resp, (const char *)lm_chal_resp, lm_chal_resp_len, lm_chal_resp_len);
+
+}
+
+/*******************************************************************
+ Reads or writes an NET_ID_INFO_2 structure.
+********************************************************************/
+
+static BOOL net_io_id_info2(const char *desc,  NET_ID_INFO_2 *id, prs_struct *ps, int depth)
+{
+       if (id == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_id_info2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("ptr_id_info2", ps, depth, &id->ptr_id_info2))
+               return False;
+
+       if (id->ptr_id_info2 != 0) {
+               if(!smb_io_unihdr("unihdr", &id->hdr_domain_name, ps, depth))
+                       return False;
+
+               if(!prs_uint32("param_ctrl", ps, depth, &id->param_ctrl))
+                       return False;
+               if(!smb_io_logon_id("", &id->logon_id, ps, depth))
+                       return False;
+
+               if(!smb_io_unihdr("unihdr", &id->hdr_user_name, ps, depth))
+                       return False;
+               if(!smb_io_unihdr("unihdr", &id->hdr_wksta_name, ps, depth))
+                       return False;
+
+               if(!prs_uint8s (False, "lm_chal", ps, depth, id->lm_chal, 8)) /* lm 8 byte challenge */
+                       return False;
+
+               if(!smb_io_strhdr("hdr_nt_chal_resp", &id->hdr_nt_chal_resp, ps, depth))
+                       return False;
+               if(!smb_io_strhdr("hdr_lm_chal_resp", &id->hdr_lm_chal_resp, ps, depth))
+                       return False;
+
+               if(!smb_io_unistr2("uni_domain_name", &id->uni_domain_name,
+                               id->hdr_domain_name.buffer, ps, depth))
+                       return False;
+               if(!smb_io_unistr2("uni_user_name  ", &id->uni_user_name,
+                               id->hdr_user_name.buffer, ps, depth))
+                       return False;
+               if(!smb_io_unistr2("uni_wksta_name ", &id->uni_wksta_name,
+                               id->hdr_wksta_name.buffer, ps, depth))
+                       return False;
+               if(!smb_io_string2("nt_chal_resp", &id->nt_chal_resp,
+                               id->hdr_nt_chal_resp.buffer, ps, depth))
+                       return False;
+               if(!smb_io_string2("lm_chal_resp", &id->lm_chal_resp,
+                               id->hdr_lm_chal_resp.buffer, ps, depth))
+                       return False;
+       }
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits a DOM_SAM_INFO structure.
+********************************************************************/
+
+void init_sam_info(DOM_SAM_INFO *sam,
+                               const char *logon_srv, const char *comp_name,
+                               DOM_CRED *clnt_cred,
+                               DOM_CRED *rtn_cred, uint16 logon_level,
+                               NET_ID_INFO_CTR *ctr)
+{
+       DEBUG(5,("init_sam_info: %d\n", __LINE__));
+
+       init_clnt_info2(&sam->client, logon_srv, comp_name, clnt_cred);
+
+       if (rtn_cred != NULL) {
+               sam->ptr_rtn_cred = 1;
+               memcpy(&sam->rtn_cred, rtn_cred, sizeof(sam->rtn_cred));
+       } else {
+               sam->ptr_rtn_cred = 0;
+       }
+
+       sam->logon_level  = logon_level;
+       sam->ctr          = ctr;
+}
+
+/*******************************************************************
+ Reads or writes a DOM_SAM_INFO structure.
+********************************************************************/
+
+static BOOL net_io_id_info_ctr(const char *desc, NET_ID_INFO_CTR **pp_ctr, prs_struct *ps, int depth)
+{
+       NET_ID_INFO_CTR *ctr = *pp_ctr;
+
+       prs_debug(ps, depth, desc, "smb_io_sam_info");
+       depth++;
+
+       if (UNMARSHALLING(ps)) {
+               ctr = *pp_ctr = PRS_ALLOC_MEM(ps, NET_ID_INFO_CTR, 1);
+               if (ctr == NULL)
+                       return False;
+       }
+       
+       if (ctr == NULL)
+               return False;
+
+       /* don't 4-byte align here! */
+
+       if(!prs_uint16("switch_value ", ps, depth, &ctr->switch_value))
+               return False;
+
+       switch (ctr->switch_value) {
+       case 1:
+               if(!net_io_id_info1("", &ctr->auth.id1, ps, depth))
+                       return False;
+               break;
+       case 2:
+               if(!net_io_id_info2("", &ctr->auth.id2, ps, depth))
+                       return False;
+               break;
+       default:
+               /* PANIC! */
+               DEBUG(4,("smb_io_sam_info: unknown switch_value!\n"));
+               break;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a DOM_SAM_INFO structure.
+ ********************************************************************/
+
+static BOOL smb_io_sam_info(const char *desc, DOM_SAM_INFO *sam, prs_struct *ps, int depth)
+{
+       if (sam == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "smb_io_sam_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!smb_io_clnt_info2("", &sam->client, ps, depth))
+               return False;
+
+       if(!prs_uint32("ptr_rtn_cred ", ps, depth, &sam->ptr_rtn_cred))
+               return False;
+       if(!smb_io_cred("", &sam->rtn_cred, ps, depth))
+               return False;
+
+       if(!prs_uint16("logon_level  ", ps, depth, &sam->logon_level))
+               return False;
+
+       if (sam->logon_level != 0) {
+               if(!net_io_id_info_ctr("logon_info", &sam->ctr, ps, depth))
+                       return False;
+       }
+
+       return True;
+}
+
+/*************************************************************************
+ Inits a NET_USER_INFO_3 structure.
+
+ This is a network logon reply packet, and contains much information about
+ the user.  This information is passed as a (very long) paramater list
+ to avoid having to link in the PASSDB code to every program that deals 
+ with this file.
+ *************************************************************************/
+
+void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, 
+                        uint32                user_rid,
+                        uint32                group_rid,
+
+                        const char*            user_name,
+                        const char*            full_name,
+                        const char*            home_dir,
+                        const char*            dir_drive,
+                        const char*            logon_script,
+                        const char*            profile_path,
+
+                        time_t unix_logon_time,
+                        time_t unix_logoff_time,
+                        time_t unix_kickoff_time,
+                        time_t unix_pass_last_set_time,
+                        time_t unix_pass_can_change_time,
+                        time_t unix_pass_must_change_time,
+                        
+                        uint16 logon_count, uint16 bad_pw_count,
+                        uint32 num_groups, const DOM_GID *gids,
+                        uint32 user_flgs, uchar user_session_key[16],
+                        uchar lm_session_key[16],
+                        const char *logon_srv, const char *logon_dom,
+                        const DOM_SID *dom_sid, const char *other_sids)
+{
+       /* only cope with one "other" sid, right now. */
+       /* need to count the number of space-delimited sids */
+       unsigned int i;
+       int num_other_sids = 0;
+       
+       NTTIME          logon_time, logoff_time, kickoff_time,
+                       pass_last_set_time, pass_can_change_time,
+                       pass_must_change_time;
+
+       ZERO_STRUCTP(usr);
+
+       usr->ptr_user_info = 1; /* yes, we're bothering to put USER_INFO data here */
+
+       /* Create NTTIME structs */
+       unix_to_nt_time (&logon_time,            unix_logon_time);
+       unix_to_nt_time (&logoff_time,           unix_logoff_time);
+       unix_to_nt_time (&kickoff_time,          unix_kickoff_time);
+       unix_to_nt_time (&pass_last_set_time,    unix_pass_last_set_time);
+       unix_to_nt_time (&pass_can_change_time,  unix_pass_can_change_time);
+       unix_to_nt_time (&pass_must_change_time, unix_pass_must_change_time);
+
+       usr->logon_time            = logon_time;
+       usr->logoff_time           = logoff_time;
+       usr->kickoff_time          = kickoff_time;
+       usr->pass_last_set_time    = pass_last_set_time;
+       usr->pass_can_change_time  = pass_can_change_time;
+       usr->pass_must_change_time = pass_must_change_time;
+
+       usr->logon_count = logon_count;
+       usr->bad_pw_count = bad_pw_count;
+
+       usr->user_rid = user_rid;
+       usr->group_rid = group_rid;
+       usr->num_groups = num_groups;
+
+       usr->buffer_groups = 1; /* indicates fill in groups, below, even if there are none */
+       usr->user_flgs = user_flgs;
+
+       if (user_session_key != NULL)
+               memcpy(usr->user_sess_key, user_session_key, sizeof(usr->user_sess_key));
+       else
+               memset((char *)usr->user_sess_key, '\0', sizeof(usr->user_sess_key));
+
+       usr->buffer_dom_id = dom_sid ? 1 : 0; /* yes, we're bothering to put a domain SID in */
+
+       memset((char *)usr->lm_sess_key, '\0', sizeof(usr->lm_sess_key));
+       memset(&usr->acct_flags, '\0', sizeof(usr->acct_flags));
+
+       for (i=0; i<7; i++) {
+               memset(&usr->unknown[i], '\0', sizeof(usr->unknown));
+       }
+
+       if (lm_session_key != NULL) {
+               memcpy(usr->lm_sess_key, lm_session_key, sizeof(usr->lm_sess_key));
+       }
+
+       num_other_sids = init_dom_sid2s(ctx, other_sids, &usr->other_sids);
+
+       usr->num_other_sids = num_other_sids;
+       usr->buffer_other_sids = (num_other_sids != 0) ? 1 : 0; 
+       
+       init_unistr2(&usr->uni_user_name, user_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_user_name, &usr->uni_user_name);
+       init_unistr2(&usr->uni_full_name, full_name, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_full_name, &usr->uni_full_name);
+       init_unistr2(&usr->uni_logon_script, logon_script, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_logon_script, &usr->uni_logon_script);
+       init_unistr2(&usr->uni_profile_path, profile_path, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_profile_path, &usr->uni_profile_path);
+       init_unistr2(&usr->uni_home_dir, home_dir, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_home_dir, &usr->uni_home_dir);
+       init_unistr2(&usr->uni_dir_drive, dir_drive, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_dir_drive, &usr->uni_dir_drive);
+
+       usr->num_groups2 = num_groups;
+
+       usr->gids = TALLOC_ZERO_ARRAY(ctx,DOM_GID,num_groups);
+       if (usr->gids == NULL && num_groups>0)
+               return;
+
+       for (i = 0; i < num_groups; i++) 
+               usr->gids[i] = gids[i]; 
+               
+       init_unistr2(&usr->uni_logon_srv, logon_srv, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_logon_srv, &usr->uni_logon_srv);
+       init_unistr2(&usr->uni_logon_dom, logon_dom, UNI_FLAGS_NONE);
+       init_uni_hdr(&usr->hdr_logon_dom, &usr->uni_logon_dom);
+
+       init_dom_sid2(&usr->dom_sid, dom_sid);
+       /* "other" sids are set up above */
+}
+
+/*******************************************************************
+ This code has been modified to cope with a NET_USER_INFO_2 - which is
+ exactly the same as a NET_USER_INFO_3, minus the other sids parameters.
+ We use validation level to determine if we're marshalling a info 2 or
+ INFO_3 - be we always return an INFO_3. Based on code donated by Marc
+ Jacobsen at HP. JRA.
+********************************************************************/
+
+BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps, 
+                      int depth, uint16 validation_level, BOOL kerb_validation_level)
+{
+       unsigned int i;
+
+       if (usr == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_user_info3");
+       depth++;
+
+       if (UNMARSHALLING(ps))
+               ZERO_STRUCTP(usr);
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("ptr_user_info ", ps, depth, &usr->ptr_user_info))
+               return False;
+
+       if (usr->ptr_user_info == 0)
+               return True;
+
+       if(!smb_io_time("logon time", &usr->logon_time, ps, depth)) /* logon time */
+               return False;
+       if(!smb_io_time("logoff time", &usr->logoff_time, ps, depth)) /* logoff time */
+               return False;
+       if(!smb_io_time("kickoff time", &usr->kickoff_time, ps, depth)) /* kickoff time */
+               return False;
+       if(!smb_io_time("last set time", &usr->pass_last_set_time, ps, depth)) /* password last set time */
+               return False;
+       if(!smb_io_time("can change time", &usr->pass_can_change_time , ps, depth)) /* password can change time */
+               return False;
+       if(!smb_io_time("must change time", &usr->pass_must_change_time, ps, depth)) /* password must change time */
+               return False;
+
+       if(!smb_io_unihdr("hdr_user_name", &usr->hdr_user_name, ps, depth)) /* username unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_full_name", &usr->hdr_full_name, ps, depth)) /* user's full name unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_logon_script", &usr->hdr_logon_script, ps, depth)) /* logon script unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_profile_path", &usr->hdr_profile_path, ps, depth)) /* profile path unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_home_dir", &usr->hdr_home_dir, ps, depth)) /* home directory unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_dir_drive", &usr->hdr_dir_drive, ps, depth)) /* home directory drive unicode string header */
+               return False;
+
+       if(!prs_uint16("logon_count   ", ps, depth, &usr->logon_count))  /* logon count */
+               return False;
+       if(!prs_uint16("bad_pw_count  ", ps, depth, &usr->bad_pw_count)) /* bad password count */
+               return False;
+
+       if(!prs_uint32("user_rid      ", ps, depth, &usr->user_rid))       /* User RID */
+               return False;
+       if(!prs_uint32("group_rid     ", ps, depth, &usr->group_rid))      /* Group RID */
+               return False;
+       if(!prs_uint32("num_groups    ", ps, depth, &usr->num_groups))    /* num groups */
+               return False;
+       if(!prs_uint32("buffer_groups ", ps, depth, &usr->buffer_groups)) /* undocumented buffer pointer to groups. */
+               return False;
+       if(!prs_uint32("user_flgs     ", ps, depth, &usr->user_flgs))     /* user flags */
+               return False;
+
+       if(!prs_uint8s(False, "user_sess_key", ps, depth, usr->user_sess_key, 16)) /* user session key */
+               return False;
+
+       if(!smb_io_unihdr("hdr_logon_srv", &usr->hdr_logon_srv, ps, depth)) /* logon server unicode string header */
+               return False;
+       if(!smb_io_unihdr("hdr_logon_dom", &usr->hdr_logon_dom, ps, depth)) /* logon domain unicode string header */
+               return False;
+
+       if(!prs_uint32("buffer_dom_id ", ps, depth, &usr->buffer_dom_id)) /* undocumented logon domain id pointer */
+               return False;
+
+       if(!prs_uint8s(False, "lm_sess_key", ps, depth, usr->lm_sess_key, 8)) /* lm session key */
+               return False;
+
+       if(!prs_uint32("acct_flags ", ps, depth, &usr->acct_flags)) /* Account flags  */
+               return False;
+
+       for (i = 0; i < 7; i++)
+       {
+               if (!prs_uint32("unkown", ps, depth, &usr->unknown[i])) /* unknown */
+                        return False;
+       }
+
+       if (validation_level == 3) {
+               if(!prs_uint32("num_other_sids", ps, depth, &usr->num_other_sids)) /* 0 - num_sids */
+                       return False;
+               if(!prs_uint32("buffer_other_sids", ps, depth, &usr->buffer_other_sids)) /* NULL - undocumented pointer to SIDs. */
+                       return False;
+       } else {
+               if (UNMARSHALLING(ps)) {
+                       usr->num_other_sids = 0;
+                       usr->buffer_other_sids = 0;
+               }
+       }
+               
+       /* get kerb validation info (not really part of user_info_3) - Guenther */
+
+       if (kerb_validation_level) {
+
+               if(!prs_uint32("ptr_res_group_dom_sid", ps, depth, &usr->ptr_res_group_dom_sid))
+                       return False;
+               if(!prs_uint32("res_group_count", ps, depth, &usr->res_group_count))
+                       return False;
+               if(!prs_uint32("ptr_res_groups", ps, depth, &usr->ptr_res_groups))
+                       return False;
+       }
+
+       if(!smb_io_unistr2("uni_user_name", &usr->uni_user_name, usr->hdr_user_name.buffer, ps, depth)) /* username unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_full_name", &usr->uni_full_name, usr->hdr_full_name.buffer, ps, depth)) /* user's full name unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_logon_script", &usr->uni_logon_script, usr->hdr_logon_script.buffer, ps, depth)) /* logon script unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_profile_path", &usr->uni_profile_path, usr->hdr_profile_path.buffer, ps, depth)) /* profile path unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_home_dir", &usr->uni_home_dir, usr->hdr_home_dir.buffer, ps, depth)) /* home directory unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_dir_drive", &usr->uni_dir_drive, usr->hdr_dir_drive.buffer, ps, depth)) /* home directory drive unicode string */
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       if (usr->num_groups > 0) {
+
+               if(!prs_uint32("num_groups2   ", ps, depth, &usr->num_groups2))        /* num groups2 */
+                       return False;
+
+               if (usr->num_groups != usr->num_groups2) {
+                       DEBUG(3,("net_io_user_info3: num_groups mismatch! (%d != %d)\n", 
+                       usr->num_groups, usr->num_groups2));
+                       return False;
+               }
+
+
+               if (UNMARSHALLING(ps)) {
+                       usr->gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_groups);
+                       if (usr->gids == NULL)
+                               return False;
+               }
+
+               for (i = 0; i < usr->num_groups; i++) {
+                       if(!smb_io_gid("", &usr->gids[i], ps, depth)) /* group info */
+                               return False;
+               }
+               
+       }
+
+       if(!smb_io_unistr2("uni_logon_srv", &usr->uni_logon_srv, usr->hdr_logon_srv.buffer, ps, depth)) /* logon server unicode string */
+               return False;
+       if(!smb_io_unistr2("uni_logon_dom", &usr->uni_logon_dom, usr->hdr_logon_dom.buffer, ps, depth)) /* logon domain unicode string */
+               return False;
+
+       if(!smb_io_dom_sid2("", &usr->dom_sid, ps, depth))           /* domain SID */
+               return False;
+
+       if (usr->buffer_other_sids) {
+
+               uint32 num_other_sids = usr->num_other_sids;
+
+               if (!(usr->user_flgs & LOGON_EXTRA_SIDS)) {
+                       DEBUG(10,("net_io_user_info3: user_flgs attribute does not have LOGON_EXTRA_SIDS\n"));
+                       /* return False; */
+               }
+
+               if (!prs_uint32("num_other_sids", ps, depth,
+                               &num_other_sids))
+                       return False;
+
+               if (num_other_sids != usr->num_other_sids)
+                       return False;
+
+               if (UNMARSHALLING(ps)) {
+                       usr->other_sids = PRS_ALLOC_MEM(ps, DOM_SID2, usr->num_other_sids);
+                       usr->other_sids_attrib =
+                               PRS_ALLOC_MEM(ps, uint32, usr->num_other_sids);
+                                                              
+                       if ((num_other_sids != 0) &&
+                           ((usr->other_sids == NULL) ||
+                            (usr->other_sids_attrib == NULL)))
+                               return False;
+               }
+
+               /* First the pointers to the SIDS and attributes */
+
+               depth++;
+
+               for (i=0; i<usr->num_other_sids; i++) {
+                       uint32 ptr = 1;
+
+                       if (!prs_uint32("sid_ptr", ps, depth, &ptr))
+                               return False;
+
+                       if (UNMARSHALLING(ps) && (ptr == 0))
+                               return False;
+
+                       if (!prs_uint32("attribute", ps, depth,
+                                       &usr->other_sids_attrib[i]))
+                               return False;
+               }
+       
+               for (i = 0; i < usr->num_other_sids; i++) {
+                       if(!smb_io_dom_sid2("", &usr->other_sids[i], ps, depth)) /* other domain SIDs */
+                               return False;
+               }
+
+               depth--;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_sam_logon(const char *desc, NET_Q_SAM_LOGON *q_l, prs_struct *ps, int depth)
+{
+       if (q_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_sam_logon");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!smb_io_sam_info("", &q_l->sam_id, ps, depth))
+               return False;
+
+       if(!prs_align_uint16(ps))
+               return False;
+       
+       if(!prs_uint16("validation_level", ps, depth, &q_l->validation_level))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_sam_logon(const char *desc, NET_R_SAM_LOGON *r_l, prs_struct *ps, int depth)
+{
+       if (r_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_sam_logon");
+       depth++;
+
+       if(!prs_uint32("buffer_creds", ps, depth, &r_l->buffer_creds)) /* undocumented buffer pointer */
+               return False;
+       if (&r_l->buffer_creds) {
+               if(!smb_io_cred("", &r_l->srv_creds, ps, depth)) /* server credentials.  server time stamp appears to be ignored. */
+                       return False;
+       }
+
+       if(!prs_uint16("switch_value", ps, depth, &r_l->switch_value))
+               return False;
+       if(!prs_align(ps))
+               return False;
+
+#if 1 /* W2k always needs this - even for bad passwd. JRA */
+       if(!net_io_user_info3("", r_l->user, ps, depth, r_l->switch_value, False))
+               return False;
+#else
+       if (r_l->switch_value != 0) {
+               if(!net_io_user_info3("", r_l->user, ps, depth, r_l->switch_value, False))
+                       return False;
+       }
+#endif
+
+       if(!prs_uint32("auth_resp   ", ps, depth, &r_l->auth_resp)) /* 1 - Authoritative response; 0 - Non-Auth? */
+               return False;
+
+       if(!prs_ntstatus("status      ", ps, depth, &r_l->status))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_q_sam_logoff(const char *desc,  NET_Q_SAM_LOGOFF *q_l, prs_struct *ps, int depth)
+{
+       if (q_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_sam_logoff");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!smb_io_sam_info("", &q_l->sam_id, ps, depth))           /* domain SID */
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes a structure.
+********************************************************************/
+
+BOOL net_io_r_sam_logoff(const char *desc, NET_R_SAM_LOGOFF *r_l, prs_struct *ps, int depth)
+{
+       if (r_l == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_sam_logoff");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_uint32("buffer_creds", ps, depth, &r_l->buffer_creds)) /* undocumented buffer pointer */
+               return False;
+       if(!smb_io_cred("", &r_l->srv_creds, ps, depth)) /* server credentials.  server time stamp appears to be ignored. */
+               return False;
+
+       if(!prs_ntstatus("status      ", ps, depth, &r_l->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+makes a NET_Q_SAM_SYNC structure.
+********************************************************************/
+BOOL init_net_q_sam_sync(NET_Q_SAM_SYNC * q_s, const char *srv_name,
+                         const char *cli_name, DOM_CRED *cli_creds, 
+                         DOM_CRED *ret_creds, uint32 database_id, 
+                        uint32 next_rid)
+{
+       DEBUG(5, ("init_q_sam_sync\n"));
+
+       init_unistr2(&q_s->uni_srv_name, srv_name, UNI_STR_TERMINATE);
+       init_unistr2(&q_s->uni_cli_name, cli_name, UNI_STR_TERMINATE);
+
+        if (cli_creds)
+                memcpy(&q_s->cli_creds, cli_creds, sizeof(q_s->cli_creds));
+
+       if (cli_creds)
+                memcpy(&q_s->ret_creds, ret_creds, sizeof(q_s->ret_creds));
+       else
+               memset(&q_s->ret_creds, 0, sizeof(q_s->ret_creds));
+
+       q_s->database_id = database_id;
+       q_s->restart_state = 0;
+       q_s->sync_context = next_rid;
+       q_s->max_size = 0xffff;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL net_io_q_sam_sync(const char *desc, NET_Q_SAM_SYNC * q_s, prs_struct *ps,
+                      int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_q_sam_sync");
+       depth++;
+
+       if (!smb_io_unistr2("", &q_s->uni_srv_name, True, ps, depth))
+                return False;
+       if (!smb_io_unistr2("", &q_s->uni_cli_name, True, ps, depth))
+                return False;
+
+       if (!smb_io_cred("", &q_s->cli_creds, ps, depth))
+                return False;
+       if (!smb_io_cred("", &q_s->ret_creds, ps, depth))
+                return False;
+
+       if (!prs_uint32("database_id  ", ps, depth, &q_s->database_id))
+                return False;
+       if (!prs_uint32("restart_state", ps, depth, &q_s->restart_state))
+                return False;
+       if (!prs_uint32("sync_context ", ps, depth, &q_s->sync_context))
+                return False;
+
+       if (!prs_uint32("max_size", ps, depth, &q_s->max_size))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_delta_hdr(const char *desc, SAM_DELTA_HDR * delta,
+                                prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_delta_hdr");
+       depth++;
+
+       if (!prs_uint16("type", ps, depth, &delta->type))
+                return False;
+       if (!prs_uint16("type2", ps, depth, &delta->type2))
+                return False;
+       if (!prs_uint32("target_rid", ps, depth, &delta->target_rid))
+                return False;
+
+       if (!prs_uint32("type3", ps, depth, &delta->type3))
+                return False;
+
+        /* Not sure why we need this but it seems to be necessary to get
+           sam deltas working. */
+
+        if (delta->type != 0x16) {
+                if (!prs_uint32("ptr_delta", ps, depth, &delta->ptr_delta))
+                        return False;
+        }
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_delta_mod_count(const char *desc, SAM_DELTA_MOD_COUNT *info,
+                                   prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_delta_stamp");
+       depth++;
+
+        if (!prs_uint32("seqnum", ps, depth, &info->seqnum))
+                return False;
+        if (!prs_uint32("dom_mod_count_ptr", ps, depth, 
+                        &info->dom_mod_count_ptr))
+                return False;
+
+        if (info->dom_mod_count_ptr) {
+                if (!prs_uint64("dom_mod_count", ps, depth,
+                                &info->dom_mod_count))
+                        return False;
+        }
+
+        return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_domain_info(const char *desc, SAM_DOMAIN_INFO * info,
+                                  prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_domain_info");
+       depth++;
+
+       if (!smb_io_unihdr("hdr_dom_name", &info->hdr_dom_name, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_oem_info", &info->hdr_oem_info, ps, depth))
+                return False;
+
+        if (!prs_uint64("force_logoff", ps, depth, &info->force_logoff))
+                return False;
+       if (!prs_uint16("min_pwd_len", ps, depth, &info->min_pwd_len))
+                return False;
+       if (!prs_uint16("pwd_history_len", ps, depth, &info->pwd_history_len))
+                return False;
+       if (!prs_uint64("max_pwd_age", ps, depth, &info->max_pwd_age))
+                return False;
+       if (!prs_uint64("min_pwd_age", ps, depth, &info->min_pwd_age))
+                return False;
+       if (!prs_uint64("dom_mod_count", ps, depth, &info->dom_mod_count))
+                return False;
+       if (!smb_io_time("creation_time", &info->creation_time, ps, depth))
+                return False;
+       if (!prs_uint32("security_information", ps, depth, &info->security_information))
+               return False;
+       if (!smb_io_bufhdr4("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+               return False;
+       if (!smb_io_lockout_string_hdr("hdr_account_lockout_string", &info->hdr_account_lockout, ps, depth))
+               return False;
+       if (!smb_io_unihdr("hdr_unknown2", &info->hdr_unknown2, ps, depth))
+               return False;
+       if (!smb_io_unihdr("hdr_unknown3", &info->hdr_unknown3, ps, depth))
+               return False;
+       if (!smb_io_unihdr("hdr_unknown4", &info->hdr_unknown4, ps, depth))
+               return False;
+       if (!prs_uint32("logon_chgpass", ps, depth, &info->logon_chgpass))
+               return False;
+       if (!prs_uint32("unknown6", ps, depth, &info->unknown6))
+               return False;
+       if (!prs_uint32("unknown7", ps, depth, &info->unknown7))
+               return False;
+       if (!prs_uint32("unknown8", ps, depth, &info->unknown8))
+               return False;
+
+       if (!smb_io_unistr2("uni_dom_name", &info->uni_dom_name,
+                            info->hdr_dom_name.buffer, ps, depth))
+                return False;
+       if (!smb_io_unistr2("buf_oem_info", &info->buf_oem_info,
+                            info->hdr_oem_info.buffer, ps, depth))
+                return False;
+
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+                return False;
+
+       if (!smb_io_account_lockout_str("account_lockout", &info->account_lockout, 
+                                       info->hdr_account_lockout.buffer, ps, depth))
+               return False;
+
+       if (!smb_io_unistr2("buf_unknown2", &info->buf_unknown2, 
+                           info->hdr_unknown2.buffer, ps, depth))
+               return False;
+       if (!smb_io_unistr2("buf_unknown3", &info->buf_unknown3, 
+                           info->hdr_unknown3.buffer, ps, depth))
+               return False;
+       if (!smb_io_unistr2("buf_unknown4", &info->buf_unknown4, 
+                           info->hdr_unknown4.buffer, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_group_info(const char *desc, SAM_GROUP_INFO * info,
+                                 prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_group_info");
+       depth++;
+
+       if (!smb_io_unihdr("hdr_grp_name", &info->hdr_grp_name, ps, depth))
+                return False;
+       if (!smb_io_gid("gid", &info->gid, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_grp_desc", &info->hdr_grp_desc, ps, depth))
+                return False;
+       if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+                return False;
+
+        if (ps->data_offset + 48 > ps->buffer_size)
+                return False;
+       ps->data_offset += 48;
+
+       if (!smb_io_unistr2("uni_grp_name", &info->uni_grp_name,
+                            info->hdr_grp_name.buffer, ps, depth))
+                return False;
+       if (!smb_io_unistr2("uni_grp_desc", &info->uni_grp_desc,
+                            info->hdr_grp_desc.buffer, ps, depth))
+                return False;
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_passwd_info(const char *desc, SAM_PWD * pwd,
+                                  prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_passwd_info");
+       depth++;
+
+       if (!prs_uint32("unk_0 ", ps, depth, &pwd->unk_0))
+                return False;
+
+       if (!smb_io_unihdr("hdr_lm_pwd", &pwd->hdr_lm_pwd, ps, depth))
+                return False;
+       if (!prs_uint8s(False, "buf_lm_pwd", ps, depth, pwd->buf_lm_pwd, 16))
+                return False;
+
+       if (!smb_io_unihdr("hdr_nt_pwd", &pwd->hdr_nt_pwd, ps, depth))
+                return False;
+       if (!prs_uint8s(False, "buf_nt_pwd", ps, depth, pwd->buf_nt_pwd, 16))
+                return False;
+
+       if (!smb_io_unihdr("", &pwd->hdr_empty_lm, ps, depth))
+                return False;
+       if (!smb_io_unihdr("", &pwd->hdr_empty_nt, ps, depth))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+makes a SAM_ACCOUNT_INFO structure.
+********************************************************************/
+BOOL make_sam_account_info(SAM_ACCOUNT_INFO * info,
+                          const UNISTR2 *user_name,
+                          const UNISTR2 *full_name,
+                          uint32 user_rid, uint32 group_rid,
+                          const UNISTR2 *home_dir,
+                          const UNISTR2 *dir_drive,
+                          const UNISTR2 *log_scr,
+                          const UNISTR2 *desc,
+                          uint32 acb_info,
+                          const UNISTR2 *prof_path,
+                          const UNISTR2 *wkstas,
+                          const UNISTR2 *unk_str, const UNISTR2 *mung_dial)
+{
+       int len_user_name = user_name != NULL ? user_name->uni_str_len : 0;
+       int len_full_name = full_name != NULL ? full_name->uni_str_len : 0;
+       int len_home_dir = home_dir != NULL ? home_dir->uni_str_len : 0;
+       int len_dir_drive = dir_drive != NULL ? dir_drive->uni_str_len : 0;
+       int len_logon_script = log_scr != NULL ? log_scr->uni_str_len : 0;
+       int len_profile_path = prof_path != NULL ? prof_path->uni_str_len : 0;
+       int len_description = desc != NULL ? desc->uni_str_len : 0;
+       int len_workstations = wkstas != NULL ? wkstas->uni_str_len : 0;
+       int len_unknown_str = unk_str != NULL ? unk_str->uni_str_len : 0;
+       int len_munged_dial = mung_dial != NULL ? mung_dial->uni_str_len : 0;
+
+       DEBUG(5, ("make_sam_account_info\n"));
+
+       make_uni_hdr(&info->hdr_acct_name, len_user_name);
+       make_uni_hdr(&info->hdr_full_name, len_full_name);
+       make_uni_hdr(&info->hdr_home_dir, len_home_dir);
+       make_uni_hdr(&info->hdr_dir_drive, len_dir_drive);
+       make_uni_hdr(&info->hdr_logon_script, len_logon_script);
+       make_uni_hdr(&info->hdr_profile, len_profile_path);
+       make_uni_hdr(&info->hdr_acct_desc, len_description);
+       make_uni_hdr(&info->hdr_workstations, len_workstations);
+       make_uni_hdr(&info->hdr_comment, len_unknown_str);
+       make_uni_hdr(&info->hdr_parameters, len_munged_dial);
+
+       /* not present */
+       make_bufhdr2(&info->hdr_sec_desc, 0, 0, 0);
+
+       info->user_rid = user_rid;
+       info->group_rid = group_rid;
+
+       init_nt_time(&info->logon_time);
+       init_nt_time(&info->logoff_time);
+       init_nt_time(&info->pwd_last_set_time);
+       init_nt_time(&info->acct_expiry_time);
+
+       info->logon_divs = 0xA8;
+       info->ptr_logon_hrs = 0;        /* Don't care right now */
+
+       info->bad_pwd_count = 0;
+       info->logon_count = 0;
+       info->acb_info = acb_info;
+       info->nt_pwd_present = 0;
+       info->lm_pwd_present = 0;
+       info->pwd_expired = 0;
+       info->country = 0;
+       info->codepage = 0;
+
+       info->unknown1 = 0x4EC;
+       info->unknown2 = 0;
+
+       copy_unistr2(&info->uni_acct_name, user_name);
+       copy_unistr2(&info->uni_full_name, full_name);
+       copy_unistr2(&info->uni_home_dir, home_dir);
+       copy_unistr2(&info->uni_dir_drive, dir_drive);
+       copy_unistr2(&info->uni_logon_script, log_scr);
+       copy_unistr2(&info->uni_profile, prof_path);
+       copy_unistr2(&info->uni_acct_desc, desc);
+       copy_unistr2(&info->uni_workstations, wkstas);
+       copy_unistr2(&info->uni_comment, unk_str);
+       copy_unistr2(&info->uni_parameters, mung_dial);
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_account_info(const char *desc, SAM_ACCOUNT_INFO *info,
+                               prs_struct *ps, int depth)
+{
+       BUFHDR2 hdr_priv_data;
+       uint32 i;
+
+       prs_debug(ps, depth, desc, "net_io_sam_account_info");
+       depth++;
+
+       if (!smb_io_unihdr("hdr_acct_name", &info->hdr_acct_name, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_full_name", &info->hdr_full_name, ps, depth))
+                return False;
+
+       if (!prs_uint32("user_rid ", ps, depth, &info->user_rid))
+                return False;
+       if (!prs_uint32("group_rid", ps, depth, &info->group_rid))
+                return False;
+
+       if (!smb_io_unihdr("hdr_home_dir ", &info->hdr_home_dir, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_dir_drive", &info->hdr_dir_drive, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_logon_script", &info->hdr_logon_script, ps,
+                           depth))
+                return False;
+
+       if (!smb_io_unihdr("hdr_acct_desc", &info->hdr_acct_desc, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_workstations", &info->hdr_workstations, ps,
+                           depth))
+                return False;
+
+       if (!smb_io_time("logon_time", &info->logon_time, ps, depth))
+                return False;
+       if (!smb_io_time("logoff_time", &info->logoff_time, ps, depth))
+                return False;
+
+       if (!prs_uint32("logon_divs   ", ps, depth, &info->logon_divs))
+                return False;
+       if (!prs_uint32("ptr_logon_hrs", ps, depth, &info->ptr_logon_hrs))
+                return False;
+
+       if (!prs_uint16("bad_pwd_count", ps, depth, &info->bad_pwd_count))
+                return False;
+       if (!prs_uint16("logon_count", ps, depth, &info->logon_count))
+                return False;
+       if (!smb_io_time("pwd_last_set_time", &info->pwd_last_set_time, ps,
+                         depth))
+                return False;
+       if (!smb_io_time("acct_expiry_time", &info->acct_expiry_time, ps, 
+                         depth))
+                return False;
+
+       if (!prs_uint32("acb_info", ps, depth, &info->acb_info))
+                return False;
+       if (!prs_uint8s(False, "nt_pwd", ps, depth, info->nt_pwd, 16))
+                return False;
+       if (!prs_uint8s(False, "lm_pwd", ps, depth, info->lm_pwd, 16))
+                return False;
+       if (!prs_uint8("lm_pwd_present", ps, depth, &info->lm_pwd_present))
+                return False;
+       if (!prs_uint8("nt_pwd_present", ps, depth, &info->nt_pwd_present))
+                return False;
+       if (!prs_uint8("pwd_expired", ps, depth, &info->pwd_expired))
+                return False;
+
+       if (!smb_io_unihdr("hdr_comment", &info->hdr_comment, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_parameters", &info->hdr_parameters, ps, 
+                           depth))
+                return False;
+       if (!prs_uint16("country", ps, depth, &info->country))
+                return False;
+       if (!prs_uint16("codepage", ps, depth, &info->codepage))
+                return False;
+
+       if (!smb_io_bufhdr2("hdr_priv_data", &hdr_priv_data, ps, depth))
+                return False;
+       if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_profile", &info->hdr_profile, ps, depth))
+                return False;
+
+       for (i = 0; i < 3; i++)
+       {
+               if (!smb_io_unihdr("hdr_reserved", &info->hdr_reserved[i], 
+                                   ps, depth))
+                        return False;                                          
+       }
+
+       for (i = 0; i < 4; i++)
+       {
+               if (!prs_uint32("dw_reserved", ps, depth, 
+                                &info->dw_reserved[i]))
+                        return False;
+       }
+
+       if (!smb_io_unistr2("uni_acct_name", &info->uni_acct_name,
+                            info->hdr_acct_name.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_full_name", &info->uni_full_name,
+                            info->hdr_full_name.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_home_dir ", &info->uni_home_dir,
+                            info->hdr_home_dir.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_dir_drive", &info->uni_dir_drive,
+                            info->hdr_dir_drive.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_logon_script", &info->uni_logon_script,
+                            info->hdr_logon_script.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_acct_desc", &info->uni_acct_desc,
+                            info->hdr_acct_desc.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_workstations", &info->uni_workstations,
+                            info->hdr_workstations.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+
+       if (!prs_uint32("unknown1", ps, depth, &info->unknown1))
+                return False;
+       if (!prs_uint32("unknown2", ps, depth, &info->unknown2))
+                return False;
+
+       if (!smb_io_rpc_blob("buf_logon_hrs", &info->buf_logon_hrs, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_comment", &info->uni_comment,
+                            info->hdr_comment.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_parameters", &info->uni_parameters,
+                            info->hdr_parameters.buffer, ps, depth))
+                return False;
+       prs_align(ps);
+       if (hdr_priv_data.buffer != 0)
+       {
+               int old_offset = 0;
+               uint32 len = 0x44;
+               if (!prs_uint32("pwd_len", ps, depth, &len))
+                        return False;
+               old_offset = ps->data_offset;
+               if (len > 0)
+               {
+                       if (ps->io)
+                       {
+                               /* reading */
+                                if (!prs_hash1(ps, ps->data_offset, len))
+                                        return False;
+                       }
+                       if (!net_io_sam_passwd_info("pass", &info->pass, 
+                                                    ps, depth))
+                                return False;
+
+                       if (!ps->io)
+                       {
+                               /* writing */
+                                if (!prs_hash1(ps, old_offset, len))
+                                        return False;
+                       }
+               }
+                if (old_offset + len > ps->buffer_size)
+                        return False;
+               ps->data_offset = old_offset + len;
+       }
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+                return False;
+       prs_align(ps);
+       if (!smb_io_unistr2("uni_profile", &info->uni_profile,
+                            info->hdr_profile.buffer, ps, depth))
+                return False;
+
+       prs_align(ps);
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_group_mem_info(const char *desc, SAM_GROUP_MEM_INFO * info,
+                                     prs_struct *ps, int depth)
+{
+       uint32 i;
+       fstring tmp;
+
+       prs_debug(ps, depth, desc, "net_io_sam_group_mem_info");
+       depth++;
+
+       prs_align(ps);
+       if (!prs_uint32("ptr_rids   ", ps, depth, &info->ptr_rids))
+                return False;
+       if (!prs_uint32("ptr_attribs", ps, depth, &info->ptr_attribs))
+                return False;
+       if (!prs_uint32("num_members", ps, depth, &info->num_members))
+                return False;
+
+        if (ps->data_offset + 16 > ps->buffer_size)
+                return False;
+       ps->data_offset += 16;
+
+       if (info->ptr_rids != 0)
+       {
+               if (!prs_uint32("num_members2", ps, depth, 
+                                &info->num_members2))
+                        return False;
+
+               if (info->num_members2 != info->num_members)
+               {
+                       /* RPC fault */
+                       return False;
+               }
+
+                info->rids = TALLOC_ARRAY(ps->mem_ctx, uint32, info->num_members2);
+
+                if (info->rids == NULL) {
+                        DEBUG(0, ("out of memory allocating %d rids\n",
+                                  info->num_members2));
+                        return False;
+                }
+
+               for (i = 0; i < info->num_members2; i++)
+               {
+                       slprintf(tmp, sizeof(tmp) - 1, "rids[%02d]", i);
+                       if (!prs_uint32(tmp, ps, depth, &info->rids[i]))
+                                return False;
+               }
+       }
+
+       if (info->ptr_attribs != 0)
+       {
+               if (!prs_uint32("num_members3", ps, depth, 
+                                &info->num_members3))
+                        return False;
+               if (info->num_members3 != info->num_members)
+               {
+                       /* RPC fault */
+                       return False;
+               }
+
+                info->attribs = TALLOC_ARRAY(ps->mem_ctx, uint32, info->num_members3);
+
+                if (info->attribs == NULL) {
+                        DEBUG(0, ("out of memory allocating %d attribs\n",
+                                  info->num_members3));
+                        return False;
+                }
+
+               for (i = 0; i < info->num_members3; i++)
+               {
+                       slprintf(tmp, sizeof(tmp) - 1, "attribs[%02d]", i);
+                       if (!prs_uint32(tmp, ps, depth, &info->attribs[i]))
+                                return False;
+               }
+       }
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_alias_info(const char *desc, SAM_ALIAS_INFO * info,
+                                 prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_alias_info");
+       depth++;
+
+       if (!smb_io_unihdr("hdr_als_name", &info->hdr_als_name, ps, depth))
+                return False;
+       if (!prs_uint32("als_rid", ps, depth, &info->als_rid))
+                return False;
+       if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+                return False;
+       if (!smb_io_unihdr("hdr_als_desc", &info->hdr_als_desc, ps, depth))
+                return False;
+
+        if (ps->data_offset + 40 > ps->buffer_size)
+                return False;
+       ps->data_offset += 40;
+
+       if (!smb_io_unistr2("uni_als_name", &info->uni_als_name,
+                            info->hdr_als_name.buffer, ps, depth))
+                return False;
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+                return False;
+
+       if (!smb_io_unistr2("uni_als_desc", &info->uni_als_desc,
+                           info->hdr_als_desc.buffer, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_alias_mem_info(const char *desc, SAM_ALIAS_MEM_INFO * info,
+                                     prs_struct *ps, int depth)
+{
+       uint32 i;
+       fstring tmp;
+
+       prs_debug(ps, depth, desc, "net_io_sam_alias_mem_info");
+       depth++;
+
+       prs_align(ps);
+       if (!prs_uint32("num_members", ps, depth, &info->num_members))
+                return False;
+       if (!prs_uint32("ptr_members", ps, depth, &info->ptr_members))
+                return False;
+
+       if (ps->data_offset + 16 > ps->buffer_size)
+               return False;
+       ps->data_offset += 16;
+
+       if (info->ptr_members != 0)
+       {
+               if (!prs_uint32("num_sids", ps, depth, &info->num_sids))
+                        return False;
+               if (info->num_sids != info->num_members)
+               {
+                       /* RPC fault */
+                       return False;
+               }
+
+                info->ptr_sids = TALLOC_ARRAY(ps->mem_ctx, uint32, info->num_sids);
+                
+                if (info->ptr_sids == NULL) {
+                        DEBUG(0, ("out of memory allocating %d ptr_sids\n",
+                                  info->num_sids));
+                        return False;
+                }
+
+               for (i = 0; i < info->num_sids; i++)
+               {
+                       slprintf(tmp, sizeof(tmp) - 1, "ptr_sids[%02d]", i);
+                       if (!prs_uint32(tmp, ps, depth, &info->ptr_sids[i]))
+                                return False;
+               }
+
+                info->sids = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, info->num_sids);
+
+                if (info->sids == NULL) {
+                        DEBUG(0, ("error allocating %d sids\n",
+                                  info->num_sids));
+                        return False;
+                }
+
+               for (i = 0; i < info->num_sids; i++)
+               {
+                       if (info->ptr_sids[i] != 0)
+                       {
+                               slprintf(tmp, sizeof(tmp) - 1, "sids[%02d]",
+                                        i);
+                               if (!smb_io_dom_sid2(tmp, &info->sids[i], 
+                                                     ps, depth))
+                                        return False;
+                       }
+               }
+       }
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_policy_info(const char *desc, SAM_DELTA_POLICY *info,
+                                     prs_struct *ps, int depth)
+{
+       unsigned int i;
+       prs_debug(ps, depth, desc, "net_io_sam_policy_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("max_log_size", ps, depth, &info->max_log_size))
+                return False;
+       if (!prs_uint64("audit_retention_period", ps, depth,
+                       &info->audit_retention_period))
+                return False;
+       if (!prs_uint32("auditing_mode", ps, depth, &info->auditing_mode))
+                return False;
+       if (!prs_uint32("num_events", ps, depth, &info->num_events))
+                return False;
+       if (!prs_uint32("ptr_events", ps, depth, &info->ptr_events))
+                return False;
+
+       if (!smb_io_unihdr("hdr_dom_name", &info->hdr_dom_name, ps, depth))
+               return False;
+
+       if (!prs_uint32("sid_ptr", ps, depth, &info->sid_ptr))
+                return False;
+
+       if (!prs_uint32("paged_pool_limit", ps, depth, &info->paged_pool_limit))
+                return False;
+       if (!prs_uint32("non_paged_pool_limit", ps, depth,
+                       &info->non_paged_pool_limit))
+                return False;
+       if (!prs_uint32("min_workset_size", ps, depth, &info->min_workset_size))
+                return False;
+       if (!prs_uint32("max_workset_size", ps, depth, &info->max_workset_size))
+                return False;
+       if (!prs_uint32("page_file_limit", ps, depth, &info->page_file_limit))
+                return False;
+       if (!prs_uint64("time_limit", ps, depth, &info->time_limit))
+                return False;
+       if (!smb_io_time("modify_time", &info->modify_time, ps, depth))
+                return False;
+       if (!smb_io_time("create_time", &info->create_time, ps, depth))
+                return False;
+       if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+                return False;
+
+       for (i=0; i<4; i++) {
+               UNIHDR dummy;
+               if (!smb_io_unihdr("dummy", &dummy, ps, depth))
+                       return False;
+       }
+
+       for (i=0; i<4; i++) {
+               uint32 reserved;
+               if (!prs_uint32("reserved", ps, depth, &reserved))
+                       return False;
+       }
+
+       if (!prs_uint32("num_event_audit_options", ps, depth,
+                       &info->num_event_audit_options))
+                return False;
+
+       for (i=0; i<info->num_event_audit_options; i++)
+               if (!prs_uint32("event_audit_option", ps, depth,
+                               &info->event_audit_option))
+                       return False;
+
+       if (!smb_io_unistr2("domain_name", &info->domain_name, True, ps, depth))
+                return False;
+
+       if(!smb_io_dom_sid2("domain_sid", &info->domain_sid, ps, depth))
+               return False;
+
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+
+               return False;
+
+       return True;
+}
+
+#if 0
+
+/* This function is pretty broken - see bug #334 */
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_trustdoms_info(const char *desc, SAM_DELTA_TRUSTDOMS *info,
+                                     prs_struct *ps, int depth)
+{
+       int i;
+
+       prs_debug(ps, depth, desc, "net_io_sam_trustdoms_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("buf_size", ps, depth, &info->buf_size))
+                return False;
+
+       if(!sec_io_desc("sec_desc", &info->sec_desc, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &info->sid, ps, depth))
+               return False;
+
+       if(!smb_io_unihdr("hdr_domain", &info->hdr_domain, ps, depth))
+               return False;
+
+       if(!prs_uint32("unknown0", ps, depth, &info->unknown0))
+                return False;
+       if(!prs_uint32("unknown1", ps, depth, &info->unknown1))
+                return False;
+       if(!prs_uint32("unknown2", ps, depth, &info->unknown2))
+                return False;
+
+       if(!prs_uint32("buf_size2", ps, depth, &info->buf_size2))
+                return False;
+       if(!prs_uint32("ptr", ps, depth, &info->ptr))
+                return False;
+
+       for (i=0; i<12; i++)
+               if(!prs_uint32("unknown3", ps, depth, &info->unknown3))
+                       return False;
+
+       if (!smb_io_unistr2("domain", &info->domain, True, ps, depth))
+                return False;
+
+       return True;
+}
+
+#endif
+
+#if 0
+
+/* This function doesn't work - see bug #334 */
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_secret_info(const char *desc, SAM_DELTA_SECRET *info,
+                                  prs_struct *ps, int depth)
+{
+       int i;
+
+       prs_debug(ps, depth, desc, "net_io_sam_secret_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("buf_size", ps, depth, &info->buf_size))
+                return False;
+
+       if(!sec_io_desc("sec_desc", &info->sec_desc, ps, depth))
+               return False;
+
+       if (!smb_io_unistr2("secret", &info->secret, True, ps, depth))
+                return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("count1", ps, depth, &info->count1))
+                return False;
+       if(!prs_uint32("count2", ps, depth, &info->count2))
+                return False;
+       if(!prs_uint32("ptr", ps, depth, &info->ptr))
+                return False;
+
+
+       if(!smb_io_time("time1", &info->time1, ps, depth)) /* logon time */
+               return False;
+       if(!prs_uint32("count3", ps, depth, &info->count3))
+                return False;
+       if(!prs_uint32("count4", ps, depth, &info->count4))
+                return False;
+       if(!prs_uint32("ptr2", ps, depth, &info->ptr2))
+                return False;
+       if(!smb_io_time("time2", &info->time2, ps, depth)) /* logon time */
+               return False;
+       if(!prs_uint32("unknow1", ps, depth, &info->unknow1))
+                return False;
+
+
+       if(!prs_uint32("buf_size2", ps, depth, &info->buf_size2))
+                return False;
+       if(!prs_uint32("ptr3", ps, depth, &info->ptr3))
+                return False;
+       for(i=0; i<12; i++)
+               if(!prs_uint32("unknow2", ps, depth, &info->unknow2))
+                       return False;
+
+       if(!prs_uint32("chal_len", ps, depth, &info->chal_len))
+                return False;
+       if(!prs_uint32("reserved1", ps, depth, &info->reserved1))
+                return False;
+       if(!prs_uint32("chal_len2", ps, depth, &info->chal_len2))
+                return False;
+
+       if(!prs_uint8s (False, "chal", ps, depth, info->chal, info->chal_len2))
+               return False;
+
+       if(!prs_uint32("key_len", ps, depth, &info->key_len))
+                return False;
+       if(!prs_uint32("reserved2", ps, depth, &info->reserved2))
+                return False;
+       if(!prs_uint32("key_len2", ps, depth, &info->key_len2))
+                return False;
+
+       if(!prs_uint8s (False, "key", ps, depth, info->key, info->key_len2))
+               return False;
+
+
+       if(!prs_uint32("buf_size3", ps, depth, &info->buf_size3))
+                return False;
+
+       if(!sec_io_desc("sec_desc2", &info->sec_desc2, ps, depth))
+               return False;
+
+
+       return True;
+}
+
+#endif
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_privs_info(const char *desc, SAM_DELTA_PRIVS *info,
+                                     prs_struct *ps, int depth)
+{
+       unsigned int i;
+
+       prs_debug(ps, depth, desc, "net_io_sam_privs_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &info->sid, ps, depth))
+               return False;
+
+       if(!prs_uint32("priv_count", ps, depth, &info->priv_count))
+                return False;
+       if(!prs_uint32("priv_control", ps, depth, &info->priv_control))
+                return False;
+
+       if(!prs_uint32("priv_attr_ptr", ps, depth, &info->priv_attr_ptr))
+                return False;
+       if(!prs_uint32("priv_name_ptr", ps, depth, &info->priv_name_ptr))
+                return False;
+
+       if (!prs_uint32("paged_pool_limit", ps, depth, &info->paged_pool_limit))
+                return False;
+       if (!prs_uint32("non_paged_pool_limit", ps, depth,
+                       &info->non_paged_pool_limit))
+                return False;
+       if (!prs_uint32("min_workset_size", ps, depth, &info->min_workset_size))
+                return False;
+       if (!prs_uint32("max_workset_size", ps, depth, &info->max_workset_size))
+                return False;
+       if (!prs_uint32("page_file_limit", ps, depth, &info->page_file_limit))
+                return False;
+       if (!prs_uint64("time_limit", ps, depth, &info->time_limit))
+                return False;
+       if (!prs_uint32("system_flags", ps, depth, &info->system_flags))
+                return False;
+       if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
+                return False;
+
+       for (i=0; i<4; i++) {
+               UNIHDR dummy;
+               if (!smb_io_unihdr("dummy", &dummy, ps, depth))
+                       return False;
+       }
+
+       for (i=0; i<4; i++) {
+               uint32 reserved;
+               if (!prs_uint32("reserved", ps, depth, &reserved))
+                       return False;
+       }
+
+       if(!prs_uint32("attribute_count", ps, depth, &info->attribute_count))
+                return False;
+
+       info->attributes = TALLOC_ARRAY(ps->mem_ctx, uint32, info->attribute_count);
+
+       for (i=0; i<info->attribute_count; i++)
+               if(!prs_uint32("attributes", ps, depth, &info->attributes[i]))
+                       return False;
+
+       if(!prs_uint32("privlist_count", ps, depth, &info->privlist_count))
+                return False;
+
+       info->hdr_privslist = TALLOC_ARRAY(ps->mem_ctx, UNIHDR, info->privlist_count);
+       info->uni_privslist = TALLOC_ARRAY(ps->mem_ctx, UNISTR2, info->privlist_count);
+
+       for (i=0; i<info->privlist_count; i++)
+               if(!smb_io_unihdr("hdr_privslist", &info->hdr_privslist[i], ps, depth))
+                       return False;
+
+       for (i=0; i<info->privlist_count; i++)
+               if (!smb_io_unistr2("uni_privslist", &info->uni_privslist[i], True, ps, depth))
+                       return False;
+
+       if (!smb_io_rpc_blob("buf_sec_desc", &info->buf_sec_desc, ps, depth))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL net_io_sam_delta_ctr(const char *desc,
+                                SAM_DELTA_CTR * delta, uint16 type,
+                                prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_sam_delta_ctr");
+       depth++;
+
+       switch (type) {
+                /* Seen in sam deltas */
+                case SAM_DELTA_MODIFIED_COUNT:
+                        if (!net_io_sam_delta_mod_count("", &delta->mod_count, ps, depth))
+                                return False;
+                        break;
+
+               case SAM_DELTA_DOMAIN_INFO:
+                       if (!net_io_sam_domain_info("", &delta->domain_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_GROUP_INFO:
+                       if (!net_io_sam_group_info("", &delta->group_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_ACCOUNT_INFO:
+                       if (!net_io_sam_account_info("", &delta->account_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_GROUP_MEM:
+                       if (!net_io_sam_group_mem_info("", &delta->grp_mem_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_ALIAS_INFO:
+                        if (!net_io_sam_alias_info("", &delta->alias_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_POLICY_INFO:
+                        if (!net_io_sam_policy_info("", &delta->policy_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_ALIAS_MEM:
+                       if (!net_io_sam_alias_mem_info("", &delta->als_mem_info, ps, depth))
+                                return False;
+                       break;
+
+               case SAM_DELTA_PRIVS_INFO:
+                       if (!net_io_sam_privs_info("", &delta->privs_info, ps, depth))
+                                return False;
+                       break;
+
+                       /* These guys are implemented but broken */
+
+               case SAM_DELTA_TRUST_DOMS:
+               case SAM_DELTA_SECRET_INFO:
+                       break;
+
+                       /* These guys are not implemented yet */
+
+               case SAM_DELTA_RENAME_GROUP:
+               case SAM_DELTA_RENAME_USER:
+               case SAM_DELTA_RENAME_ALIAS:
+               case SAM_DELTA_DELETE_GROUP:
+               case SAM_DELTA_DELETE_USER:
+               default:
+                       DEBUG(0, ("Replication error: Unknown delta type 0x%x\n", type));
+                       break;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL net_io_r_sam_sync(const char *desc,
+                      NET_R_SAM_SYNC * r_s, prs_struct *ps, int depth)
+{
+       uint32 i;
+
+       prs_debug(ps, depth, desc, "net_io_r_sam_sync");
+       depth++;
+
+       if (!smb_io_cred("srv_creds", &r_s->srv_creds, ps, depth))
+                return False;
+       if (!prs_uint32("sync_context", ps, depth, &r_s->sync_context))
+                return False;
+
+       if (!prs_uint32("ptr_deltas", ps, depth, &r_s->ptr_deltas))
+                return False;
+       if (r_s->ptr_deltas != 0)
+       {
+               if (!prs_uint32("num_deltas ", ps, depth, &r_s->num_deltas))
+                        return False;
+               if (!prs_uint32("ptr_deltas2", ps, depth, &r_s->ptr_deltas2))
+                        return False;
+               if (r_s->ptr_deltas2 != 0)
+               {
+                       if (!prs_uint32("num_deltas2", ps, depth,
+                                        &r_s->num_deltas2))
+                                return False;
+
+                       if (r_s->num_deltas2 != r_s->num_deltas)
+                       {
+                               /* RPC fault */
+                               return False;
+                       }
+
+                        if (r_s->num_deltas2 > 0) {
+                                r_s->hdr_deltas = TALLOC_ARRAY(ps->mem_ctx, SAM_DELTA_HDR, r_s->num_deltas2);
+                                if (r_s->hdr_deltas == NULL) {
+                                        DEBUG(0, ("error tallocating memory "
+                                                  "for %d delta headers\n", 
+                                                  r_s->num_deltas2));
+                                        return False;
+                                }
+                        }
+
+                       for (i = 0; i < r_s->num_deltas2; i++)
+                       {
+                               if (!net_io_sam_delta_hdr("", 
+                                                          &r_s->hdr_deltas[i],
+                                                          ps, depth))
+                                        return False;
+                       }
+
+                        if (r_s->num_deltas2 > 0) {
+                                r_s->deltas = TALLOC_ARRAY(ps->mem_ctx, SAM_DELTA_CTR, r_s->num_deltas2);
+                                if (r_s->deltas == NULL) {
+                                        DEBUG(0, ("error tallocating memory "
+                                                  "for %d deltas\n", 
+                                                  r_s->num_deltas2));
+                                        return False;
+                                }
+                        }
+
+                       for (i = 0; i < r_s->num_deltas2; i++)
+                       {
+                               if (!net_io_sam_delta_ctr(
+                                        "", &r_s->deltas[i],
+                                        r_s->hdr_deltas[i].type3,
+                                        ps, depth)) {
+                                        DEBUG(0, ("hmm, failed on i=%d\n", i));
+                                        return False;
+                                }
+                       }
+               }
+       }
+
+       prs_align(ps);
+       if (!prs_ntstatus("status", ps, depth, &(r_s->status)))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+makes a NET_Q_SAM_DELTAS structure.
+********************************************************************/
+BOOL init_net_q_sam_deltas(NET_Q_SAM_DELTAS *q_s, const char *srv_name, 
+                           const char *cli_name, DOM_CRED *cli_creds, 
+                           uint32 database_id, UINT64_S dom_mod_count)
+{
+       DEBUG(5, ("init_net_q_sam_deltas\n"));
+
+       init_unistr2(&q_s->uni_srv_name, srv_name, UNI_STR_TERMINATE);
+       init_unistr2(&q_s->uni_cli_name, cli_name, UNI_STR_TERMINATE);
+
+       memcpy(&q_s->cli_creds, cli_creds, sizeof(q_s->cli_creds));
+       memset(&q_s->ret_creds, 0, sizeof(q_s->ret_creds));
+
+       q_s->database_id = database_id;
+        q_s->dom_mod_count.low = dom_mod_count.low;
+        q_s->dom_mod_count.high = dom_mod_count.high;
+       q_s->max_size = 0xffff;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL net_io_q_sam_deltas(const char *desc, NET_Q_SAM_DELTAS *q_s, prs_struct *ps,
+                         int depth)
+{
+       prs_debug(ps, depth, desc, "net_io_q_sam_deltas");
+       depth++;
+
+       if (!smb_io_unistr2("", &q_s->uni_srv_name, True, ps, depth))
+                return False;
+       if (!smb_io_unistr2("", &q_s->uni_cli_name, True, ps, depth))
+                return False;
+
+       if (!smb_io_cred("", &q_s->cli_creds, ps, depth))
+                return False;
+       if (!smb_io_cred("", &q_s->ret_creds, ps, depth))
+                return False;
+
+       if (!prs_uint32("database_id  ", ps, depth, &q_s->database_id))
+                return False;
+        if (!prs_uint64("dom_mod_count", ps, depth, &q_s->dom_mod_count))
+                return False;
+       if (!prs_uint32("max_size", ps, depth, &q_s->max_size))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL net_io_r_sam_deltas(const char *desc,
+                         NET_R_SAM_DELTAS *r_s, prs_struct *ps, int depth)
+{
+        unsigned int i;
+
+       prs_debug(ps, depth, desc, "net_io_r_sam_deltas");
+       depth++;
+
+       if (!smb_io_cred("srv_creds", &r_s->srv_creds, ps, depth))
+                return False;
+        if (!prs_uint64("dom_mod_count", ps, depth, &r_s->dom_mod_count))
+                return False;
+
+       if (!prs_uint32("ptr_deltas", ps, depth, &r_s->ptr_deltas))
+                return False;
+       if (!prs_uint32("num_deltas", ps, depth, &r_s->num_deltas))
+                return False;
+       if (!prs_uint32("ptr_deltas2", ps, depth, &r_s->num_deltas2))
+                return False;
+
+       if (r_s->num_deltas2 != 0)
+       {
+               if (!prs_uint32("num_deltas2 ", ps, depth, &r_s->num_deltas2))
+                        return False;
+
+               if (r_s->ptr_deltas != 0)
+               {
+                        if (r_s->num_deltas > 0) {
+                                r_s->hdr_deltas = TALLOC_ARRAY(ps->mem_ctx, SAM_DELTA_HDR, r_s->num_deltas);
+                                if (r_s->hdr_deltas == NULL) {
+                                        DEBUG(0, ("error tallocating memory "
+                                                  "for %d delta headers\n", 
+                                                  r_s->num_deltas));
+                                        return False;
+                                }
+                        }
+
+                       for (i = 0; i < r_s->num_deltas; i++)
+                       {
+                               net_io_sam_delta_hdr("", &r_s->hdr_deltas[i],
+                                                      ps, depth);
+                       }
+                        
+                        if (r_s->num_deltas > 0) {
+                                r_s->deltas = TALLOC_ARRAY(ps->mem_ctx, SAM_DELTA_CTR, r_s->num_deltas);
+                                if (r_s->deltas == NULL) {
+                                        DEBUG(0, ("error tallocating memory "
+                                                  "for %d deltas\n", 
+                                                  r_s->num_deltas));
+                                        return False;
+                                }
+                        }
+
+                       for (i = 0; i < r_s->num_deltas; i++)
+                       {
+                               if (!net_io_sam_delta_ctr(
+                                        "",
+                                        &r_s->deltas[i],
+                                        r_s->hdr_deltas[i].type2,
+                                        ps, depth))
+                                        
+                                        return False;
+                       }
+               }
+       }
+
+       prs_align(ps);
+       if (!prs_ntstatus("status", ps, depth, &r_s->status))
+                return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NET_Q_DSR_GETDCNAME structure.
+********************************************************************/
+
+void init_net_q_dsr_getdcname(NET_Q_DSR_GETDCNAME *r_t, const char *server_unc,
+                             const char *domain_name,
+                             struct uuid *domain_guid,
+                             struct uuid *site_guid,
+                             uint32_t flags)
+{
+       DEBUG(5, ("init_net_q_dsr_getdcname\n"));
+
+       r_t->ptr_server_unc = (server_unc != NULL);
+       init_unistr2(&r_t->uni_server_unc, server_unc, UNI_STR_TERMINATE);
+
+       r_t->ptr_domain_name = (domain_name != NULL);
+       init_unistr2(&r_t->uni_domain_name, domain_name, UNI_STR_TERMINATE);
+
+       r_t->ptr_domain_guid = (domain_guid != NULL);
+       r_t->domain_guid = domain_guid;
+
+       r_t->ptr_site_guid = (site_guid != NULL);
+       r_t->site_guid = site_guid;
+
+       r_t->flags = flags;
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_DSR_GETDCNAME structure.
+********************************************************************/
+
+BOOL net_io_q_dsr_getdcname(const char *desc, NET_Q_DSR_GETDCNAME *r_t,
+                           prs_struct *ps, int depth)
+{
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_dsr_getdcname");
+       depth++;
+
+       if (!prs_uint32("ptr_server_unc", ps, depth, &r_t->ptr_server_unc))
+               return False;
+
+       if (!smb_io_unistr2("server_unc", &r_t->uni_server_unc,
+                           r_t->ptr_server_unc, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_domain_name", ps, depth, &r_t->ptr_domain_name))
+               return False;
+
+       if (!smb_io_unistr2("domain_name", &r_t->uni_domain_name,
+                           r_t->ptr_domain_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_domain_guid", ps, depth, &r_t->ptr_domain_guid))
+               return False;
+
+       if (UNMARSHALLING(ps) && (r_t->ptr_domain_guid)) {
+               r_t->domain_guid = PRS_ALLOC_MEM(ps, struct uuid, 1);
+               if (r_t->domain_guid == NULL)
+                       return False;
+       }
+
+       if ((r_t->ptr_domain_guid) &&
+           (!smb_io_uuid("domain_guid", r_t->domain_guid, ps, depth)))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_site_guid", ps, depth, &r_t->ptr_site_guid))
+               return False;
+
+       if (UNMARSHALLING(ps) && (r_t->ptr_site_guid)) {
+               r_t->site_guid = PRS_ALLOC_MEM(ps, struct uuid, 1);
+               if (r_t->site_guid == NULL)
+                       return False;
+       }
+
+       if ((r_t->ptr_site_guid) &&
+           (!smb_io_uuid("site_guid", r_t->site_guid, ps, depth)))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("flags", ps, depth, &r_t->flags))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NET_R_DSR_GETDCNAME structure.
+********************************************************************/
+void init_net_r_dsr_getdcname(NET_R_DSR_GETDCNAME *r_t, const char *dc_unc,
+                             const char *dc_address, int32 dc_address_type,
+                             struct uuid domain_guid, const char *domain_name,
+                             const char *forest_name, uint32 dc_flags,
+                             const char *dc_site_name,
+                             const char *client_site_name)
+{
+       DEBUG(5, ("init_net_q_dsr_getdcname\n"));
+
+       r_t->ptr_dc_unc = (dc_unc != NULL);
+       init_unistr2(&r_t->uni_dc_unc, dc_unc, UNI_STR_TERMINATE);
+
+       r_t->ptr_dc_address = (dc_address != NULL);
+       init_unistr2(&r_t->uni_dc_address, dc_address, UNI_STR_TERMINATE);
+
+       r_t->dc_address_type = dc_address_type;
+       r_t->domain_guid = domain_guid;
+
+       r_t->ptr_domain_name = (domain_name != NULL);
+       init_unistr2(&r_t->uni_domain_name, domain_name, UNI_STR_TERMINATE);
+
+       r_t->ptr_forest_name = (forest_name != NULL);
+       init_unistr2(&r_t->uni_forest_name, forest_name, UNI_STR_TERMINATE);
+
+       r_t->dc_flags = dc_flags;
+
+       r_t->ptr_dc_site_name = (dc_site_name != NULL);
+       init_unistr2(&r_t->uni_dc_site_name, dc_site_name, UNI_STR_TERMINATE);
+
+       r_t->ptr_client_site_name = (client_site_name != NULL);
+       init_unistr2(&r_t->uni_client_site_name, client_site_name,
+                    UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_DSR_GETDCNAME structure.
+********************************************************************/
+
+BOOL net_io_r_dsr_getdcname(const char *desc, NET_R_DSR_GETDCNAME *r_t,
+                           prs_struct *ps, int depth)
+{
+       uint32 info_ptr = 1;
+
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_dsr_getdcname");
+       depth++;
+
+       /* The reply contains *just* an info struct, this is the ptr to it */
+       if (!prs_uint32("info_ptr", ps, depth, &info_ptr))
+               return False;
+
+       if (info_ptr == 0)
+               return False;
+
+       if (!prs_uint32("ptr_dc_unc", ps, depth, &r_t->ptr_dc_unc))
+               return False;
+
+       if (!prs_uint32("ptr_dc_address", ps, depth, &r_t->ptr_dc_address))
+               return False;
+
+       if (!prs_int32("dc_address_type", ps, depth, &r_t->dc_address_type))
+               return False;
+
+       if (!smb_io_uuid("domain_guid", &r_t->domain_guid, ps, depth))
+               return False;
+
+       if (!prs_uint32("ptr_domain_name", ps, depth, &r_t->ptr_domain_name))
+               return False;
+
+       if (!prs_uint32("ptr_forest_name", ps, depth, &r_t->ptr_forest_name))
+               return False;
+
+       if (!prs_uint32("dc_flags", ps, depth, &r_t->dc_flags))
+               return False;
+
+       if (!prs_uint32("ptr_dc_site_name", ps, depth, &r_t->ptr_dc_site_name))
+               return False;
+
+       if (!prs_uint32("ptr_client_site_name", ps, depth,
+                       &r_t->ptr_client_site_name))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("dc_unc", &r_t->uni_dc_unc,
+                           r_t->ptr_dc_unc, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("dc_address", &r_t->uni_dc_address,
+                           r_t->ptr_dc_address, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("domain_name", &r_t->uni_domain_name,
+                           r_t->ptr_domain_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("forest_name", &r_t->uni_forest_name,
+                           r_t->ptr_forest_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("dc_site_name", &r_t->uni_dc_site_name,
+                           r_t->ptr_dc_site_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("client_site_name", &r_t->uni_client_site_name,
+                           r_t->ptr_client_site_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_werror("result", ps, depth, &r_t->result))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits a NET_Q_DSR_GETSITENAME structure.
+********************************************************************/
+
+void init_net_q_dsr_getsitename(NET_Q_DSR_GETSITENAME *r_t, const char *computer_name)
+{
+       DEBUG(5, ("init_net_q_dsr_getsitename\n"));
+
+       r_t->ptr_computer_name = (computer_name != NULL);
+       init_unistr2(&r_t->uni_computer_name, computer_name, UNI_STR_TERMINATE);
+}
+
+/*******************************************************************
+ Reads or writes an NET_Q_DSR_GETSITENAME structure.
+********************************************************************/
+
+BOOL net_io_q_dsr_getsitename(const char *desc, NET_Q_DSR_GETSITENAME *r_t,
+                             prs_struct *ps, int depth)
+{
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_q_dsr_getsitename");
+       depth++;
+
+       if (!prs_uint32("ptr_computer_name", ps, depth, &r_t->ptr_computer_name))
+               return False;
+
+       if (!smb_io_unistr2("computer_name", &r_t->uni_computer_name,
+                           r_t->ptr_computer_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an NET_R_DSR_GETSITENAME structure.
+********************************************************************/
+
+BOOL net_io_r_dsr_getsitename(const char *desc, NET_R_DSR_GETSITENAME *r_t,
+                             prs_struct *ps, int depth)
+{
+       if (r_t == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "net_io_r_dsr_getsitename");
+       depth++;
+
+       if (!prs_uint32("ptr_site_name", ps, depth, &r_t->ptr_site_name))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_unistr2("site_name", &r_t->uni_site_name,
+                           r_t->ptr_site_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_werror("result", ps, depth, &r_t->result))
+               return False;
+
+       return True;
+}
+
+