diff options
| -rw-r--r-- | source3/include/includes.h | 10 | ||||
| -rw-r--r-- | source3/include/ntdomain.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 10 | ||||
| -rw-r--r-- | source3/include/rpc_samr.h | 1185 | ||||
| -rw-r--r-- | source3/include/rpc_samr_old.h | 1068 | ||||
| -rw-r--r-- | source3/rpc_client/cli_samr.c | 3 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_samr.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 5 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_samr.c | 6 | ||||
| -rw-r--r-- | source3/script/mkproto.awk | 18 |
11 files changed, 2018 insertions, 300 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 68872f39f0..432fd09f0b 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -601,7 +601,7 @@ extern int errno; #define NGROUPS_MAX 32 /* Guess... */ #endif -/* Lists, trees, caching, datbase... */ +/* Lists, trees, caching, database... */ #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" @@ -613,12 +613,6 @@ extern int errno; #include "nterr.h" #include "secrets.h" -#ifdef HAVE_FNMATCH -#include <fnmatch.h> -#else -#include "fnmatch.h" -#endif - #ifndef UBI_BINTREE_H #include "ubi_Cache.h" #endif /* UBI_BINTREE_H */ @@ -635,7 +629,7 @@ extern int errno; #include "kanji.h" #include "charset.h" -#include "nterr.h" +#include "ntdomain.h" #include "msdfs.h" diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index 5440ca1bae..527d79bbb1 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -227,7 +227,11 @@ struct acct_info #include "rpc_lsa.h" #include "rpc_netlogon.h" #include "rpc_reg.h" +#if OLD_NTDOMAIN +#include "rpc_samr_old.h" +#else #include "rpc_samr.h" +#endif #include "rpc_srvsvc.h" #include "rpc_wkssvc.h" #include "rpc_spoolss.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index b19eb7e662..4941dd8519 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1762,6 +1762,7 @@ BOOL do_reg_close(struct cli_state *cli, POLICY_HND *hnd); /*The following definitions come from rpc_client/cli_samr.c */ +#if OLD_NTDOMAIN BOOL get_samr_query_usergroups(struct cli_state *cli, POLICY_HND *pol_open_domain, uint32 user_rid, uint32 *num_groups, DOM_GID *gid); @@ -1800,6 +1801,7 @@ BOOL do_samr_query_usergroups(struct cli_state *cli, BOOL do_samr_query_userinfo(struct cli_state *cli, POLICY_HND *pol, uint16 switch_value, void* usr); BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd); +#endif /*The following definitions come from rpc_client/cli_srvsvc.c */ @@ -2225,6 +2227,7 @@ BOOL smb_io_rpc_auth_ntlmssp_chk(char *desc, RPC_AUTH_NTLMSSP_CHK *chk, prs_stru /*The following definitions come from rpc_parse/parse_samr.c */ +#if OLD_NTDOMAIN void init_samr_q_close_hnd(SAMR_Q_CLOSE_HND *q_c, POLICY_HND *hnd); BOOL samr_io_q_close_hnd(char *desc, SAMR_Q_CLOSE_HND *q_u, prs_struct *ps, int depth); BOOL samr_io_r_close_hnd(char *desc, SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int depth); @@ -2401,6 +2404,7 @@ void init_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u, BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth); void init_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status); BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth); +#endif /*The following definitions come from rpc_parse/parse_sec.c */ @@ -2697,6 +2701,7 @@ BOOL api_netlog_rpc(pipes_struct *p, prs_struct *data); /*The following definitions come from rpc_server/srv_pipe.c */ +#if OLD_NTDOMAIN BOOL create_next_pdu(pipes_struct *p); BOOL api_pipe_bind_auth_resp(pipes_struct *p, prs_struct *rpc_in_p); BOOL setup_fault_pdu(pipes_struct *p); @@ -2705,6 +2710,7 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in); BOOL api_pipe_request(pipes_struct *p); BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds, prs_struct *rpc_in); +#endif /*The following definitions come from rpc_server/srv_pipe_hnd.c */ @@ -2727,7 +2733,9 @@ BOOL api_reg_rpc(pipes_struct *p, prs_struct *data); /*The following definitions come from rpc_server/srv_samr.c */ +#if OLD_NTDOMAIN BOOL api_samr_rpc(pipes_struct *p, prs_struct *data); +#endif /*The following definitions come from rpc_server/srv_spoolss.c */ @@ -3503,6 +3511,8 @@ int tdb_get_int_byblob(TDB_CONTEXT *tdb, char *keyval, size_t len); int tdb_get_int(TDB_CONTEXT *tdb, char *keystr); int tdb_store_int_byblob(TDB_CONTEXT *tdb, char *keystr, size_t len, int v); int tdb_store_int(TDB_CONTEXT *tdb, char *keystr, int v); +int tdb_store_by_string(TDB_CONTEXT *tdb, char *keystr, void *buffer, int len); +TDB_DATA tdb_fetch_by_string(TDB_CONTEXT *tdb, char *keystr); /*The following definitions come from utils/nbio.c */ diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 26dd2bf447..c769cf4381 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -2,9 +2,9 @@ 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 + Copyright (C) Andrew Tridgell 1992-2000 + Copyright (C) Luke Kenneth Casson Leighton 1996-2000 + Copyright (C) Paul Ashton 1997-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 @@ -32,18 +32,18 @@ the following information comes from a QuickView on samsrv.dll, and gives an idea of exactly what is needed: -SamrAddMemberToAlias -SamrAddMemberToGroup +x SamrAddMemberToAlias +x SamrAddMemberToGroup SamrAddMultipleMembersToAlias -SamrChangePasswordUser +x SamrChangePasswordUser x SamrCloseHandle x SamrConnect -SamrCreateAliasInDomain -SamrCreateGroupInDomain -SamrCreateUserInDomain -SamrDeleteAlias +x SamrCreateAliasInDomain +x SamrCreateGroupInDomain +x SamrCreateUserInDomain +? SamrDeleteAlias SamrDeleteGroup -SamrDeleteUser +x SamrDeleteUser x SamrEnumerateAliasesInDomain SamrEnumerateDomainsInSamServer x SamrEnumerateGroupsInDomain @@ -54,21 +54,21 @@ SamrLookupDomainInSamServer x SamrLookupNamesInDomain x SamrOpenAlias x SamrOpenDomain -SamrOpenGroup +x SamrOpenGroup x SamrOpenUser x SamrQueryDisplayInformation x SamrQueryInformationAlias SamrQueryInformationDomain ? SamrQueryInformationUser -SamrQuerySecurityObject +x SamrQuerySecurityObject SamrRemoveMemberFromAlias SamrRemoveMemberFromForiegnDomain SamrRemoveMemberFromGroup SamrRemoveMultipleMembersFromAlias -SamrSetInformationAlias +x SamrSetInformationAlias SamrSetInformationDomain -SamrSetInformationGroup -SamrSetInformationUser +x SamrSetInformationGroup +x SamrSetInformationUser SamrSetMemberAttributesOfGroup SamrSetSecurityObject SamrShutdownSamServer @@ -77,30 +77,73 @@ SamrTestPrivateFunctionsUser ********************************************************************/ +#define SAMR_CONNECT_ANON 0x00 #define SAMR_CLOSE_HND 0x01 +#define SAMR_UNKNOWN_2 0x02 /* set sec object? */ +#define SAMR_QUERY_SEC_OBJECT 0x03 + +#define SAMR_UNKNOWN_4 0x04 /* profile info? */ +#define SAMR_LOOKUP_DOMAIN 0x05 +#define SAMR_ENUM_DOMAINS 0x06 #define SAMR_OPEN_DOMAIN 0x07 #define SAMR_QUERY_DOMAIN_INFO 0x08 -#define SAMR_LOOKUP_IDS 0x10 + +#define SAMR_CREATE_DOM_GROUP 0x0a +#define SAMR_ENUM_DOM_GROUPS 0x0b +#define SAMR_ENUM_DOM_USERS 0x0d +#define SAMR_CREATE_DOM_ALIAS 0x0e +#define SAMR_ENUM_DOM_ALIASES 0x0f +#define SAMR_QUERY_USERALIASES 0x10 + #define SAMR_LOOKUP_NAMES 0x11 -#define SAMR_UNKNOWN_3 0x03 -#define SAMR_QUERY_DISPINFO 0x28 +#define SAMR_LOOKUP_RIDS 0x12 + +#define SAMR_OPEN_GROUP 0x13 +#define SAMR_QUERY_GROUPINFO 0x14 +#define SAMR_SET_GROUPINFO 0x15 +#define SAMR_ADD_GROUPMEM 0x16 +#define SAMR_DELETE_DOM_GROUP 0x17 +#define SAMR_DEL_GROUPMEM 0x18 +#define SAMR_QUERY_GROUPMEM 0x19 +#define SAMR_UNKNOWN_1A 0x1a + +#define SAMR_OPEN_ALIAS 0x1b +#define SAMR_QUERY_ALIASINFO 0x1c +#define SAMR_SET_ALIASINFO 0x1d +#define SAMR_DELETE_DOM_ALIAS 0x1e +#define SAMR_ADD_ALIASMEM 0x1f +#define SAMR_DEL_ALIASMEM 0x20 +#define SAMR_QUERY_ALIASMEM 0x21 + #define SAMR_OPEN_USER 0x22 +#define SAMR_DELETE_DOM_USER 0x23 #define SAMR_QUERY_USERINFO 0x24 +#define SAMR_SET_USERINFO2 0x25 #define SAMR_QUERY_USERGROUPS 0x27 -#define SAMR_UNKNOWN_12 0x12 -#define SAMR_UNKNOWN_21 0x21 -#define SAMR_UNKNOWN_2C 0x2c -#define SAMR_UNKNOWN_32 0x32 -#define SAMR_UNKNOWN_34 0x34 + +#define SAMR_QUERY_DISPINFO 0x28 +#define SAMR_UNKNOWN_29 0x29 +#define SAMR_UNKNOWN_2a 0x2a +#define SAMR_UNKNOWN_2b 0x2b +#define SAMR_GET_USRDOM_PWINFO 0x2c +#define SAMR_UNKNOWN_2D 0x2d +#define SAMR_UNKNOWN_2e 0x2e +#define SAMR_UNKNOWN_2f 0x2f +#define SAMR_QUERY_DISPINFO3 0x30 /* Alias for SAMR_QUERY_DISPINFO + with info level 3 */ +#define SAMR_UNKNOWN_31 0x31 +#define SAMR_CREATE_USER 0x32 +#define SAMR_QUERY_DISPINFO4 0x33 /* Alias for SAMR_QUERY_DISPINFO + with info level 4 */ +#define SAMR_ADDMULTI_ALIASMEM 0x34 + +#define SAMR_UNKNOWN_35 0x35 +#define SAMR_UNKNOWN_36 0x36 #define SAMR_CHGPASSWD_USER 0x37 -#define SAMR_UNKNOWN_38 0x38 +#define SAMR_GET_DOM_PWINFO 0x38 #define SAMR_CONNECT 0x39 -#define SAMR_CONNECT_ANON 0x00 -#define SAMR_OPEN_ALIAS 0x1b -#define SAMR_QUERY_ALIASINFO 0x1c -#define SAMR_ENUM_DOM_USERS 0x0d -#define SAMR_ENUM_DOM_ALIASES 0x0f -#define SAMR_ENUM_DOM_GROUPS 0x30 +#define SAMR_SET_USERINFO 0x3A + typedef struct logon_hours_info @@ -110,6 +153,75 @@ typedef struct logon_hours_info } LOGON_HRS; +/* 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]; + uint16 unk_0; + +} SAM_USER_INFO_24; + + /* SAM_USER_INFO_21 */ typedef struct sam_user_info_21 { @@ -137,8 +249,7 @@ typedef struct sam_user_info_21 uint32 user_rid; /* Primary User ID */ uint32 group_rid; /* Primary Group ID */ - uint16 acb_info; /* account info (ACB_xxxx bit-mask) */ - /* uint8 pad[2] */ + uint32 acb_info; /* account info (ACB_xxxx bit-mask) */ uint32 unknown_3; /* 0x00ff ffff */ @@ -169,6 +280,17 @@ typedef struct sam_user_info_21 } SAM_USER_INFO_21; +/* 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_11 */ typedef struct sam_user_info_11 { @@ -228,128 +350,108 @@ typedef struct q_samr_close_hnd_info /* SAMR_R_CLOSE_HND - probably a policy handle close */ typedef struct r_samr_close_hnd_info { - POLICY_HND pol; /* policy handle */ + 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_GET_USRDOM_PWINFO - a "set user info" occurs just after this *****************************************************************************/ -/* SAMR_Q_UNKNOWN_2C */ -typedef struct q_samr_unknown_2c_info +/* SAMR_Q_GET_USRDOM_PWINFO */ +typedef struct q_samr_usrdom_pwinfo_info { POLICY_HND user_pol; /* policy handle */ -} SAMR_Q_UNKNOWN_2C; +} SAMR_Q_GET_USRDOM_PWINFO; /**************************************************************************** -SAMR_R_UNKNOWN_2C - a "set user info" occurs just after this +SAMR_R_GET_USRDOM_PWINFO - a "set user info" occurs just after this *****************************************************************************/ -/* SAMR_R_UNKNOWN_2C */ -typedef struct r_samr_unknown_2c_info +/* SAMR_R_GET_USRDOM_PWINFO */ +typedef struct r_samr_usrdom_pwinfo_info { - uint32 unknown_0; /* 0x0016 0000 */ - uint32 unknown_1; /* 0x0000 0000 */ + uint16 unknown_0; /* 0000 */ + uint16 unknown_1; /* 0x0016 or 0x0015 */ + uint32 unknown_2; /* 0x0000 0000 */ uint32 status; -} SAMR_R_UNKNOWN_2C; +} SAMR_R_GET_USRDOM_PWINFO; /**************************************************************************** -SAMR_Q_UNKNOWN_3 - info level 4. returns SIDs. +SAMR_Q_QUERY_SEC_OBJ - info level 4. returns SIDs. *****************************************************************************/ -/* SAMR_Q_UNKNOWN_3 - probably get domain info... */ -typedef struct q_samr_unknown_3_info +/* SAMR_Q_QUERY_SEC_OBJ - probably get domain info... */ +typedef struct q_samr_query_sec_obj_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; + uint32 sec_info; /* xxxx_SECURITY_INFORMATION 0x0000 0004 */ +} SAMR_Q_QUERY_SEC_OBJ; -#define MAX_SAM_SIDS 15 - -/* SAM_SID_STUFF */ -typedef struct sid_stuff_info +/* SAMR_R_QUERY_SEC_OBJ - probably an open */ +typedef struct r_samr_query_sec_obj_info { - uint16 unknown_2; /* 0x0001 */ - uint16 unknown_3; /* 0x8004 */ - - uint8 padding1[8]; + uint32 ptr; + SEC_DESC_BUF buf; - uint32 unknown_4; /* 0x0000 0014 */ - uint32 unknown_5; /* 0x0000 0014 */ + uint32 status; /* return status */ - uint16 unknown_6; /* 0x0002 */ - uint16 unknown_7; /* 0x5800 */ +} SAMR_R_QUERY_SEC_OBJ; - uint32 num_sids; - uint16 padding2; +/**************************************************************************** +SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info. +*****************************************************************************/ - DOM_SID3 sid[MAX_SAM_SIDS]; +/* SAMR_Q_QUERY_DOMAIN_INFO - */ +typedef struct q_samr_query_domain_info +{ + POLICY_HND domain_pol; /* policy handle */ + uint16 switch_value; /* 0x0002, 0x0001 */ -} SAM_SID_STUFF; +} SAMR_Q_QUERY_DOMAIN_INFO; -/* SAMR_R_UNKNOWN_3 - probably an open */ -typedef struct r_samr_unknown_3_info +typedef struct sam_unknown_info_3_info { - uint32 ptr_0; - uint32 sid_stuff_len0; + uint32 unknown_0; /* 0x0000 0000 */ + uint32 unknown_1; /* 0x8000 0000 */ - uint32 ptr_1; - uint32 sid_stuff_len1; +} SAM_UNK_INFO_3; - SAM_SID_STUFF sid_stuff; +typedef struct sam_unknown_info_6_info +{ + uint32 unknown_0; /* 0x0000 0000 */ - uint32 status; /* return status */ + uint32 ptr_0; /* pointer to unknown structure */ + uint8 padding[12]; /* 12 bytes zeros */ -} SAMR_R_UNKNOWN_3; +} SAM_UNK_INFO_6; +typedef struct sam_unknown_info_7_info +{ + uint16 unknown_0; /* 0x0003 */ -/**************************************************************************** -SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info. -*****************************************************************************/ +} SAM_UNK_INFO_7; -/* SAMR_Q_QUERY_DOMAIN_INFO - */ -typedef struct q_samr_query_domain_info +typedef struct sam_unknown_info_12_inf { - POLICY_HND domain_pol; /* policy handle */ - uint16 switch_value; /* 0x0002 */ + 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 */ -} SAMR_Q_QUERY_DOMAIN_INFO; +} SAM_UNK_INFO_12; -typedef struct sam_unkown_info_2_info +typedef struct sam_unknown_info_2_inf { uint32 unknown_0; /* 0x0000 0000 */ uint32 unknown_1; /* 0x8000 0000 */ @@ -380,12 +482,25 @@ typedef struct sam_unkown_info_2_info } SAM_UNK_INFO_2; +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_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; @@ -405,6 +520,28 @@ typedef struct r_samr_query_domain_info } SAMR_R_QUERY_DOMAIN_INFO; +/* 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_OPEN_DOMAIN - unknown_0 values seen associated with SIDs: @@ -416,7 +553,7 @@ SAMR_Q_OPEN_DOMAIN - unknown_0 values seen associated with SIDs: typedef struct q_samr_open_domain_info { POLICY_HND connect_pol; /* policy handle */ - uint32 rid; /* 0x2000 0000; 0x0000 0211; 0x0000 0280; 0x0000 0200 - a RID? */ + uint32 flags; /* 0x2000 0000; 0x0000 0211; 0x0000 0280; 0x0000 0200 - flags? */ DOM_SID2 dom_sid; /* domain SID */ } SAMR_Q_OPEN_DOMAIN; @@ -430,7 +567,6 @@ typedef struct r_samr_open_domain_info } SAMR_R_OPEN_DOMAIN; - #define MAX_SAM_ENTRIES 250 typedef struct samr_entry_info @@ -440,13 +576,43 @@ typedef struct samr_entry_info } SAM_ENTRY; + +/* 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_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? */ + uint32 start_idx; /* number of values (0 indicates unlimited?) */ uint16 acb_mask; /* 0x0000 indicates all */ uint16 unknown_1; /* 0x0000 */ @@ -458,17 +624,16 @@ typedef struct q_samr_enum_dom_users_info /* 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 next_idx; /* next starting index required for enum */ + uint32 ptr_entries1; uint32 num_entries2; uint32 ptr_entries2; uint32 num_entries3; - SAM_ENTRY sam[MAX_SAM_ENTRIES]; - UNISTR2 uni_acct_name[MAX_SAM_ENTRIES]; + SAM_ENTRY *sam; + UNISTR2 *uni_acct_name; uint32 num_entries4; @@ -477,37 +642,15 @@ typedef struct r_samr_enum_dom_users_info } 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 */ + /* this is possibly an enumeration context handle... */ + uint32 start_idx; /* 0x0000 0000 */ - uint32 max_size; /* 0x0000 7fff */ + uint32 max_size; /* 0x0000 ffff */ } SAMR_Q_ENUM_DOM_GROUPS; @@ -515,49 +658,50 @@ typedef struct q_samr_enum_dom_groups_info /* 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 next_idx; + uint32 ptr_entries1; uint32 num_entries2; + uint32 ptr_entries2; - SAM_ENTRY3 sam[MAX_SAM_ENTRIES]; - SAM_STR3 str[MAX_SAM_ENTRIES]; + uint32 num_entries3; + + SAM_ENTRY *sam; + UNISTR2 *uni_grp_name; + + uint32 num_entries4; 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 start_idx; /* 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 next_idx; + uint32 ptr_entries1; uint32 num_entries2; uint32 ptr_entries2; uint32 num_entries3; - SAM_ENTRY sam[MAX_SAM_ENTRIES]; - UNISTR2 uni_grp_name[MAX_SAM_ENTRIES]; + SAM_ENTRY *sam; + UNISTR2 *uni_grp_name; uint32 num_entries4; @@ -566,20 +710,7 @@ typedef struct r_samr_enum_dom_aliases_info } SAMR_R_ENUM_DOM_ALIASES; - -/* 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 */ - uint16 unknown_0; /* 0x0000 and 0x2000 seen */ - uint32 start_idx; /* presumably the start enumeration index */ - uint32 unknown_1; /* 0x0000 07d0, 0x0000 0400 and 0x0000 0200 seen */ - - uint32 max_size; /* 0x0000 7fff, 0x0000 7ffe and 0x0000 3fff seen*/ - -} SAMR_Q_QUERY_DISPINFO; +/* -- Level 1 Display Info - User Information -- */ typedef struct samr_entry_info1 { @@ -605,15 +736,13 @@ typedef struct samr_str_entry_info1 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_DISPINFO_1; -} SAM_INFO_1; + +/* -- Level 2 Display Info - Trust Account Information -- */ typedef struct samr_entry_info2 { @@ -637,45 +766,293 @@ typedef struct samr_str_entry_info2 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; +} SAM_DISPINFO_2; + + +/* -- Level 3 Display Info - Domain Group Information -- */ + +typedef struct samr_entry_info3 +{ + uint32 grp_idx; + + uint32 rid_grp; + uint32 attr; /* SE_GROUP_xxx, usually 7 */ + + 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; + +typedef struct sam_entry_info_3 +{ + SAM_ENTRY3 sam[MAX_SAM_ENTRIES]; + SAM_STR3 str[MAX_SAM_ENTRIES]; + +} SAM_DISPINFO_3; + + +/* -- Level 4 Display Info - User List (ASCII) -- */ + +typedef struct samr_entry_info4 +{ + uint32 user_idx; + STRHDR hdr_acct_name; + +} SAM_ENTRY4; + +typedef struct samr_str_entry_info4 +{ + STRING2 acct_name; + +} SAM_STR4; + +typedef struct sam_entry_info_4 +{ + SAM_ENTRY4 sam[MAX_SAM_ENTRIES]; + SAM_STR4 str[MAX_SAM_ENTRIES]; + +} SAM_DISPINFO_4; + + +/* -- Level 5 Display Info - Group List (ASCII) -- */ + +typedef struct samr_entry_info5 +{ + uint32 grp_idx; + STRHDR hdr_grp_name; + +} SAM_ENTRY5; + +typedef struct samr_str_entry_info5 +{ + STRING2 grp_name; + +} SAM_STR5; + +typedef struct sam_entry_info_5 +{ + SAM_ENTRY5 sam[MAX_SAM_ENTRIES]; + SAM_STR5 str[MAX_SAM_ENTRIES]; + +} SAM_DISPINFO_5; + -typedef struct sam_info_ctr_info +typedef struct sam_dispinfo_ctr_info { union { - SAM_INFO_1 *info1; /* server info */ - SAM_INFO_2 *info2; /* user info */ + SAM_DISPINFO_1 *info1; /* users/names/descriptions */ + SAM_DISPINFO_2 *info2; /* trust accounts */ + SAM_DISPINFO_3 *info3; /* domain groups/descriptions */ + SAM_DISPINFO_4 *info4; /* user list (ASCII) - used by Win95 */ + SAM_DISPINFO_5 *info5; /* group list (ASCII) */ void *info; /* allows assignment without typecasting, */ } sam; -} SAM_INFO_CTR; +} SAM_DISPINFO_CTR; -/* SAMR_R_QUERY_DISPINFO - SAM rids, names and descriptions */ + +/* SAMR_Q_QUERY_DISPINFO - SAM rids, names and descriptions */ +typedef struct q_samr_query_disp_info +{ + POLICY_HND domain_pol; + + uint16 switch_level; /* see SAM_DISPINFO_CTR above */ + /* align */ + + uint32 start_idx; /* start enumeration index */ + uint32 max_entries; /* maximum number of entries to return */ + uint32 max_size; /* recommended data size; if exceeded server + should return STATUS_MORE_ENTRIES */ + +} SAMR_Q_QUERY_DISPINFO; + + +/* SAMR_R_QUERY_DISPINFO */ 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] */ + uint32 total_size; /* total data size for all matching entries + (0 = uncalculated) */ + uint32 data_size; /* actual data size returned = size of SAM_ENTRY + structures + total length of strings */ + + uint16 switch_level; /* see SAM_DISPINFO_CTR above */ + /* align */ + + uint32 num_entries; /* number of entries returned */ + uint32 ptr_entries; + uint32 num_entries2; - SAM_INFO_CTR *ctr; + SAM_DISPINFO_CTR *ctr; uint32 status; } SAMR_R_QUERY_DISPINFO; +/* SAMR_Q_DELETE_DOM_GROUP - delete domain group */ +typedef struct q_samr_delete_dom_group_info +{ + POLICY_HND group_pol; /* policy handle */ + +} SAMR_Q_DELETE_DOM_GROUP; + + +/* SAMR_R_DELETE_DOM_GROUP - delete domain group */ +typedef struct r_samr_delete_dom_group_info +{ + POLICY_HND pol; /* policy handle */ + uint32 status; /* return status */ + +} SAMR_R_DELETE_DOM_GROUP; + + +/* SAMR_Q_CREATE_DOM_GROUP - SAM create group */ +typedef struct q_samr_create_dom_group_info +{ + POLICY_HND pol; /* policy handle */ + + UNIHDR hdr_acct_desc; + UNISTR2 uni_acct_desc; + + uint32 access_mask; + +} SAMR_Q_CREATE_DOM_GROUP; + +/* SAMR_R_CREATE_DOM_GROUP - SAM create group */ +typedef struct r_samr_create_dom_group_info +{ + POLICY_HND pol; /* policy handle */ + + uint32 rid; + uint32 status; + +} SAMR_R_CREATE_DOM_GROUP; + +/* SAMR_Q_QUERY_GROUPINFO - SAM Group Info */ +typedef struct q_samr_query_group_info +{ + POLICY_HND pol; /* policy handle */ + + uint16 switch_level; /* 0x0001 seen */ + +} SAMR_Q_QUERY_GROUPINFO; + +typedef struct samr_group_info1 +{ + UNIHDR hdr_acct_name; + + uint32 unknown_1; /* 0x0000 0003 - number of group members? */ + uint32 num_members; /* 0x0000 0001 - number of group members? */ + + UNIHDR hdr_acct_desc; + + UNISTR2 uni_acct_name; + UNISTR2 uni_acct_desc; + +} GROUP_INFO1; + +typedef struct samr_group_info4 +{ + UNIHDR hdr_acct_desc; + UNISTR2 uni_acct_desc; + +} GROUP_INFO4; + +/* GROUP_INFO_CTR */ +typedef struct group_info_ctr +{ + uint16 switch_value1; + uint16 switch_value2; + + union + { + GROUP_INFO4 info4; + GROUP_INFO1 info1; + + } group; + +} GROUP_INFO_CTR; + +/* SAMR_R_QUERY_GROUPINFO - SAM Group Info */ +typedef struct r_samr_query_groupinfo_info +{ + uint32 ptr; + GROUP_INFO_CTR *ctr; + + uint32 status; + +} SAMR_R_QUERY_GROUPINFO; + + +/* SAMR_Q_SET_GROUPINFO - SAM Group Info */ +typedef struct q_samr_set_group_info +{ + POLICY_HND pol; /* policy handle */ + GROUP_INFO_CTR *ctr; + +} SAMR_Q_SET_GROUPINFO; + +/* SAMR_R_SET_GROUPINFO - SAM Group Info */ +typedef struct r_samr_set_group_info +{ + uint32 status; + +} SAMR_R_SET_GROUPINFO; + + +/* SAMR_Q_DELETE_DOM_ALIAS - delete domain alias */ +typedef struct q_samr_delete_dom_alias_info +{ + POLICY_HND alias_pol; /* policy handle */ + +} SAMR_Q_DELETE_DOM_ALIAS; + + +/* SAMR_R_DELETE_DOM_ALIAS - delete domain alias */ +typedef struct r_samr_delete_dom_alias_info +{ + POLICY_HND pol; /* policy handle */ + uint32 status; /* return status */ + +} SAMR_R_DELETE_DOM_ALIAS; + + +/* SAMR_Q_CREATE_DOM_ALIAS - SAM create alias */ +typedef struct q_samr_create_dom_alias_info +{ + POLICY_HND dom_pol; /* policy handle */ + + UNIHDR hdr_acct_desc; + UNISTR2 uni_acct_desc; + + uint32 access_mask; /* 0x001f000f */ + +} SAMR_Q_CREATE_DOM_ALIAS; + +/* SAMR_R_CREATE_DOM_ALIAS - SAM create alias */ +typedef struct r_samr_create_dom_alias_info +{ + POLICY_HND alias_pol; /* policy handle */ + + uint32 rid; + uint32 status; + +} SAMR_R_CREATE_DOM_ALIAS; /* SAMR_Q_QUERY_ALIASINFO - SAM Alias Info */ -typedef struct q_samr_enum_alias_info +typedef struct q_samr_query_alias_info { POLICY_HND pol; /* policy handle */ @@ -690,12 +1067,11 @@ typedef struct samr_alias_info3 } ALIAS_INFO3; -/* SAMR_R_QUERY_ALIASINFO - SAM rids, names and descriptions */ -typedef struct r_samr_query_aliasinfo_info +/* ALIAS_INFO_CTR */ +typedef struct alias_info_ctr { - uint32 ptr; - uint16 switch_value; /* 0x0003 */ - /* uint8[2] padding */ + uint16 switch_value1; + uint16 switch_value2; union { @@ -703,11 +1079,35 @@ typedef struct r_samr_query_aliasinfo_info } alias; +} ALIAS_INFO_CTR; + +/* SAMR_R_QUERY_ALIASINFO - SAM alias info */ +typedef struct r_samr_query_aliasinfo_info +{ + uint32 ptr; + ALIAS_INFO_CTR *ctr; + uint32 status; } SAMR_R_QUERY_ALIASINFO; +/* SAMR_Q_SET_ALIASINFO - SAM Alias Info */ +typedef struct q_samr_set_alias_info +{ + POLICY_HND alias_pol; /* policy handle */ + ALIAS_INFO_CTR *ctr; + +} SAMR_Q_SET_ALIASINFO; + +/* SAMR_R_SET_ALIASINFO - SAM alias info */ +typedef struct r_samr_set_aliasinfo_info +{ + uint32 status; + +} SAMR_R_SET_ALIASINFO; + + /* SAMR_Q_QUERY_USERGROUPS - */ typedef struct q_samr_query_usergroup_info { @@ -729,6 +1129,59 @@ typedef struct r_samr_query_usergroup_info } SAMR_R_QUERY_USERGROUPS; +/* SAM_USERINFO_CTR - sam user info */ +typedef struct sam_userinfo_ctr_info +{ + uint16 switch_value; + + union + { + 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_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; + +/* 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_QUERY_USERINFO - probably a get sam info */ typedef struct q_samr_query_user_info @@ -742,17 +1195,7 @@ typedef struct q_samr_query_user_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; + SAM_USERINFO_CTR *ctr; uint32 status; /* return status */ @@ -760,39 +1203,40 @@ typedef struct r_samr_query_user_info /**************************************************************************** -SAMR_Q_LOOKUP_IDS - do a conversion from name to RID. +SAMR_Q_QUERY_USERALIASES - 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 +/* SAMR_Q_QUERY_USERALIASES */ +typedef struct q_samr_query_useraliases_info { - POLICY_HND pol; /* policy handle */ + 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. */ + uint32 *ptr_sid; /* pointers to sids to be looked up */ + DOM_SID2 *sid ; /* sids to be looked up. */ -} SAMR_Q_LOOKUP_IDS; +} SAMR_Q_QUERY_USERALIASES; -/* SAMR_R_LOOKUP_IDS */ -typedef struct r_samr_lookup_ids_info +/* SAMR_R_QUERY_USERALIASES */ +typedef struct r_samr_query_useraliases_info { uint32 num_entries; uint32 ptr; /* undocumented buffer pointer */ uint32 num_entries2; - uint32 rid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */ + uint32 *rid; /* domain RIDs being looked up */ uint32 status; /* return code */ -} SAMR_R_LOOKUP_IDS; +} SAMR_R_QUERY_USERALIASES; + /**************************************************************************** SAMR_Q_LOOKUP_NAMES - do a conversion from Names to RIDs+types. @@ -812,6 +1256,7 @@ typedef struct q_samr_lookup_names_info } SAMR_Q_LOOKUP_NAMES; + /* SAMR_R_LOOKUP_NAMES */ typedef struct r_samr_lookup_names_info { @@ -819,70 +1264,69 @@ typedef struct r_samr_lookup_names_info uint32 ptr_rids; /* pointer to aliases */ uint32 num_rids2; /* number of aliases being looked up */ - uint32 rid[MAX_LOOKUP_SIDS]; /* rids */ + uint32 *rids; /* 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 *types; /* SID_ENUM type */ uint32 status; /* return code */ } SAMR_R_LOOKUP_NAMES; + /**************************************************************************** -SAMR_Q_UNKNOWN_12 - do a conversion from RID groups to something. +SAMR_Q_LOOKUP_RIDS - do a conversion from RID groups to something. called to resolve domain RID groups. *****************************************************************************/ -/* SAMR_Q_UNKNOWN_12 */ -typedef struct q_samr_unknown_12_info +/* SAMR_Q_LOOKUP_RIDS */ +typedef struct q_samr_lookup_rids_info { - POLICY_HND pol; /* policy handle */ + 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 num_rids1; /* number of rids being looked up */ + uint32 flags; /* 0x0000 03e8 - unknown */ uint32 ptr; /* 0x0000 0000 - 32 bit unknown */ - uint32 num_gids2; /* number of rids being looked up */ + uint32 num_rids2; /* number of rids being looked up */ - uint32 gid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */ + uint32 *rid; /* domain RIDs being looked up */ -} SAMR_Q_UNKNOWN_12; +} SAMR_Q_LOOKUP_RIDS; /**************************************************************************** -SAMR_R_UNKNOWN_12 - do a conversion from group RID to names +SAMR_R_LOOKUP_RIDS - do a conversion from group RID to names *****************************************************************************/ -/* SAMR_R_UNKNOWN_12 */ -typedef struct r_samr_unknown_12_info +/* SAMR_R_LOOKUP_RIDS */ +typedef struct r_samr_lookup_rids_info { - POLICY_HND pol; /* policy handle */ + uint32 num_names1; /* number of aliases being looked up */ + uint32 ptr_names; /* pointer to aliases */ + uint32 num_names2; /* number of aliases being looked up */ - 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_name; /* unicode account name header */ + UNISTR2 *uni_name; /* unicode account name string */ - 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_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 num_als_usrs[MAX_LOOKUP_SIDS]; /* number of users per group */ + uint32 *type; /* SID_ENUM type */ uint32 status; -} SAMR_R_UNKNOWN_12; +} 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 unknown_0; /* 32 bit unknown - 0x02011b */ + POLICY_HND domain_pol; /* policy handle */ + uint32 access_mask; /* 32 bit unknown - 0x02011b */ uint32 user_rid; /* user RID */ } SAMR_Q_OPEN_USER; @@ -891,64 +1335,203 @@ typedef struct q_samr_open_user_info /* SAMR_R_OPEN_USER - probably an open */ typedef struct r_samr_open_user_info { - POLICY_HND user_pol; /* policy handle associated with unknown id */ + 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 +/* SAMR_Q_CREATE_USER - probably a create */ +typedef struct q_samr_create_user_info +{ + POLICY_HND domain_pol; /* policy handle */ + + UNIHDR hdr_name; /* unicode account name header */ + UNISTR2 uni_name; /* unicode account name */ + + uint32 acb_info; /* account control info */ + uint32 access_mask; /* 0xe005 00b0 */ + +} SAMR_Q_CREATE_USER; + + +/* SAMR_R_CREATE_USER - probably a create */ +typedef struct r_samr_create_user_info { - POLICY_HND alias_pol; /* policy handle */ + POLICY_HND user_pol; /* policy handle associated with user */ - uint16 unknown_1; /* 16 bit unknown - 0x0200 */ - uint16 unknown_2; /* 16 bit unknown - 0x0000 */ + uint32 unknown_0; /* 0x0007 03ff */ + uint32 user_rid; /* user RID */ + uint32 status; /* return status */ -} SAMR_Q_UNKNOWN_13; +} SAMR_R_CREATE_USER; -/* SAMR_Q_UNKNOWN_21 - probably an open group in domain */ -typedef struct q_samr_unknown_21_info +/* SAMR_Q_DELETE_DOM_USER - delete domain user */ +typedef struct q_samr_delete_dom_user_info { - POLICY_HND group_pol; /* policy handle */ + POLICY_HND user_pol; /* policy handle */ + +} SAMR_Q_DELETE_DOM_USER; - uint16 unknown_1; /* 16 bit unknown - 0x0477 */ - uint16 unknown_2; /* 16 bit unknown - 0x0000 */ -} SAMR_Q_UNKNOWN_21; +/* SAMR_R_DELETE_DOM_USER - delete domain user */ +typedef struct r_samr_delete_dom_user_info +{ + POLICY_HND pol; /* policy handle */ + uint32 status; /* return status */ +} SAMR_R_DELETE_DOM_USER; -/* SAMR_Q_UNKNOWN_32 - probably a "create SAM entry" */ -typedef struct q_samr_unknown_32_info + +/* SAMR_Q_QUERY_GROUPMEM - query group members */ +typedef struct q_samr_query_groupmem_info { - POLICY_HND pol; /* policy handle */ + POLICY_HND group_pol; /* policy handle */ - UNIHDR hdr_mach_acct; /* unicode machine account name header */ - UNISTR2 uni_mach_acct; /* unicode machine account name */ +} SAMR_Q_QUERY_GROUPMEM; - uint32 acct_ctrl; /* 32 bit ACB_XXXX */ - uint16 unknown_1; /* 16 bit unknown - 0x00B0 */ - uint16 unknown_2; /* 16 bit unknown - 0xe005 */ -} SAMR_Q_UNKNOWN_32; +/* SAMR_R_QUERY_GROUPMEM - query group members */ +typedef struct r_samr_query_groupmem_info +{ + uint32 ptr; + uint32 num_entries; + uint32 ptr_rids; + uint32 ptr_attrs; -/* SAMR_R_UNKNOWN_32 - probably a "create SAM entry" */ -typedef struct r_samr_unknown_32_info + uint32 num_rids; + uint32 *rid; + + uint32 num_attrs; + uint32 *attr; + + uint32 status; + +} SAMR_R_QUERY_GROUPMEM; + + +/* SAMR_Q_DEL_GROUPMEM - probably an del group member */ +typedef struct q_samr_del_group_mem_info { - POLICY_HND pol; /* policy handle */ + POLICY_HND pol; /* policy handle */ - /* rid4.unknown - fail: 0030 success: 0x03ff */ - DOM_RID4 rid4; /* rid and attributes */ + uint32 rid; /* rid */ + +} SAMR_Q_DEL_GROUPMEM; + + +/* SAMR_R_DEL_GROUPMEM - probably an del group member */ +typedef struct r_samr_del_group_mem_info +{ + uint32 status; /* return status */ + +} SAMR_R_DEL_GROUPMEM; + + +/* SAMR_Q_ADD_GROUPMEM - probably an add group member */ +typedef struct q_samr_add_group_mem_info +{ + POLICY_HND pol; /* policy handle */ + + uint32 rid; /* rid */ + uint32 unknown; /* 0x0000 0005 */ + +} SAMR_Q_ADD_GROUPMEM; + + +/* SAMR_R_ADD_GROUPMEM - probably an add group member */ +typedef struct r_samr_add_group_mem_info +{ + uint32 status; /* return status */ + +} SAMR_R_ADD_GROUPMEM; + + +/* SAMR_Q_OPEN_GROUP - probably an open */ +typedef struct q_samr_open_group_info +{ + POLICY_HND domain_pol; /* policy handle */ + uint32 access_mask; /* 0x0000 0001, 0x0000 0003, 0x0000 001f */ + uint32 rid_group; /* rid */ + +} SAMR_Q_OPEN_GROUP; + + +/* SAMR_R_OPEN_GROUP - probably an open */ +typedef struct r_samr_open_group_info +{ + POLICY_HND pol; /* policy handle */ + uint32 status; /* return status */ + +} SAMR_R_OPEN_GROUP; + + +/* SAMR_Q_QUERY_ALIASMEM - query alias members */ +typedef struct q_samr_query_aliasmem_info +{ + POLICY_HND alias_pol; /* policy handle */ + +} SAMR_Q_QUERY_ALIASMEM; + + +/* SAMR_R_QUERY_ALIASMEM - query alias members */ +typedef struct r_samr_query_aliasmem_info +{ + uint32 num_sids; + uint32 ptr; + uint32 num_sids1; + + DOM_SID2 *sid; + + uint32 status; + +} SAMR_R_QUERY_ALIASMEM; + + +/* SAMR_Q_ADD_ALIASMEM - add alias member */ +typedef struct q_samr_add_alias_mem_info +{ + POLICY_HND alias_pol; /* policy handle */ + + DOM_SID2 sid; /* member sid to be added to the alias */ + +} SAMR_Q_ADD_ALIASMEM; + + +/* SAMR_R_ADD_ALIASMEM - add alias member */ +typedef struct r_samr_add_alias_mem_info +{ + uint32 status; /* return status */ + +} SAMR_R_ADD_ALIASMEM; + + +/* SAMR_Q_DEL_ALIASMEM - add an add alias member */ +typedef struct q_samr_del_alias_mem_info +{ + POLICY_HND alias_pol; /* policy handle */ + + DOM_SID2 sid; /* member sid to be added to alias */ + +} SAMR_Q_DEL_ALIASMEM; + + +/* SAMR_R_DEL_ALIASMEM - delete alias member */ +typedef struct r_samr_del_alias_mem_info +{ + uint32 status; /* return status */ + +} SAMR_R_DEL_ALIASMEM; - uint32 status; /* return status - fail: 0xC000 0099: user exists */ -} SAMR_R_UNKNOWN_32; /* SAMR_Q_OPEN_ALIAS - probably an open */ typedef struct q_samr_open_alias_info { + POLICY_HND dom_pol; + uint32 unknown_0; /* 0x0000 0008 */ uint32 rid_alias; /* rid */ @@ -970,7 +1553,7 @@ typedef struct q_samr_connect_anon_info uint32 ptr; /* ptr? */ uint16 unknown_0; /* 0x005c */ uint16 unknown_1; /* 0x0001 */ - uint32 unknown_2; /* 0x0000 0020 */ + uint32 access_mask; } SAMR_Q_CONNECT_ANON; @@ -988,7 +1571,7 @@ typedef struct q_samr_connect_info uint32 ptr_srv_name; /* pointer (to server name?) */ UNISTR2 uni_srv_name; /* unicode server name starting with '\\' */ - uint32 unknown_0; /* 32 bit unknown */ + uint32 access_mask; } SAMR_Q_CONNECT; @@ -1001,24 +1584,23 @@ typedef struct r_samr_connect_info } SAMR_R_CONNECT; -/* SAMR_Q_UNKNOWN_38 */ -typedef struct q_samr_unknown_38 +/* SAMR_Q_GET_DOM_PWINFO */ +typedef struct q_samr_get_dom_pwinfo { uint32 ptr; UNIHDR hdr_srv_name; UNISTR2 uni_srv_name; -} SAMR_Q_UNKNOWN_38; +} SAMR_Q_GET_DOM_PWINFO; -/* SAMR_R_UNKNOWN_38 */ -typedef struct r_samr_unknown_38 +/* SAMR_R_GET_DOM_PWINFO */ +typedef struct r_samr_get_dom_pwinfo { uint16 unk_0; uint16 unk_1; - uint16 unk_2; - uint32 status; /* return status */ + uint32 status; -} SAMR_R_UNKNOWN_38; +} SAMR_R_GET_DOM_PWINFO; /* SAMR_ENC_PASSWD */ typedef struct enc_passwd_info @@ -1064,5 +1646,38 @@ typedef struct r_samr_chgpasswd_user_info } SAMR_R_CHGPASSWD_USER; + +/* SAMR_Q_UNKNOWN_2D */ +typedef struct q_samr_unknown_2d_info +{ + POLICY_HND dom_pol; /* policy handle */ + DOM_SID2 sid; /* SID */ + +} SAMR_Q_UNKNOWN_2D; + + +/* SAMR_R_UNKNOWN_2D - probably an open */ +typedef struct r_samr_unknown_2d_info +{ + uint32 status; /* return status */ + +} SAMR_R_UNKNOWN_2D; + + + +/* these are from the old rpc_samr.h - they are needed while the merge + is still going on */ +#define MAX_SAM_SIDS 15 + +/* 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; + #endif /* _RPC_SAMR_H */ diff --git a/source3/include/rpc_samr_old.h b/source3/include/rpc_samr_old.h new file mode 100644 index 0000000000..26dd2bf447 --- /dev/null +++ b/source3/include/rpc_samr_old.h @@ -0,0 +1,1068 @@ +/* + 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_CLOSE_HND 0x01 +#define SAMR_OPEN_DOMAIN 0x07 +#define SAMR_QUERY_DOMAIN_INFO 0x08 +#define SAMR_LOOKUP_IDS 0x10 +#define SAMR_LOOKUP_NAMES 0x11 +#define SAMR_UNKNOWN_3 0x03 +#define SAMR_QUERY_DISPINFO 0x28 +#define SAMR_OPEN_USER 0x22 +#define SAMR_QUERY_USERINFO 0x24 +#define SAMR_QUERY_USERGROUPS 0x27 +#define SAMR_UNKNOWN_12 0x12 +#define SAMR_UNKNOWN_21 0x21 +#define SAMR_UNKNOWN_2C 0x2c +#define SAMR_UNKNOWN_32 0x32 +#define SAMR_UNKNOWN_34 0x34 +#define SAMR_CHGPASSWD_USER 0x37 +#define SAMR_UNKNOWN_38 0x38 +#define SAMR_CONNECT 0x39 +#define SAMR_CONNECT_ANON 0x00 +#define SAMR_OPEN_ALIAS 0x1b +#define SAMR_QUERY_ALIASINFO 0x1c +#define SAMR_ENUM_DOM_USERS 0x0d +#define SAMR_ENUM_DOM_ALIASES 0x0f +#define SAMR_ENUM_DOM_GROUPS 0x30 + + +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 */ + + uint16 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_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_ctr_info +{ + union + { + SAM_UNK_INFO_2 inf2; + + } 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 connect_pol; /* policy handle */ + uint32 rid; /* 0x2000 0000; 0x0000 0211; 0x0000 0280; 0x0000 0200 - a RID? */ + 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 250 + +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_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 */ + uint16 unknown_0; /* 0x0000 and 0x2000 seen */ + uint32 start_idx; /* presumably the start enumeration index */ + uint32 unknown_1; /* 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 */ + +} SAMR_Q_QUERY_ALIASINFO; + +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_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_UNKNOWN_12 - do a conversion from RID groups to something. + +called to resolve domain RID groups. +*****************************************************************************/ +/* SAMR_Q_UNKNOWN_12 */ +typedef struct q_samr_unknown_12_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_UNKNOWN_12; + + +/**************************************************************************** +SAMR_R_UNKNOWN_12 - do a conversion from group RID to names + +*****************************************************************************/ +/* SAMR_R_UNKNOWN_12 */ +typedef struct r_samr_unknown_12_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_UNKNOWN_12; + + +/* SAMR_Q_OPEN_USER - probably an open */ +typedef struct q_samr_open_user_info +{ + POLICY_HND domain_pol; /* policy handle */ + uint32 unknown_0; /* 32 bit unknown - 0x02011b */ + 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_UNKNOWN_32 - probably a "create SAM entry" */ +typedef struct q_samr_unknown_32_info +{ + POLICY_HND pol; /* policy handle */ + + UNIHDR hdr_mach_acct; /* unicode machine account name header */ + UNISTR2 uni_mach_acct; /* unicode machine account name */ + + uint32 acct_ctrl; /* 32 bit ACB_XXXX */ + uint16 unknown_1; /* 16 bit unknown - 0x00B0 */ + uint16 unknown_2; /* 16 bit unknown - 0xe005 */ + +} SAMR_Q_UNKNOWN_32; + + +/* SAMR_R_UNKNOWN_32 - probably a "create SAM entry" */ +typedef struct r_samr_unknown_32_info +{ + POLICY_HND pol; /* policy handle */ + + /* rid4.unknown - fail: 0030 success: 0x03ff */ + DOM_RID4 rid4; /* rid and attributes */ + + uint32 status; /* return status - fail: 0xC000 0099: user exists */ + +} SAMR_R_UNKNOWN_32; + +/* SAMR_Q_OPEN_ALIAS - probably an open */ +typedef struct q_samr_open_alias_info +{ + 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 unknown_0; /* 32 bit unknown */ + +} 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; + 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; + +#endif /* _RPC_SAMR_H */ + diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 82608ebcc3..18c1decefd 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -1,3 +1,4 @@ +#define OLD_NTDOMAIN 1 /* Unix SMB/Netbios implementation. Version 1.9. @@ -821,3 +822,5 @@ BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd) return True; } + +#undef OLD_NTDOMAIN diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 2327ee7798..1c344c9d30 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -1,3 +1,5 @@ +#define OLD_NTDOMAIN 1 + /* * Unix SMB/Netbios implementation. * Version 1.9. @@ -3606,3 +3608,7 @@ BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct return True; } + + +#undef OLD_NTDOMAIN + diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 3637f68adf..581d6c04bd 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -1,3 +1,4 @@ +#define OLD_NTDOMAIN 1 /* * Unix SMB/Netbios implementation. * Version 1.9. @@ -1112,3 +1113,5 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds return True; } + +#undef OLD_NTDOMAIN diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 08bba0eef4..650fa704b8 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -1,3 +1,5 @@ +#define OLD_NTDOMAIN 1 + /* * Unix SMB/Netbios implementation. * Version 1.9. @@ -1948,3 +1950,6 @@ BOOL api_samr_rpc(pipes_struct *p, prs_struct *data) { return api_rpcTNP(p, "api_samr_rpc", api_samr_cmds, data); } + +#undef OLD_NTDOMAIN + diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index b3c7be56e0..4916cd9b40 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -93,7 +93,7 @@ void cmd_sam_ntchange_pwd(struct client_info *info) res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False; /* establish a connection. */ - res = res ? do_samr_unknown_38(smb_cli, srv_name) : False; + res = res ? do_samr_get_dom_pwinfo(smb_cli, srv_name) : False; /* establish a connection. */ res = res ? do_samr_chgpasswd_user(smb_cli, @@ -155,7 +155,7 @@ void cmd_sam_test(struct client_info *info) res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False; /* establish a connection. */ - res = res ? do_samr_unknown_38(smb_cli, srv_name) : False; + res = res ? do_samr_get_dom_pwinfo(smb_cli, srv_name) : False; /* close the session */ cli_nt_session_close(smb_cli); @@ -585,7 +585,7 @@ void cmd_sam_enum_aliases(struct client_info *info) &info->dom.samr_pol_open_domain) : False; /* send a query on the aliase */ - res = res ? do_samr_query_unknown_12(smb_cli, + res = res ? do_samr_query_lookup_rids(smb_cli, &info->dom.samr_pol_open_domain, admin_rid, num_aliases, alias_rid, &num_aliases, alias_names, num_als_usrs) : False; diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk index a8c807a10c..0b9c1f784e 100644 --- a/source3/script/mkproto.awk +++ b/source3/script/mkproto.awk @@ -23,10 +23,6 @@ END { print "/*The following definitions come from ",FILENAME," */" print "" current_file=FILENAME -# if (current_file=="ldap.c") { -# print "#ifdef USE_LDAP" -# use_ldap_define = 1; -# } } if (inheader) { if (match($0,"[)][ \t]*$")) { @@ -39,6 +35,20 @@ END { } } +# special handling for code merge of TNG to head +/^#define OLD_NTDOMAIN 1/ { + printf "#if OLD_NTDOMAIN\n" +} +/^#undef OLD_NTDOMAIN/ { + printf "#endif\n" +} +/^#define NEW_NTDOMAIN 1/ { + printf "#if NEW_NTDOMAIN\n" +} +/^#undef NEW_NTDOMAIN/ { + printf "#endif\n" +} + # we handle the loadparm.c fns separately /^FN_LOCAL_BOOL/ { |