No longer used...

Jeremy.
(This used to be commit d23b9be1ba15bedac046319e8f15e60b481d057b)

2 files changed, 0 insertions, 2590 deletions

diff --git a/source3/include/rpc_samr_old.h b/source3/include/rpc_samr_old.h
deleted file mode 100644
index b41dd0986e..0000000000
--- a/source3/include/rpc_samr_old.h
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   
-   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.
-*/
-
-#ifndef _RPC_SAMR_H /* _RPC_SAMR_H */
-#define _RPC_SAMR_H 
-
-
-#include "rpc_misc.h"
-
-
-/*******************************************************************
- the following information comes from a QuickView on samsrv.dll,
- and gives an idea of exactly what is needed:
- 
-SamrAddMemberToAlias
-SamrAddMemberToGroup
-SamrAddMultipleMembersToAlias
-SamrChangePasswordUser
-x SamrCloseHandle
-x SamrConnect
-SamrCreateAliasInDomain
-SamrCreateGroupInDomain
-SamrCreateUserInDomain
-SamrDeleteAlias
-SamrDeleteGroup
-SamrDeleteUser
-x SamrEnumerateAliasesInDomain
-SamrEnumerateDomainsInSamServer
-x SamrEnumerateGroupsInDomain
-x SamrEnumerateUsersInDomain
-SamrGetUserDomainPasswordInformation
-SamrLookupDomainInSamServer
-? SamrLookupIdsInDomain
-x SamrLookupNamesInDomain
-x SamrOpenAlias
-x SamrOpenDomain
-SamrOpenGroup
-x SamrOpenUser
-x SamrQueryDisplayInformation
-x SamrQueryInformationAlias
-SamrQueryInformationDomain
-? SamrQueryInformationUser
-SamrQuerySecurityObject
-SamrRemoveMemberFromAlias
-SamrRemoveMemberFromForiegnDomain
-SamrRemoveMemberFromGroup
-SamrRemoveMultipleMembersFromAlias
-SamrSetInformationAlias
-SamrSetInformationDomain
-SamrSetInformationGroup
-SamrSetInformationUser
-SamrSetMemberAttributesOfGroup
-SamrSetSecurityObject
-SamrShutdownSamServer
-SamrTestPrivateFunctionsDomain
-SamrTestPrivateFunctionsUser
-
-********************************************************************/
-
-#define SAMR_CONNECT_ANON      0x00
-#define SAMR_CLOSE_HND         0x01
-#define SAMR_UNKNOWN_3         0x03
-#define SAMR_LOOKUP_DOMAIN     0x05
-#define SAMR_ENUM_DOMAINS      0x06
-#define SAMR_OPEN_DOMAIN       0x07
-#define SAMR_QUERY_DOMAIN_INFO 0x08
-#define SAMR_ENUM_DOM_USERS    0x0d
-#define SAMR_ENUM_DOM_ALIASES  0x0f
-#define SAMR_LOOKUP_IDS        0x10
-#define SAMR_LOOKUP_NAMES      0x11
-#define SAMR_LOOKUP_RIDS       0x12
-#define SAMR_OPEN_ALIAS        0x1b
-#define SAMR_QUERY_ALIASINFO   0x1c
-#define SAMR_UNKNOWN_21        0x21
-#define SAMR_OPEN_USER         0x22
-#define SAMR_QUERY_USERINFO    0x24
-#define SAMR_SET_USERINFO2     0x25
-#define SAMR_QUERY_USERGROUPS  0x27
-#define SAMR_QUERY_DISPINFO    0x28
-#define SAMR_UNKNOWN_2C        0x2c
-#define SAMR_ENUM_DOM_GROUPS   0x30
-#define SAMR_CREATE_USER       0x32
-#define SAMR_UNKNOWN_34        0x34
-#define SAMR_CHGPASSWD_USER    0x37
-#define SAMR_UNKNOWN_38        0x38
-#define SAMR_CONNECT           0x39
-#define SAMR_SET_USERINFO      0x3A
-
-
-typedef struct logon_hours_info
-{
-	uint32 len; /* normally 21 bytes */
-	uint8 hours[32];
-
-} LOGON_HRS;
-
-/* SAM_USER_INFO_21 */
-typedef struct sam_user_info_21
-{
-	NTTIME logon_time;            /* logon time */
-	NTTIME logoff_time;           /* logoff time */
-	NTTIME kickoff_time;          /* kickoff time */
-	NTTIME pass_last_set_time;    /* password last set time */
-	NTTIME pass_can_change_time;  /* password can change time */
-	NTTIME pass_must_change_time; /* password must change time */
-
-	UNIHDR hdr_user_name;    /* username unicode string header */
-	UNIHDR hdr_full_name;    /* user's full name unicode string header */
-	UNIHDR hdr_home_dir;     /* home directory unicode string header */
-	UNIHDR hdr_dir_drive;    /* home drive unicode string header */
-	UNIHDR hdr_logon_script; /* logon script unicode string header */
-	UNIHDR hdr_profile_path; /* profile path unicode string header */
-	UNIHDR hdr_acct_desc  ;  /* user description */
-	UNIHDR hdr_workstations; /* comma-separated workstations user can log in from */
-	UNIHDR hdr_unknown_str ; /* don't know what this is, yet. */
-	UNIHDR hdr_munged_dial ; /* munged path name and dial-back tel number */
-
-	uint8 lm_pwd[16];    /* lm user passwords */
-	uint8 nt_pwd[16];    /* nt user passwords */
-
-	uint32 user_rid;      /* Primary User ID */
-	uint32 group_rid;     /* Primary Group ID */
-
-	uint32 acb_info; /* account info (ACB_xxxx bit-mask) */
-	/* uint8 pad[2] */
-
-	uint32 unknown_3; /* 0x00ff ffff */
-
-	uint16 logon_divs; /* 0x0000 00a8 which is 168 which is num hrs in a week */
-	/* uint8 pad[2] */
-	uint32 ptr_logon_hrs; /* unknown pointer */
-
-	uint32 unknown_5;     /* 0x0002 0000 */
-
-	uint8 padding1[8];
-
-	UNISTR2 uni_user_name;    /* username unicode string */
-	UNISTR2 uni_full_name;    /* user's full name unicode string */
-	UNISTR2 uni_home_dir;     /* home directory unicode string */
-	UNISTR2 uni_dir_drive;    /* home directory drive unicode string */
-	UNISTR2 uni_logon_script; /* logon script unicode string */
-	UNISTR2 uni_profile_path; /* profile path unicode string */
-	UNISTR2 uni_acct_desc  ;  /* user description unicode string */
-	UNISTR2 uni_workstations; /* login from workstations unicode string */
-	UNISTR2 uni_unknown_str ; /* don't know what this is, yet. */
-	UNISTR2 uni_munged_dial ; /* munged path name and dial-back tel number */
-
-	uint32 unknown_6; /* 0x0000 04ec */
-	uint32 padding4;
-
-	LOGON_HRS logon_hrs;
-
-} SAM_USER_INFO_21;
-
-
-/* SAM_USER_INFO_11 */
-typedef struct sam_user_info_11
-{
-	uint8  padding_0[16];  /* 0 - padding 16 bytes */
-	NTTIME expiry;         /* expiry time or something? */
-	uint8  padding_1[24];  /* 0 - padding 24 bytes */
-
-	UNIHDR hdr_mach_acct;  /* unicode header for machine account */
-	uint32 padding_2;      /* 0 - padding 4 bytes */
-
-	uint32 ptr_1;          /* pointer */
-	uint8  padding_3[32];  /* 0 - padding 32 bytes */
-	uint32 padding_4;      /* 0 - padding 4 bytes */
-
-	uint32 ptr_2;          /* pointer */
-	uint32 padding_5;      /* 0 - padding 4 bytes */
-
-	uint32 ptr_3;          /* pointer */
-	uint8  padding_6[32];  /* 0 - padding 32 bytes */
-
-	uint32 rid_user;       /* user RID */
-	uint32 rid_group;      /* group RID */
-
-	uint16 acct_ctrl;      /* 0080 - ACB_XXXX */
-	uint16 unknown_3;      /* 16 bit padding */
-
-	uint16 unknown_4;      /* 0x003f      - 16 bit unknown */
-	uint16 unknown_5;      /* 0x003c      - 16 bit unknown */
-
-	uint8  padding_7[16];  /* 0 - padding 16 bytes */
-	uint32 padding_8;      /* 0 - padding 4 bytes */
-	
-	UNISTR2 uni_mach_acct; /* unicode string for machine account */
-
-	uint8  padding_9[48];  /* 0 - padding 48 bytes */
-
-} SAM_USER_INFO_11;
-
-
-/* SAM_USER_INFO_10 */
-typedef struct sam_user_info_10
-{
-	uint32 acb_info;
-
-} SAM_USER_INFO_10;
-
-
-
-/* SAMR_Q_CLOSE_HND - probably a policy handle close */
-typedef struct q_samr_close_hnd_info
-{
-    POLICY_HND pol;          /* policy handle */
-
-} SAMR_Q_CLOSE_HND;
-
-
-/* SAMR_R_CLOSE_HND - probably a policy handle close */
-typedef struct r_samr_close_hnd_info
-{
-    POLICY_HND pol;       /* policy handle */
-	uint32 status;         /* return status */
-
-} SAMR_R_CLOSE_HND;
-
-
-/****************************************************************************
-SAMR_Q_UNKNOWN_2C - a "set user info" occurs just after this
-*****************************************************************************/
-
-/* SAMR_Q_UNKNOWN_2C */
-typedef struct q_samr_unknown_2c_info
-{
-	POLICY_HND user_pol;          /* policy handle */
-
-} SAMR_Q_UNKNOWN_2C;
-
-
-/****************************************************************************
-SAMR_R_UNKNOWN_2C - a "set user info" occurs just after this
-*****************************************************************************/
-
-/* SAMR_R_UNKNOWN_2C */
-typedef struct r_samr_unknown_2c_info
-{
-	uint32 unknown_0; /* 0x0016 0000 */
-	uint32 unknown_1; /* 0x0000 0000 */
-	uint32 status; 
-
-} SAMR_R_UNKNOWN_2C;
-
-
-/****************************************************************************
-SAMR_Q_UNKNOWN_3 - info level 4.  returns SIDs.
-*****************************************************************************/
-
-/* SAMR_Q_UNKNOWN_3 - probably get domain info... */
-typedef struct q_samr_unknown_3_info
-{
-	POLICY_HND user_pol;          /* policy handle */
-	uint16 switch_value;     /* 0x0000 0004 */
-	/* uint8 pad[2] */
-
-} SAMR_Q_UNKNOWN_3;
-
-/* DOM_SID3 example:
-   0x14 0x035b 0x0002 S-1-1
-   0x18 0x07ff 0x000f S-1-5-20-DOMAIN_ALIAS_RID_ADMINS
-   0x18 0x07ff 0x000f S-1-5-20-DOMAIN_ALIAS_RID_ACCOUNT_OPS
-   0x24 0x0044 0x0002 S-1-5-21-nnn-nnn-nnn-0x03f1
- */
-
-/* DOM_SID3 example:
-   0x24 0x0044 0x0002 S-1-5-21-nnn-nnn-nnn-0x03ee
-   0x18 0x07ff 0x000f S-1-5-20-DOMAIN_ALIAS_RID_ADMINS
-   0x14 0x035b 0x0002 S-1-1
- */
-
-/* DOM_SID3 - security id */
-typedef struct sid_info_3
-{
-	uint16 len; /* length, bytes, including length of len :-) */
-	/* uint8  pad[2]; */
-	
-	DOM_SID sid;
-
-} DOM_SID3;
-
-
-#define MAX_SAM_SIDS 15
-
-/* SAM_SID_STUFF */
-typedef struct sid_stuff_info
-{
-	uint16 unknown_2; /* 0x0001 */
-	uint16 unknown_3; /* 0x8004 */
-
-	uint8 padding1[8];
-
-	uint32 unknown_4; /* 0x0000 0014 */
-	uint32 unknown_5; /* 0x0000 0014 */
-
-	uint16 unknown_6; /* 0x0002 */
-	uint16 unknown_7; /* 0x5800 */
-
-	uint32 num_sids;
-
-	uint16 padding2;
-
-	DOM_SID3 sid[MAX_SAM_SIDS];
-
-} SAM_SID_STUFF;
-
-/* SAMR_R_UNKNOWN_3 - probably an open */
-typedef struct r_samr_unknown_3_info
-{
-	uint32 ptr_0;
-	uint32 sid_stuff_len0;
-
-	uint32 ptr_1;
-	uint32 sid_stuff_len1;
-
-	SAM_SID_STUFF sid_stuff;
-
-	uint32 status;         /* return status */
-
-} SAMR_R_UNKNOWN_3;
-
-
-/****************************************************************************
-SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info.
-*****************************************************************************/
-
-/* SAMR_Q_QUERY_DOMAIN_INFO - */
-typedef struct q_samr_query_domain_info
-{
-	POLICY_HND domain_pol;   /* policy handle */
-	uint16 switch_value;     /* 0x0002 */
-
-} SAMR_Q_QUERY_DOMAIN_INFO;
-
-typedef struct sam_unknown_info_1_inf
-{
-	uint8 padding[12]; /* 12 bytes zeros */
-	uint32 unknown_1; /* 0x8000 0000 */
-	uint32 unknown_2; /* 0x0000 0000 */
-
-} SAM_UNK_INFO_1;
-
-typedef struct sam_unkown_info_2_info
-{
-	uint32 unknown_0; /* 0x0000 0000 */
-	uint32 unknown_1; /* 0x8000 0000 */
-	uint32 unknown_2; /* 0x0000 0000 */
-
-	uint32 ptr_0;     /* pointer to unknown structure */
-	UNIHDR hdr_domain; /* domain name unicode header */
-	UNIHDR hdr_server; /* server name unicode header */
-
-	/* put all the data in here, at the moment, including what the above
-	   pointer is referring to
-	 */
-
-	uint32 seq_num; /* some sort of incrementing sequence number? */
-	uint32 unknown_3; /* 0x0000 0000 */
-	
-	uint32 unknown_4; /* 0x0000 0001 */
-	uint32 unknown_5; /* 0x0000 0003 */
-	uint32 unknown_6; /* 0x0000 0001 */
-	uint32 num_domain_usrs; /* number of users in domain */
-	uint32 num_domain_grps; /* number of domain groups in domain */
-	uint32 num_local_grps; /* number of local groups in domain */
-
-	uint8 padding[12]; /* 12 bytes zeros */
-
-	UNISTR2 uni_domain; /* domain name unicode string */
-	UNISTR2 uni_server; /* server name unicode string */
-
-} SAM_UNK_INFO_2;
-
-typedef struct sam_unknown_info_3_info
-{
-	uint32 unknown_0; /* 0x0000 0000 */
-	uint32 unknown_1; /* 0x8000 0000 */
-
-} SAM_UNK_INFO_3;
-
-typedef struct sam_unknown_info_6_info
-{
-	uint32 unknown_0; /* 0x0000 0000 */
-
-	uint32 ptr_0;     /* pointer to unknown structure */
-	uint8  padding[12]; /* 12 bytes zeros */
-
-} SAM_UNK_INFO_6;
-
-typedef struct sam_unknown_info_7_info
-{
-	uint16 unknown_0; /* 0x0003 */
-
-} SAM_UNK_INFO_7;
-
-typedef struct sam_unknown_info_12_inf
-{
-	uint32 unknown_0; /* 0xcf1d cc00 */
-	uint32 unknown_1; /* 0xffff fffb */
-	uint32 unknown_2; /* 0xcf1d cc00 */
-	uint32 unknown_3; /* 0xffff fffb */
-
-	uint32 unknown_4; /* 0x8a88 0000 */
-
-} SAM_UNK_INFO_12;
-
-typedef struct sam_unknown_ctr_info
-{
-	union
-	{
-		SAM_UNK_INFO_1 inf1;
-		SAM_UNK_INFO_2 inf2;
-		SAM_UNK_INFO_3 inf3;
-		SAM_UNK_INFO_6 inf6;
-		SAM_UNK_INFO_7 inf7;
-		SAM_UNK_INFO_12 inf12;
-	} info;
-
-} SAM_UNK_CTR;
-
-
-/* SAMR_R_QUERY_DOMAIN_INFO - */
-typedef struct r_samr_query_domain_info
-{
-	uint32 ptr_0;
-	uint16 switch_value; /* same as in query */
-
-	SAM_UNK_CTR *ctr;
-
-	uint32 status;         /* return status */
-
-} SAMR_R_QUERY_DOMAIN_INFO;
-
- 
-/****************************************************************************
-SAMR_Q_OPEN_DOMAIN - unknown_0 values seen associated with SIDs:
-
-0x0000 03f1 and a specific   domain sid - S-1-5-21-44c01ca6-797e5c3d-33f83fd0
-0x0000 0200 and a specific   domain sid - S-1-5-21-44c01ca6-797e5c3d-33f83fd0
-*****************************************************************************/
-
-/* SAMR_Q_OPEN_DOMAIN */
-typedef struct q_samr_open_domain_info
-{
-	POLICY_HND pol;           /* policy handle */
-	uint32 access_mask;
-	DOM_SID2 dom_sid;         /* domain SID */
-
-} SAMR_Q_OPEN_DOMAIN;
-
-
-/* SAMR_R_OPEN_DOMAIN - probably an open */
-typedef struct r_samr_open_domain_info
-{
-	POLICY_HND domain_pol; /* policy handle associated with the SID */
-	uint32 status;         /* return status */
-
-} SAMR_R_OPEN_DOMAIN;
-
-
-#define MAX_SAM_ENTRIES 600
-
-typedef struct samr_entry_info
-{
-	uint32 rid;
-	UNIHDR hdr_name;
-
-} SAM_ENTRY;
-
-/* SAMR_Q_ENUM_DOM_USERS - SAM rids and names */
-typedef struct q_samr_enum_dom_users_info
-{
-	POLICY_HND pol;          /* policy handle */
-
-	uint16 req_num_entries;   /* number of values (0 indicates unlimited?) */
-	uint16 unknown_0;         /* enumeration context? */
-	uint16 acb_mask;          /* 0x0000 indicates all */
-	uint16 unknown_1;         /* 0x0000 */
-
-	uint32 max_size;              /* 0x0000 ffff */
-
-} SAMR_Q_ENUM_DOM_USERS;
-
-
-/* SAMR_R_ENUM_DOM_USERS - SAM rids and names */
-typedef struct r_samr_enum_dom_users_info
-{
-	uint16 total_num_entries;  /* number of entries that match without the acb mask */
-	uint16 unknown_0;          /* same as unknown_0 (enum context?) in request */
-	uint32 ptr_entries1;       /* actual number of entries to follow, having masked some out */
-
-	uint32 num_entries2;
-	uint32 ptr_entries2;
-
-	uint32 num_entries3;
-
-	SAM_ENTRY sam[MAX_SAM_ENTRIES];
-	UNISTR2 uni_acct_name[MAX_SAM_ENTRIES];
-
-	uint32 num_entries4;
-
-	uint32 status;
-
-} SAMR_R_ENUM_DOM_USERS;
-
-
-typedef struct samr_entry_info3
-{
-	uint32 grp_idx;
-
-	uint32 rid_grp;
-	uint32 attr;
-
-	UNIHDR hdr_grp_name;
-	UNIHDR hdr_grp_desc;
-
-} SAM_ENTRY3;
-
-typedef struct samr_str_entry_info3
-{
-	UNISTR2 uni_grp_name;
-	UNISTR2 uni_grp_desc;
-
-} SAM_STR3;
-
-/* SAMR_Q_ENUM_DOM_GROUPS - SAM rids and names */
-typedef struct q_samr_enum_dom_groups_info
-{
-	POLICY_HND pol;          /* policy handle */
-
-	/* these are possibly an enumeration context handle... */
-	uint16 switch_level;      /* 0x0003 */
-	uint16 unknown_0;         /* 0x0000 */
-	uint32 start_idx;       /* presumably the start enumeration index */
-	uint32 unknown_1;       /* 0x0000 07d0 */
-
-	uint32 max_size;        /* 0x0000 7fff */
-
-} SAMR_Q_ENUM_DOM_GROUPS;
-
-
-/* SAMR_R_ENUM_DOM_GROUPS - SAM rids and names */
-typedef struct r_samr_enum_dom_groups_info
-{
-	uint32 unknown_0;        /* 0x0000 0492 or 0x0000 00be */
-	uint32 unknown_1;        /* 0x0000 049a or 0x0000 00be */
-	uint32 switch_level;     /* 0x0000 0003 */
-
-	uint32 num_entries;
-	uint32 ptr_entries;
-
-	uint32 num_entries2;
-
-	SAM_ENTRY3 sam[MAX_SAM_ENTRIES];
-	SAM_STR3   str[MAX_SAM_ENTRIES];
-
-	uint32 status;
-
-} SAMR_R_ENUM_DOM_GROUPS;
-
-
-
-/* SAMR_Q_ENUM_DOM_ALIASES - SAM rids and names */
-typedef struct q_samr_enum_dom_aliases_info
-{
-	POLICY_HND pol;          /* policy handle */
-
-	/* this is possibly an enumeration context handle... */
-	uint32 unknown_0;         /* 0x0000 0000 */
-
-	uint32 max_size;              /* 0x0000 ffff */
-
-} SAMR_Q_ENUM_DOM_ALIASES;
-
-/* SAMR_R_ENUM_DOM_ALIASES - SAM rids and names */
-typedef struct r_samr_enum_dom_aliases_info
-{
-	uint32 num_entries;
-	uint32 ptr_entries;
-
-	uint32 num_entries2;
-	uint32 ptr_entries2;
-
-	uint32 num_entries3;
-
-	SAM_ENTRY sam[MAX_SAM_ENTRIES];
-	UNISTR2 uni_grp_name[MAX_SAM_ENTRIES];
-
-	uint32 num_entries4;
-
-	uint32 status;
-
-} SAMR_R_ENUM_DOM_ALIASES;
-
-/***************************************************************************
- SAMR_Q_LOOKUP_DOMAIN - obtain SID for a local domain
- ***************************************************************************/
-typedef struct q_samr_lookup_domain_info
-{
-        POLICY_HND connect_pol;
-
-        UNIHDR  hdr_domain;
-        UNISTR2 uni_domain;
-
-} SAMR_Q_LOOKUP_DOMAIN;
-
-/* SAMR_R_LOOKUP_DOMAIN */
-typedef struct r_samr_lookup_domain_info
-{ 
-        uint32   ptr_sid;
-        DOM_SID2 dom_sid;
-
-        uint32 status;
-
-} SAMR_R_LOOKUP_DOMAIN;
- 
-/**********************************************************************
- SAMR_Q_ENUM_DOMAINS - SAM rids and names 
- **********************************************************************/
-typedef struct q_samr_enum_domains_info
-{
-        POLICY_HND pol;     /* policy handle */
-
-        uint32 start_idx;   /* enumeration handle */
-        uint32 max_size;    /* 0x0000 ffff */
-
-} SAMR_Q_ENUM_DOMAINS;
-
-/* SAMR_R_ENUM_DOMAINS - SAM rids and Domain names */
-typedef struct r_samr_enum_domains_info
-{                                   
-        uint32 next_idx;     /* next starting index required for enum */
-        uint32 ptr_entries1;
-
-        uint32 num_entries2;
-        uint32 ptr_entries2;
-
-        uint32 num_entries3;
-
-        SAM_ENTRY *sam;
-        UNISTR2 *uni_dom_name;
-
-        uint32 num_entries4;
-
-        uint32 status;
-
-} SAMR_R_ENUM_DOMAINS;
-
-
-/* SAMR_Q_QUERY_DISPINFO - SAM rids, names and descriptions */
-typedef struct q_samr_query_disp_info
-{
-	POLICY_HND pol;        /* policy handle */
-
-	uint16 switch_level;    /* 0x0001 and 0x0002 seen */
-	uint32 start_idx;       /* presumably the start enumeration index */
-	uint32 max_entries;       /* 0x0000 07d0, 0x0000 0400 and 0x0000 0200 seen */
-
-	uint32 max_size;        /* 0x0000 7fff, 0x0000 7ffe and 0x0000 3fff seen*/
-
-} SAMR_Q_QUERY_DISPINFO;
-
-typedef struct samr_entry_info1
-{
-	uint32 user_idx;
-
-	uint32 rid_user;
-	uint16 acb_info;
-	uint16 pad;
-
-	UNIHDR hdr_acct_name;
-	UNIHDR hdr_user_name;
-	UNIHDR hdr_user_desc;
-
-} SAM_ENTRY1;
-
-typedef struct samr_str_entry_info1
-{
-	UNISTR2 uni_acct_name;
-	UNISTR2 uni_full_name;
-	UNISTR2 uni_acct_desc;
-
-} SAM_STR1;
-
-typedef struct sam_entry_info_1
-{
-	uint32 num_entries;
-	uint32 ptr_entries;
-	uint32 num_entries2;
-
-	SAM_ENTRY1 sam[MAX_SAM_ENTRIES];
-	SAM_STR1   str[MAX_SAM_ENTRIES];
-
-
-} SAM_INFO_1;
-
-typedef struct samr_entry_info2
-{
-	uint32 user_idx;
-
-	uint32 rid_user;
-	uint16 acb_info;
-	uint16 pad;
-
-	UNIHDR hdr_srv_name;
-	UNIHDR hdr_srv_desc;
-
-} SAM_ENTRY2;
-
-typedef struct samr_str_entry_info2
-{
-	UNISTR2 uni_srv_name;
-	UNISTR2 uni_srv_desc;
-
-} SAM_STR2;
-
-typedef struct sam_entry_info_2
-{
-	uint32 num_entries;
-	uint32 ptr_entries;
-	uint32 num_entries2;
-
-	SAM_ENTRY2 sam[MAX_SAM_ENTRIES];
-	SAM_STR2   str[MAX_SAM_ENTRIES];
-
-} SAM_INFO_2;
-
-typedef struct sam_info_ctr_info
-{
-	union
-	{
-		SAM_INFO_1 *info1; /* server info */
-		SAM_INFO_2 *info2; /* user info */
-		void       *info; /* allows assignment without typecasting, */
-
-	} sam;
-
-} SAM_INFO_CTR;
-
-/* SAMR_R_QUERY_DISPINFO - SAM rids, names and descriptions */
-typedef struct r_samr_query_dispinfo_info
-{
-	uint32 unknown_0;        /* container length? 0x0000 0492 or 0x0000 00be */
-	uint32 unknown_1;        /* container length? 0x0000 049a or 0x0000 00be */
-	uint16 switch_level;     /* 0x0001 or 0x0002 */
-	/*uint8 pad[2] */
-
-	SAM_INFO_CTR *ctr;
-
-	uint32 status;
-
-} SAMR_R_QUERY_DISPINFO;
-
-
-
-/* SAMR_Q_QUERY_ALIASINFO - SAM Alias Info */
-typedef struct q_samr_enum_alias_info
-{
-	POLICY_HND pol;        /* policy handle */
-
-	uint16 switch_level;    /* 0x0003 seen  (0x0001 seen from NT5) */
-
-} SAMR_Q_QUERY_ALIASINFO;
-
-typedef struct samr_alias_info1
-{
-  uint32 switch_value_1;
-  UNIHDR hdr_alias_name;
-  UNISTR2 uni_alias_name;
-  UNIHDR hdr_alias_desc;
-  UNISTR2 uni_alias_desc;
-} ALIAS_INFO1;
-
-typedef struct samr_alias_info3
-{
-	UNIHDR hdr_acct_desc;
-	UNISTR2 uni_acct_desc;
-
-} ALIAS_INFO3;
-
-/* SAMR_R_QUERY_ALIASINFO - SAM rids, names and descriptions */
-typedef struct r_samr_query_aliasinfo_info
-{
-  uint32 ptr;        
-  uint16 switch_value;     /* 0x0003 */
-  /* uint8[2] padding */
-
-  union
-  {
-    ALIAS_INFO1 info1;
-    ALIAS_INFO3 info3;
-
-  } alias;
-
-  uint32 status;
-
-} SAMR_R_QUERY_ALIASINFO;
-
-
-/* SAMR_Q_QUERY_USERGROUPS - */
-typedef struct q_samr_query_usergroup_info
-{
-	POLICY_HND pol;          /* policy handle associated with unknown id */
-
-} SAMR_Q_QUERY_USERGROUPS;
-
-/* SAMR_R_QUERY_USERGROUPS - probably a get sam info */
-typedef struct r_samr_query_usergroup_info
-{
-	uint32 ptr_0;            /* pointer */
-	uint32 num_entries;      /* number of RID groups */
-	uint32 ptr_1;            /* pointer */
-	uint32 num_entries2;     /* number of RID groups */
-
-	DOM_GID *gid; /* group info */
-
-	uint32 status;         /* return status */
-
-} SAMR_R_QUERY_USERGROUPS;
-
-
-/* SAMR_Q_QUERY_USERINFO - probably a get sam info */
-typedef struct q_samr_query_user_info
-{
-	POLICY_HND pol;          /* policy handle associated with unknown id */
-	uint16 switch_value;         /* 0x0015, 0x0011 or 0x0010 - 16 bit unknown */
-
-} SAMR_Q_QUERY_USERINFO;
-
-/* SAMR_R_QUERY_USERINFO - probably a get sam info */
-typedef struct r_samr_query_user_info
-{
-	uint32 ptr;            /* pointer */
-	uint16 switch_value;      /* 0x0015, 0x0011 or 0x0010 - same as in query */
-	/* uint8[2] padding. */
-
-	union
-	{
-		SAM_USER_INFO_10 *id10; /* auth-level 0x10 */
-		SAM_USER_INFO_11 *id11; /* auth-level 0x11 */
-		SAM_USER_INFO_21 *id21; /* auth-level 21 */
-		void* id; /* to make typecasting easy */
-
-	} info;
-
-	uint32 status;         /* return status */
-
-} SAMR_R_QUERY_USERINFO;
-
-
-/****************************************************************************
-SAMR_Q_LOOKUP_IDS - do a conversion from name to RID.
-
-the policy handle allocated by an "samr open secret" call is associated
-with a SID.  this policy handle is what is queried here, *not* the SID
-itself.  the response to the lookup rids is relative to this SID.
-*****************************************************************************/
-/* SAMR_Q_LOOKUP_IDS */
-typedef struct q_samr_lookup_ids_info
-{
-    POLICY_HND pol;       /* policy handle */
-
-	uint32 num_sids1;      /* number of rids being looked up */
-	uint32 ptr;            /* buffer pointer */
-	uint32 num_sids2;      /* number of rids being looked up */
-
-	uint32   ptr_sid[MAX_LOOKUP_SIDS]; /* pointers to sids to be looked up */
-	DOM_SID2 sid    [MAX_LOOKUP_SIDS]; /* sids to be looked up. */
-
-} SAMR_Q_LOOKUP_IDS;
-
-
-/* SAMR_R_LOOKUP_IDS */
-typedef struct r_samr_lookup_ids_info
-{
-	uint32 num_entries;
-	uint32 ptr; /* undocumented buffer pointer */
-
-	uint32 num_entries2; 
-	uint32 rid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */
-
-	uint32 status; /* return code */
-
-} SAMR_R_LOOKUP_IDS;
-
-/****************************************************************************
-SAMR_Q_LOOKUP_NAMES - do a conversion from Names to RIDs+types.
-*****************************************************************************/
-/* SAMR_Q_LOOKUP_NAMES */
-typedef struct q_samr_lookup_names_info
-{
-	POLICY_HND pol;       /* policy handle */
-
-	uint32 num_names1;      /* number of names being looked up */
-	uint32 flags;           /* 0x0000 03e8 - unknown */
-	uint32 ptr;            /* 0x0000 0000 - 32 bit unknown */
-	uint32 num_names2;      /* number of names being looked up */
-
-	UNIHDR  hdr_name[MAX_LOOKUP_SIDS]; /* unicode account name header */
-	UNISTR2 uni_name[MAX_LOOKUP_SIDS]; /* unicode account name string */
-
-} SAMR_Q_LOOKUP_NAMES;
-
-/* SAMR_R_LOOKUP_NAMES */
-typedef struct r_samr_lookup_names_info
-{
-	uint32 num_rids1;      /* number of aliases being looked up */
-	uint32 ptr_rids;       /* pointer to aliases */
-	uint32 num_rids2;      /* number of aliases being looked up */
-
-	uint32 rid[MAX_LOOKUP_SIDS]; /* rids */
-
-	uint32 num_types1;      /* number of users in aliases being looked up */
-	uint32 ptr_types;       /* pointer to users in aliases */
-	uint32 num_types2;      /* number of users in aliases being looked up */
-
-	uint32 type[MAX_LOOKUP_SIDS]; /* SID_ENUM type */
-
-	uint32 status; /* return code */
-
-} SAMR_R_LOOKUP_NAMES;
-
-/****************************************************************************
-SAMR_Q_LOOKUP_RIDS - do a conversion from RID groups to something.
-
-called to resolve domain RID groups.
-*****************************************************************************/
-/* SAMR_Q_LOOKUP_RIDS */
-typedef struct q_samr_lookup_rids_info
-{
-    POLICY_HND pol;       /* policy handle */
-
-	uint32 num_gids1;      /* number of rids being looked up */
-	uint32 rid;            /* 0x0000 03e8 - RID of the server doing the query? */
-	uint32 ptr;            /* 0x0000 0000 - 32 bit unknown */
-	uint32 num_gids2;      /* number of rids being looked up */
-
-	uint32 gid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */
-
-} SAMR_Q_LOOKUP_RIDS;
-
-
-/****************************************************************************
-SAMR_R_LOOKUP_RIDS - do a conversion from group RID to names
-
-*****************************************************************************/
-/* SAMR_R_LOOKUP_RIDS */
-typedef struct r_samr_lookup_rids_info
-{
-	POLICY_HND pol;       /* policy handle */
-
-	uint32 num_aliases1;      /* number of aliases being looked up */
-	uint32 ptr_aliases;       /* pointer to aliases */
-	uint32 num_aliases2;      /* number of aliases being looked up */
-
-	UNIHDR  hdr_als_name[MAX_LOOKUP_SIDS]; /* unicode account name header */
-	UNISTR2 uni_als_name[MAX_LOOKUP_SIDS]; /* unicode account name string */
-
-	uint32 num_als_usrs1;      /* number of users in aliases being looked up */
-	uint32 ptr_als_usrs;       /* pointer to users in aliases */
-	uint32 num_als_usrs2;      /* number of users in aliases being looked up */
-
-	uint32 num_als_usrs[MAX_LOOKUP_SIDS]; /* number of users per group */
-
-	uint32 status;
-
-} SAMR_R_LOOKUP_RIDS;
-
-
-/* SAMR_Q_OPEN_USER - probably an open */
-typedef struct q_samr_open_user_info
-{
-	POLICY_HND domain_pol;       /* policy handle */
-	uint32 access_mask;
-	uint32 user_rid;      /* user RID */
-
-} SAMR_Q_OPEN_USER;
-
-
-/* SAMR_R_OPEN_USER - probably an open */
-typedef struct r_samr_open_user_info
-{
-	POLICY_HND user_pol;       /* policy handle associated with unknown id */
-	uint32 status;         /* return status */
-
-} SAMR_R_OPEN_USER;
-
-
-/* SAMR_Q_UNKNOWN_13 - probably an open alias in domain */
-typedef struct q_samr_unknown_13_info
-{
-	POLICY_HND alias_pol;        /* policy handle */
-
-	uint16 unknown_1;            /* 16 bit unknown - 0x0200 */
-	uint16 unknown_2;            /* 16 bit unknown - 0x0000 */
-
-} SAMR_Q_UNKNOWN_13;
-
-
-/* SAMR_Q_UNKNOWN_21 - probably an open group in domain */
-typedef struct q_samr_unknown_21_info
-{
-	POLICY_HND group_pol;        /* policy handle */
-
-	uint16 unknown_1;            /* 16 bit unknown - 0x0477 */
-	uint16 unknown_2;            /* 16 bit unknown - 0x0000 */
-
-} SAMR_Q_UNKNOWN_21;
-
-
-/* SAMR_Q_CREATE_USER - probably a "create SAM entry" */
-typedef struct q_samr_create_user_info
-{
-	POLICY_HND pol;             /* policy handle */
-
-	UNIHDR  hdr_mach_acct;       /* unicode machine account name header */
-	UNISTR2 uni_mach_acct;       /* unicode machine account name */
-
-	uint32 acb_info;            /* 32 bit ACB_XXXX */
-	uint32 access_mask;         /* 0xe005 00b0 */
-
-} SAMR_Q_CREATE_USER;
-
-
-/* SAMR_R_CREATE_USER - probably a "create SAM entry" */
-typedef struct r_samr_create_user_info
-{
-	POLICY_HND pol;       /* policy handle */
-
-	uint32 unknown_0;     /* 0x0007 03ff */
-	uint32 user_rid;      /* user RID */
-	uint32 status;         /* return status - fail: 0xC000 0099: user exists */
-
-} SAMR_R_CREATE_USER;
-
-/* SAMR_Q_OPEN_ALIAS - probably an open */
-typedef struct q_samr_open_alias_info
-{
-	POLICY_HND dom_pol;       /* policy handle */
-	uint32 unknown_0;         /* 0x0000 0008 */
-	uint32 rid_alias;        /* rid */
-
-} SAMR_Q_OPEN_ALIAS;
-
-
-/* SAMR_R_OPEN_ALIAS - probably an open */
-typedef struct r_samr_open_alias_info
-{
-	POLICY_HND pol;       /* policy handle */
-	uint32 status;         /* return status */
-
-} SAMR_R_OPEN_ALIAS;
-
-
-/* SAMR_Q_CONNECT_ANON - probably an open */
-typedef struct q_samr_connect_anon_info
-{
-	uint32 ptr;                  /* ptr? */
-	uint16 unknown_0;            /* 0x005c */
-	uint16 unknown_1;            /* 0x0001 */
-	uint32 unknown_2;            /* 0x0000 0020 */
-
-} SAMR_Q_CONNECT_ANON;
-
-/* SAMR_R_CONNECT_ANON - probably an open */
-typedef struct r_samr_connect_anon_info
-{
-	POLICY_HND connect_pol;       /* policy handle */
-	uint32 status;         /* return status */
-
-} SAMR_R_CONNECT_ANON;
-
-/* SAMR_Q_CONNECT - probably an open */
-typedef struct q_samr_connect_info
-{
-	uint32 ptr_srv_name;         /* pointer (to server name?) */
-	UNISTR2 uni_srv_name;        /* unicode server name starting with '\\' */
-
-	uint32 access_mask;
-
-} SAMR_Q_CONNECT;
-
-
-/* SAMR_R_CONNECT - probably an open */
-typedef struct r_samr_connect_info
-{
-    POLICY_HND connect_pol;       /* policy handle */
-	uint32 status;         /* return status */
-
-} SAMR_R_CONNECT;
-
-/* SAMR_Q_UNKNOWN_38 */
-typedef struct q_samr_unknown_38
-{
-	uint32 ptr; 
-	UNIHDR  hdr_srv_name;
-	UNISTR2 uni_srv_name;
-
-} SAMR_Q_UNKNOWN_38;
-
-/* SAMR_R_UNKNOWN_38 */
-typedef struct r_samr_unknown_38
-{
-	uint16 unk_0;
-	uint16 unk_1;
-	uint16 unk_2;
-	uint16 unk_3;
-	uint32 status;         /* return status */
-
-} SAMR_R_UNKNOWN_38;
-
-/* SAMR_ENC_PASSWD */
-typedef struct enc_passwd_info
-{
-	uint32 ptr;
-	uint8 pass[516];
-
-} SAMR_ENC_PASSWD;
-
-/* SAMR_ENC_HASH */
-typedef struct enc_hash_info
-{
-	uint32 ptr;
-	uint8 hash[16];
-
-} SAMR_ENC_HASH;
-
-/* SAMR_Q_CHGPASSWD_USER */
-typedef struct q_samr_chgpasswd_user_info
-{
-	uint32 ptr_0;
-
-	UNIHDR hdr_dest_host; /* server name unicode header */
-	UNISTR2 uni_dest_host; /* server name unicode string */
-
-	UNIHDR hdr_user_name;    /* username unicode string header */
-	UNISTR2 uni_user_name;    /* username unicode string */
-
-	SAMR_ENC_PASSWD nt_newpass;
-	SAMR_ENC_HASH nt_oldhash;
-
-	uint32 unknown; /* 0x0000 0001 */
-
-	SAMR_ENC_PASSWD lm_newpass;
-	SAMR_ENC_HASH lm_oldhash;
-
-} SAMR_Q_CHGPASSWD_USER;
-
-/* SAMR_R_CHGPASSWD_USER */
-typedef struct r_samr_chgpasswd_user_info
-{
-	uint32 status; /* 0 == OK, C000006A (NT_STATUS_WRONG_PASSWORD) */
-
-} SAMR_R_CHGPASSWD_USER;
-
-
-/* SAM_USER_INFO_7 */
-typedef struct sam_user_info_7
-{
-	UNIHDR hdr_user_name;
-	UNISTR2 uni_user_name;
-
-} SAM_USER_INFO_7;
-
-/* SAM_USER_INFO_12 */
-typedef struct sam_user_info_12
-{
-	uint8 lm_pwd[16];    /* lm user passwords */
-	uint8 nt_pwd[16];    /* nt user passwords */
-
-	uint8 lm_pwd_active; 
-	uint8 nt_pwd_active; 
-
-} SAM_USER_INFO_12;
-
-/* SAM_USER_INFO_23 */
-typedef struct sam_user_info_23
-{
-	/* TIMES MAY NOT IN RIGHT ORDER!!!! */
-	NTTIME logon_time;            /* logon time */
-	NTTIME logoff_time;           /* logoff time */
-	NTTIME kickoff_time;          /* kickoff time */
-	NTTIME pass_last_set_time;    /* password last set time */
-	NTTIME pass_can_change_time;  /* password can change time */
-	NTTIME pass_must_change_time; /* password must change time */
-
-	UNIHDR hdr_user_name;    /* NULL - user name unicode string header */
-	UNIHDR hdr_full_name;    /* user's full name unicode string header */
-	UNIHDR hdr_home_dir;     /* home directory unicode string header */
-	UNIHDR hdr_dir_drive;    /* home drive unicode string header */
-	UNIHDR hdr_logon_script; /* logon script unicode string header */
-	UNIHDR hdr_profile_path; /* profile path unicode string header */
-	UNIHDR hdr_acct_desc  ;  /* user description */
-	UNIHDR hdr_workstations; /* comma-separated workstations user can log in from */
-	UNIHDR hdr_unknown_str ; /* don't know what this is, yet. */
-	UNIHDR hdr_munged_dial ; /* munged path name and dial-back tel number */
-
-	uint8 lm_pwd[16];    /* lm user passwords */
-	uint8 nt_pwd[16];    /* nt user passwords */
-
-	uint32 user_rid;      /* Primary User ID */
-	uint32 group_rid;     /* Primary Group ID */
-
-	uint32 acb_info; /* account info (ACB_xxxx bit-mask) */
-
-	uint32 unknown_3; /* 0x09f8 27fa */
-
-	uint16 logon_divs; /* 0x0000 00a8 which is 168 which is num hrs in a week */
-	/* uint8 pad[2] */
-	uint32 ptr_logon_hrs; /* pointer to logon hours */
-
-	uint8 padding1[8];
-
-	uint32 unknown_5;     /* 0x0001 0000 */
-
-	uint8 pass[516];
-
-	UNISTR2 uni_user_name;    /* NULL - username unicode string */
-	UNISTR2 uni_full_name;    /* user's full name unicode string */
-	UNISTR2 uni_home_dir;     /* home directory unicode string */
-	UNISTR2 uni_dir_drive;    /* home directory drive unicode string */
-	UNISTR2 uni_logon_script; /* logon script unicode string */
-	UNISTR2 uni_profile_path; /* profile path unicode string */
-	UNISTR2 uni_acct_desc  ;  /* user description unicode string */
-	UNISTR2 uni_workstations; /* login from workstations unicode string */
-	UNISTR2 uni_unknown_str ; /* don't know what this is, yet. */
-	UNISTR2 uni_munged_dial ; /* munged path name and dial-back tel no */
-
-	uint32 unknown_6; /* 0x0000 04ec */
-	uint32 padding4;
-
-	LOGON_HRS logon_hrs;
-
-} SAM_USER_INFO_23;
-
-/* SAM_USER_INFO_24 */
-typedef struct sam_user_info_24
-{
-	uint8 pass[516];
-} SAM_USER_INFO_24;
-
-/* SAM_USERINFO_CTR - sam user info */
-typedef struct sam_userinfo_ctr_info
-{
-	uint16 switch_value;
-	union
-	{
-		SAM_USER_INFO_7 *id7;
-		SAM_USER_INFO_10 *id10; /* auth-level 0x10 */
-		SAM_USER_INFO_11 *id11; /* auth-level 0x11 */
-		SAM_USER_INFO_12 *id12; /* auth-level 0x12 */
-		SAM_USER_INFO_21 *id21; /* auth-level 21 */
-		SAM_USER_INFO_23 *id23; /* auth-level 0x17 */
-		SAM_USER_INFO_24 *id24; /* auth-level 0x18 */
-		void* id; /* to make typecasting easy */
-	} info;
-
-} SAM_USERINFO_CTR;
-
-/* SAMR_Q_SET_USERINFO - set sam info */
-typedef struct q_samr_set_user_info
-{
-	POLICY_HND pol;          /* policy handle associated with user */
-	uint16 switch_value;
-	SAM_USERINFO_CTR *ctr;
-
-} SAMR_Q_SET_USERINFO;
-
-/* SAMR_R_SET_USERINFO - set sam info */
-typedef struct r_samr_set_user_info
-{
-	uint32 status;         /* return status */
-
-} SAMR_R_SET_USERINFO;
-
-/* SAMR_Q_SET_USERINFO2 - set sam info */
-typedef struct q_samr_set_user_info2
-{
-	POLICY_HND pol;          /* policy handle associated with user */
-	uint16 switch_value;      /* 0x0010 */
-
-	SAM_USERINFO_CTR *ctr;
-
-} SAMR_Q_SET_USERINFO2;
-
-/* SAMR_R_SET_USERINFO2 - set sam info */
-typedef struct r_samr_set_user_info2
-{
-	uint32 status;         /* return status */
-
-} SAMR_R_SET_USERINFO2;
-
-#endif /* _RPC_SAMR_H */
-
diff --git a/source3/rpc_parse/parse_samr_new.c b/source3/rpc_parse/parse_samr_new.c
deleted file mode 100644
index 7a52551be8..0000000000
--- a/source3/rpc_parse/parse_samr_new.c
+++ /dev/null
@@ -1,1275 +0,0 @@
-#define NEW_NTDOMAIN 1
-/* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-2000,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
- *  Copyright (C) Paul Ashton                  1997-2000,
- *  Copyright (C) Elrond                            2000
- *  
- *  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>
-
-/*******************************************************************
-makes a SAMR_Q_CONNECT structure.
-********************************************************************/
-BOOL init_samr_q_connect(SAMR_Q_CONNECT * q_u, char *srv_name, 
-			 uint32 access_mask)
-{
-	int len_srv_name = strlen(srv_name);
-
-	DEBUG(5, ("init_samr_q_connect\n"));
-
-	/* make PDC server name \\server */
-
-	q_u->ptr_srv_name = len_srv_name ? 1 : 0;
-	init_unistr2(&q_u->uni_srv_name, srv_name, len_srv_name + 1);
-
-	/* example values: 0x0000 0002 */
-
-	q_u->access_mask = access_mask;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_connect(char *desc, SAMR_Q_CONNECT * q_u, prs_struct *ps, 
-		       int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_connect");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("ptr_srv_name", ps, depth, &q_u->ptr_srv_name);
-	smb_io_unistr2("", &q_u->uni_srv_name, q_u->ptr_srv_name, ps,
-		       depth);
-
-	prs_align(ps);
-
-	prs_uint32("access_mask", ps, depth, &q_u->access_mask);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_connect(char *desc, SAMR_R_CONNECT * r_u, prs_struct *ps, 
-		       int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_connect");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth);
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_CLOSE_HND structure.
-********************************************************************/
-BOOL init_samr_q_close_hnd(SAMR_Q_CLOSE_HND * q_c, POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_close_hnd\n"));
-
-	q_c->pol = *hnd;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_close_hnd(char *desc, SAMR_Q_CLOSE_HND * q_u,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_close_hnd");
-	depth++;
-
-	prs_align(ps);
-
-	return smb_io_pol_hnd("pol", &q_u->pol, ps, depth);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_close_hnd(char *desc, SAMR_R_CLOSE_HND * r_u,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_close_hnd");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("pol", &r_u->pol, ps, depth);
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL init_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN * q_u, 
-			     POLICY_HND *connect_pol, uint32 access_mask,
-			     DOM_SID *sid)
-{
-	DEBUG(5, ("init_samr_q_open_domain\n"));
-
-	q_u->connect_pol = *connect_pol;
-	q_u->access_mask = access_mask;
-
-	init_dom_sid2(&q_u->dom_sid, sid);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_open_domain(char *desc, SAMR_Q_OPEN_DOMAIN * q_u,
-			   prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_open_domain");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("connect_pol", &q_u->connect_pol, ps, depth);
-
-	prs_uint32("access_mask", ps, depth, &q_u->access_mask);
-
-	smb_io_dom_sid2("sid", &q_u->dom_sid, ps, depth);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_open_domain(char *desc, SAMR_R_OPEN_DOMAIN * r_u,
-			   prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_open_domain");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("domain_pol", &r_u->domain_pol, ps, depth);
-
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL init_samr_q_open_user(SAMR_Q_OPEN_USER * q_u, POLICY_HND *pol,
-			   uint32 access_mask, uint32 rid)
-{
-	DEBUG(5, ("init_samr_q_open_user\n"));
-
-	q_u->domain_pol = *pol;
-	q_u->access_mask = access_mask;
-	q_u->user_rid = rid;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_open_user(char *desc, SAMR_Q_OPEN_USER * q_u,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_open_user");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth);
-
-	prs_uint32("access_mask", ps, depth, &q_u->access_mask);
-	prs_uint32("user_rid ", ps, depth, &q_u->user_rid);
-
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_open_user(char *desc, SAMR_R_OPEN_USER * r_u,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_open_user");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("user_pol", &r_u->user_pol, ps, depth);
-
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_USERINFO structure.
-********************************************************************/
-BOOL init_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO * q_u,
-				POLICY_HND *hnd, uint16 switch_value)
-{
-	DEBUG(5, ("init_samr_q_query_userinfo\n"));
-
-	q_u->pol = *hnd;
-	q_u->switch_value = switch_value;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_query_userinfo(char *desc, SAMR_Q_QUERY_USERINFO * q_u,
-			      prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_query_userinfo");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("pol", &q_u->pol, ps, depth);
-
-	prs_uint16("switch_value", ps, depth, &q_u->switch_value);	/* 0x0015 or 0x0011 */
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_query_userinfo(char *desc, SAMR_R_QUERY_USERINFO * r_u,
-			      prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_query_userinfo");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("ptr", ps, depth, &r_u->ptr);
-
-	if (r_u->ptr != 0) {
-		samr_io_userinfo_ctr("ctr", r_u->ctr, ps, depth);
-	}
-
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	if (!ps->io) {
-		/* writing */
-		if (r_u->ctr != NULL) {
-			free_samr_userinfo_ctr(r_u->ctr);
-		}
-	}
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_userinfo_ctr(char *desc, SAM_USERINFO_CTR * ctr,
-				 prs_struct *ps, int depth)
-{
-	BOOL ret;
-
-	prs_debug(ps, depth, desc, "samr_io_userinfo_ctr");
-	depth++;
-
-	/* lkclXXXX DO NOT ALIGN BEFORE READING SWITCH VALUE! */
-
-	prs_uint16("switch_value", ps, depth, &(ctr->switch_value));
-	prs_align(ps);
-
-	ret = False;
-
-	switch (ctr->switch_value)
-	{
-		case 0x10:
-		{
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id10 = (SAM_USER_INFO_10 *)
-					malloc(sizeof(SAM_USER_INFO_10));
-			}
-			if (ctr->info.id10 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info10("", ctr->info.id10, ps,
-						 depth);
-			break;
-		}
-		case 0x11:
-		{
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id11 = (SAM_USER_INFO_11 *)
-					malloc(sizeof(SAM_USER_INFO_11));
-			}
-			if (ctr->info.id11 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info11("", ctr->info.id11, ps,
-						 depth);
-			break;
-		}
-		case 0x12:
-		{
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id12 = (SAM_USER_INFO_12 *)
-					malloc(sizeof(SAM_USER_INFO_12));
-			}
-			if (ctr->info.id12 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info12("", ctr->info.id12, ps,
-						 depth);
-			break;
-		}
-		case 21:
-		{
-#if 0
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id21 = (SAM_USER_INFO_21 *)
-					malloc(sizeof(SAM_USER_INFO_21));
-			}
-#endif
-			if (ctr->info.id21 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info21("", ctr->info.id21, ps,
-						 depth);
-			break;
-		}
-		case 23:
-		{
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id23 = (SAM_USER_INFO_23 *)
-					malloc(sizeof(SAM_USER_INFO_23));
-			}
-			if (ctr->info.id23 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info23("", ctr->info.id23, ps,
-						 depth);
-			break;
-		}
-		case 24:
-		{
-			if (UNMARSHALLING(ps))
-			{
-				/* reading */
-				ctr->info.id24 = (SAM_USER_INFO_24 *)
-					malloc(sizeof(SAM_USER_INFO_24));
-			}
-			if (ctr->info.id24 == NULL)
-			{
-				DEBUG(2,
-				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
-				return False;
-			}
-			ret = sam_io_user_info24("", ctr->info.id24, ps,
-						 depth);
-			break;
-		}
-		default:
-		{
-			DEBUG(2, ("samr_io_userinfo_ctr: unknown switch "
-				  "level 0x%x\n", ctr->switch_value));
-			ret = False;
-			break;
-		}
-
-	}
-
-	prs_align(ps);
-
-	return ret;
-}
-
-/*******************************************************************
-frees a structure.
-********************************************************************/
-void free_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr)
-{
-	if (!ctr) return;
-
-	safe_free(ctr->info.id);
-	ctr->info.id = NULL;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info10(char *desc, SAM_USER_INFO_10 * usr,
-			prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_user_info10");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("acb_info", ps, depth, &(usr->acb_info));
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAM_USER_INFO_11 structure.
-********************************************************************/
-BOOL init_sam_user_info11(SAM_USER_INFO_11 * usr,
-			  NTTIME * expiry,
-			  char *mach_acct,
-			  uint32 rid_user, uint32 rid_group, uint16 acct_ctrl)
-{
-	int len_mach_acct;
-
-	DEBUG(5, ("init_sam_user_info11\n"));
-
-	len_mach_acct = strlen(mach_acct);
-
-	memcpy(&(usr->expiry), expiry, sizeof(usr->expiry));	/* expiry time or something? */
-	ZERO_STRUCT(usr->padding_1);	/* 0 - padding 24 bytes */
-
-	init_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct);	/* unicode header for machine account */
-	usr->padding_2 = 0;	/* 0 - padding 4 bytes */
-
-	usr->ptr_1 = 1;		/* pointer */
-	ZERO_STRUCT(usr->padding_3);	/* 0 - padding 32 bytes */
-	usr->padding_4 = 0;	/* 0 - padding 4 bytes */
-
-	usr->ptr_2 = 1;		/* pointer */
-	usr->padding_5 = 0;	/* 0 - padding 4 bytes */
-
-	usr->ptr_3 = 1;		/* pointer */
-	ZERO_STRUCT(usr->padding_6);	/* 0 - padding 32 bytes */
-
-	usr->rid_user = rid_user;
-	usr->rid_group = rid_group;
-
-	usr->acct_ctrl = acct_ctrl;
-	usr->unknown_3 = 0x0000;
-
-	usr->unknown_4 = 0x003f;	/* 0x003f      - 16 bit unknown */
-	usr->unknown_5 = 0x003c;	/* 0x003c      - 16 bit unknown */
-
-	ZERO_STRUCT(usr->padding_7);	/* 0 - padding 16 bytes */
-	usr->padding_8 = 0;	/* 0 - padding 4 bytes */
-
-	init_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct);	/* unicode string for machine account */
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info11(char *desc, SAM_USER_INFO_11 * usr,
-			prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_unknown_11");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint8s(False, "padding_0", ps, depth, usr->padding_0,
-		   sizeof(usr->padding_0));
-
-	smb_io_time("time", &(usr->expiry), ps, depth);
-
-	prs_uint8s(False, "padding_1", ps, depth, usr->padding_1,
-		   sizeof(usr->padding_1));
-
-	smb_io_unihdr("unihdr", &(usr->hdr_mach_acct), ps, depth);
-	prs_uint32("padding_2", ps, depth, &(usr->padding_2));
-
-	prs_uint32("ptr_1    ", ps, depth, &(usr->ptr_1));
-	prs_uint8s(False, "padding_3", ps, depth, usr->padding_3,
-		   sizeof(usr->padding_3));
-	prs_uint32("padding_4", ps, depth, &(usr->padding_4));
-
-	prs_uint32("ptr_2    ", ps, depth, &(usr->ptr_2));
-	prs_uint32("padding_5", ps, depth, &(usr->padding_5));
-
-	prs_uint32("ptr_3    ", ps, depth, &(usr->ptr_3));
-	prs_uint8s(False, "padding_6", ps, depth, usr->padding_6,
-		   sizeof(usr->padding_6));
-
-	prs_uint32("rid_user ", ps, depth, &(usr->rid_user));
-	prs_uint32("rid_group", ps, depth, &(usr->rid_group));
-	prs_uint16("acct_ctrl", ps, depth, &(usr->acct_ctrl));
-	prs_uint16("unknown_3", ps, depth, &(usr->unknown_3));
-	prs_uint16("unknown_4", ps, depth, &(usr->unknown_4));
-	prs_uint16("unknown_5", ps, depth, &(usr->unknown_5));
-
-	prs_uint8s(False, "padding_7", ps, depth, usr->padding_7,
-		   sizeof(usr->padding_7));
-	prs_uint32("padding_8", ps, depth, &(usr->padding_8));
-
-	smb_io_unistr2("unistr2", &(usr->uni_mach_acct), True, ps, depth);
-	prs_align(ps);
-
-	prs_uint8s(False, "padding_9", ps, depth, usr->padding_9,
-		   sizeof(usr->padding_9));
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info12(char *desc, SAM_USER_INFO_12 * u,
-			prs_struct *ps, int depth)
-{
-	DEBUG(0, ("possible security breach!\n"));
-
-	prs_debug(ps, depth, desc, "samr_io_r_user_info12");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint8s(False, "lm_pwd", ps, depth, u->lm_pwd, sizeof(u->lm_pwd));
-	prs_uint8s(False, "nt_pwd", ps, depth, u->nt_pwd, sizeof(u->nt_pwd));
-
-	prs_uint8("lm_pwd_active", ps, depth, &u->lm_pwd_active);
-	prs_uint8("nt_pwd_active", ps, depth, &u->nt_pwd_active);
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info21(char *desc, SAM_USER_INFO_21 * usr,
-			prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "sam_io_user_info21");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_time("logon_time           ", &(usr->logon_time), ps, depth);
-	smb_io_time("logoff_time          ", &(usr->logoff_time), ps, depth);
-	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time), ps,
-		    depth);
-	smb_io_time("kickoff_time         ", &(usr->kickoff_time), ps, depth);
-	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time), ps,
-		    depth);
-	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time),
-		    ps, depth);
-
-	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name), ps, depth);	/* username unicode string header */
-	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name), ps, depth);	/* user's full name unicode string header */
-	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir), ps, depth);	/* home directory unicode string header */
-	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive), ps, depth);	/* home directory drive */
-	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth);	/* logon script unicode string header */
-	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth);	/* profile path unicode string header */
-	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc), ps, depth);	/* account desc */
-	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth);	/* wkstas user can log on from */
-	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str), ps, depth);	/* unknown string */
-	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial), ps, depth);	/* wkstas user can log on from */
-
-	prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd,
-		   sizeof(usr->lm_pwd));
-	prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd,
-		   sizeof(usr->nt_pwd));
-
-	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid));	/* User ID */
-	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid));	/* Group ID */
-	prs_uint32("acb_info      ", ps, depth, &(usr->acb_info));
-
-	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3));
-	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs));	/* logon divisions per week */
-	prs_align(ps);
-	prs_uint32("ptr_logon_hrs ", ps, depth, &(usr->ptr_logon_hrs));
-	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5));
-
-	prs_uint8s(False, "padding1      ", ps, depth, usr->padding1,
-		   sizeof(usr->padding1));
-
-	/* here begins pointed-to data */
-
-	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name),
-		       usr->hdr_user_name.buffer, ps, depth);	/* username unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name),
-		       usr->hdr_full_name.buffer, ps, depth);	/* user's full name unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir),
-		       usr->hdr_home_dir.buffer, ps, depth);	/* home directory unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive),
-		       usr->hdr_dir_drive.buffer, ps, depth);	/* home directory drive unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script),
-		       usr->hdr_logon_script.buffer, ps, depth);	/* logon script unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path),
-		       usr->hdr_profile_path.buffer, ps, depth);	/* profile path unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc),
-		       usr->hdr_acct_desc.buffer, ps, depth);	/* user desc unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_workstations", &(usr->uni_workstations),
-		       usr->hdr_workstations.buffer, ps, depth);	/* worksations user can log on from */
-	prs_align(ps);
-	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str),
-		       usr->hdr_unknown_str.buffer, ps, depth);	/* unknown string */
-	prs_align(ps);
-	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial),
-		       usr->hdr_munged_dial.buffer, ps, depth);	/* worksations user can log on from */
-	prs_align(ps);
-
-	/* ok, this is only guess-work (as usual) */
-	if (usr->unknown_3 != 0x0)
-	{
-		prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6));
-		prs_uint32("padding4      ", ps, depth, &(usr->padding4));
-	}
-	else if (UNMARSHALLING(ps))
-	{
-		usr->unknown_6 = 0;
-		usr->padding4 = 0;
-	}
-
-	if (usr->ptr_logon_hrs)
-	{
-		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs), ps, depth);
-		prs_align(ps);
-	}
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 * usr,
-			prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "sam_io_user_info23");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_time("logon_time           ", &(usr->logon_time), ps, depth);
-	smb_io_time("logoff_time          ", &(usr->logoff_time), ps, depth);
-	smb_io_time("kickoff_time         ", &(usr->kickoff_time), ps, depth);
-	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time), ps,
-		    depth);
-	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time), ps,
-		    depth);
-	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time),
-		    ps, depth);
-
-	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name), ps, depth);	/* username unicode string header */
-	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name), ps, depth);	/* user's full name unicode string header */
-	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir), ps, depth);	/* home directory unicode string header */
-	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive), ps, depth);	/* home directory drive */
-	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth);	/* logon script unicode string header */
-	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth);	/* profile path unicode string header */
-	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc), ps, depth);	/* account desc */
-	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth);	/* wkstas user can log on from */
-	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str), ps, depth);	/* unknown string */
-	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial), ps, depth);	/* wkstas user can log on from */
-
-	prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd,
-		   sizeof(usr->lm_pwd));
-	prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd,
-		   sizeof(usr->nt_pwd));
-
-	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid));	/* User ID */
-	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid));	/* Group ID */
-	prs_uint32("acb_info      ", ps, depth, &(usr->acb_info));
-
-	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3));
-	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs));	/* logon divisions per week */
-	prs_align(ps);
-	prs_uint32("ptr_logon_hrs ", ps, depth, &(usr->ptr_logon_hrs));
-	prs_uint8s(False, "padding1      ", ps, depth, usr->padding1,
-		   sizeof(usr->padding1));
-	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5));
-
-	prs_uint8s(False, "password      ", ps, depth, usr->pass,
-		   sizeof(usr->pass));
-
-	/* here begins pointed-to data */
-
-	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name),
-		       usr->hdr_user_name.buffer, ps, depth);	/* username unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name),
-		       usr->hdr_full_name.buffer, ps, depth);	/* user's full name unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir),
-		       usr->hdr_home_dir.buffer, ps, depth);	/* home directory unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive),
-		       usr->hdr_dir_drive.buffer, ps, depth);	/* home directory drive unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script),
-		       usr->hdr_logon_script.buffer, ps, depth);	/* logon script unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path),
-		       usr->hdr_profile_path.buffer, ps, depth);	/* profile path unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc),
-		       usr->hdr_acct_desc.buffer, ps, depth);	/* user desc unicode string */
-	prs_align(ps);
-	smb_io_unistr2("uni_workstations", &(usr->uni_workstations),
-		       usr->hdr_workstations.buffer, ps, depth);	/* worksations user can log on from */
-	prs_align(ps);
-	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str),
-		       usr->hdr_unknown_str.buffer, ps, depth);	/* unknown string */
-	prs_align(ps);
-	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial),
-		       usr->hdr_munged_dial.buffer, ps, depth);	/* worksations user can log on from */
-	prs_align(ps);
-
-	/* ok, this is only guess-work (as usual) */
-	if (usr->unknown_3 != 0x0)
-	{
-		prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6));
-		prs_uint32("padding4      ", ps, depth, &(usr->padding4));
-	}
-	else if (UNMARSHALLING(ps))
-	{
-		usr->unknown_6 = 0;
-		usr->padding4 = 0;
-	}
-
-	if (usr->ptr_logon_hrs)
-	{
-		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs), ps, depth);
-		prs_align(ps);
-	}
-
-	return True;
-}
-
-/*************************************************************************
- make_sam_user_infoa
-
- unknown_3 = 0x09f8 27fa
- unknown_5 = 0x0001 0000
- unknown_6 = 0x0000 04ec 
-
- *************************************************************************/
-BOOL init_sam_user_info24(SAM_USER_INFO_24 * usr,
-			  const char newpass[516], uint16 passlen)
-{
-	DEBUG(10, ("init_sam_user_info24: passlen: %d\n", passlen));
-	memcpy(usr->pass, newpass, sizeof(usr->pass));
-	usr->unk_0 = passlen;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 * usr,
-			prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "sam_io_user_info24");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint8s(False, "password", ps, depth, usr->pass,
-		   sizeof(usr->pass));
-	prs_uint16("unk_0", ps, depth, &(usr->unk_0));	/* unknown */
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a LOGON_HRS structure.
-********************************************************************/
-BOOL sam_io_logon_hrs(char *desc, LOGON_HRS * hrs, prs_struct *ps, 
-		      int depth)
-{
-	if (hrs == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "sam_io_logon_hrs");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("len  ", ps, depth, &hrs->len);
-
-	if (hrs->len > sizeof(hrs->hours))
-	{
-		DEBUG(3, ("sam_io_logon_hrs: truncating length from %d\n",
-			  hrs->len));
-		hrs->len = sizeof(hrs->hours);
-	}
-
-	prs_uint8s(False, "hours", ps, depth, hrs->hours, hrs->len);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_GROUPINFO structure.
-********************************************************************/
-BOOL init_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO * q_e,
-				 POLICY_HND *pol, uint16 switch_level)
-{
-	DEBUG(5, ("init_samr_q_query_groupinfo\n"));
-
-	q_e->pol = *pol;
-	q_e->switch_level = switch_level;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_query_groupinfo(char *desc, SAMR_Q_QUERY_GROUPINFO * q_e,
-			       prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_query_groupinfo");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("pol", &q_e->pol, ps, depth);
-	prs_uint16("switch_level", ps, depth, &q_e->switch_level);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_query_groupinfo(char *desc, SAMR_R_QUERY_GROUPINFO * r_u,
-			       prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_query_groupinfo");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("ptr", ps, depth, &r_u->ptr);
-
-	if (r_u->ptr != 0) {
-		samr_group_info_ctr("ctr", r_u->ctr, ps, depth);
-	}
-
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_USERGROUPS structure.
-********************************************************************/
-BOOL samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS * q_u, 
-				  POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_query_usergroups\n"));
-
-	q_u->pol = *hnd;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_query_usergroups(char *desc, SAMR_Q_QUERY_USERGROUPS * q_u,
-				prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
-	depth++;
-
-	prs_align(ps);
-
-	return smb_io_pol_hnd("pol", &q_u->pol, ps, depth);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS * r_u,
-				prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("ptr_0       ", ps, depth, &r_u->ptr_0);
-
-	if (r_u->ptr_0 != 0) {
-		prs_uint32("num_entries ", ps, depth, &r_u->num_entries);
-		prs_uint32("ptr_1       ", ps, depth, &r_u->ptr_1);
-
-		if (r_u->num_entries != 0 && r_u->ptr_1 != 0)
-		{
-			samr_io_gids("gids", &r_u->num_entries2, &r_u->gid,
-				     ps, depth);
-		}
-	}
-	prs_uint32("status", ps, depth, &r_u->status);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_GROUPMEM structure.
-********************************************************************/
-BOOL init_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM * q_c, POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_query_groupmem\n"));
-
-	q_c->group_pol = *hnd;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_query_groupmem(char *desc, SAMR_Q_QUERY_GROUPMEM * q_u,
-			      prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_query_groupmem");
-	depth++;
-
-	prs_align(ps);
-
-	return smb_io_pol_hnd("group_pol", &q_u->group_pol, ps, depth);
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_query_groupmem(char *desc, SAMR_R_QUERY_GROUPMEM * r_u,
-			      prs_struct *ps, int depth)
-{
-	uint32 i;
-
-	if (UNMARSHALLING(ps)) {
-		ZERO_STRUCTP(r_u);
-	}
-
-	prs_debug(ps, depth, desc, "samr_io_r_query_groupmem");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("ptr", ps, depth, &r_u->ptr);
-	prs_uint32("num_entries ", ps, depth, &r_u->num_entries);
-
-	if (r_u->ptr != 0)
-	{
-		prs_uint32("ptr_rids ", ps, depth, &r_u->ptr_rids);
-		prs_uint32("ptr_attrs", ps, depth, &r_u->ptr_attrs);
-
-		if (r_u->ptr_rids != 0) {
-			prs_uint32("num_rids", ps, depth, &r_u->num_rids);
-			if (r_u->num_rids != 0) {
-
-				r_u->rid = (uint32 *)
-					talloc(ps->mem_ctx, 
-					       sizeof(r_u->rid [0]) *
-					       r_u->num_rids);
-			}
-
-			for (i = 0; i < r_u->num_rids; i++) {
-				prs_uint32("", ps, depth, &r_u->rid[i]);
-			}
-		}
-
-		if (r_u->ptr_attrs != 0) {
-			prs_uint32("num_attrs", ps, depth, &r_u->num_attrs);
-
-			if (r_u->num_attrs != 0) {
-				r_u->attr = (uint32 *)
-					talloc(ps->mem_ctx, 
-					       sizeof(r_u->attr[0]) *
-					       r_u->num_attrs);
-			}
-
-			for (i = 0; i < r_u->num_attrs; i++) {
-				prs_uint32("", ps, depth, &r_u->attr[i]);
-			}
-		}
-	}
-
-	prs_uint32("status", ps, depth, &(r_u->status));
-
-	if (!ps->io) {
-		/* storing.  memory no longer needed */
-		samr_free_r_query_groupmem(r_u);
-	}
-
-	return True;
-}
-
-/*******************************************************************
-frees a structure.
-********************************************************************/
-void samr_free_r_query_groupmem(SAMR_R_QUERY_GROUPMEM * r_u)
-{
-	safe_free(r_u->rid);
-	r_u->rid = NULL;
-
-	safe_free(r_u->attr);
-	r_u->attr = NULL;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_group_info_ctr(char *desc, GROUP_INFO_CTR * ctr, prs_struct *ps, 
-			 int depth)
-{
-	prs_debug(ps, depth, desc, "samr_group_info_ctr");
-	depth++;
-
-	prs_uint16("switch_value1", ps, depth, &(ctr->switch_value1));
-	prs_uint16("switch_value2", ps, depth, &(ctr->switch_value2));
-
-	switch (ctr->switch_value1)
-	{
-		case 1:
-		{
-			samr_io_group_info1("group_info1",
-					    &(ctr->group.info1), ps, depth);
-			break;
-		}
-		case 4:
-		{
-			samr_io_group_info4("group_info4",
-					    &(ctr->group.info4), ps, depth);
-			break;
-		}
-		default:
-		{
-			DEBUG(4,
-			      ("samr_group_info_ctr: unsupported switch level\n"));
-			break;
-		}
-	}
-
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_gids(char *desc, uint32 *num_gids, DOM_GID ** gid,
-		  prs_struct *ps, int depth)
-{
-	uint32 i;
-
-	prs_debug(ps, depth, desc, "samr_io_gids");
-	depth++;
-
-	prs_align(ps);
-
-	prs_uint32("num_gids", ps, depth, num_gids);
-
-	if ((*num_gids) != 0)
-	{
-		if (UNMARSHALLING(ps))
-		{
-			(*gid) = (DOM_GID *)
-				talloc(ps->mem_ctx, sizeof(DOM_GID) * 
-				       (*num_gids));
-		}
-
-		if ((*gid) == NULL)
-		{
-			return False;
-		}
-
-		for (i = 0; i < (*num_gids); i++)
-		{
-			smb_io_gid("gids", &(*gid)[i], ps, depth);
-		}
-	}
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_group_info1(char *desc, GROUP_INFO1 * gr1,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_group_info1");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_unihdr("hdr_acct_name", &(gr1->hdr_acct_name), ps, depth);
-
-	prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
-	prs_uint32("num_members", ps, depth, &(gr1->num_members));
-
-	smb_io_unihdr("hdr_acct_desc", &(gr1->hdr_acct_desc), ps, depth);
-
-	smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name),
-		       gr1->hdr_acct_name.buffer, ps, depth);
-	prs_align(ps);
-
-	smb_io_unistr2("uni_acct_desc", &(gr1->uni_acct_desc),
-		       gr1->hdr_acct_desc.buffer, ps, depth);
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_group_info4(char *desc, GROUP_INFO4 * gr4,
-			 prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_group_info4");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_unihdr("hdr_acct_desc", &(gr4->hdr_acct_desc), ps, depth);
-	smb_io_unistr2("uni_acct_desc", &(gr4->uni_acct_desc),
-		       gr4->hdr_acct_desc.buffer, ps, depth);
-	prs_align(ps);
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_QUERY_USERGROUPS structure.
-********************************************************************/
-BOOL init_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS * q_u,
-				  POLICY_HND *hnd)
-{
-	DEBUG(5, ("init_samr_q_query_usergroups\n"));
-
-	q_u->pol = *hnd;
-
-	return True;
-}
-
-/*******************************************************************
-makes a SAMR_Q_OPEN_GROUP structure.
-********************************************************************/
-BOOL init_samr_q_open_group(SAMR_Q_OPEN_GROUP * q_c, POLICY_HND *hnd,
-			    uint32 access_mask, uint32 rid)
-{
-	DEBUG(5, ("init_samr_q_open_group\n"));
-
-	q_c->domain_pol = *hnd;
-	q_c->access_mask = access_mask;
-	q_c->rid_group = rid;
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_q_open_group(char *desc, SAMR_Q_OPEN_GROUP * q_u,
-			  prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_q_open_group");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
-
-	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
-	prs_uint32("rid_group", ps, depth, &(q_u->rid_group));
-
-	return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL samr_io_r_open_group(char *desc, SAMR_R_OPEN_GROUP * r_u,
-			  prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "samr_io_r_open_group");
-	depth++;
-
-	prs_align(ps);
-
-	smb_io_pol_hnd("pol", &r_u->group_pol, ps, depth);
-
-	prs_uint32("status", ps, depth, &(r_u->status));
-
-	return True;
-}
-
-#undef NEW_NTDOMAIN