diff options
| author | Jeremy Allison <jra@samba.org> | 2000-09-06 01:06:39 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-09-06 01:06:39 +0000 |
| commit | a1f66a820d78244fcab960fe33999c76cc1d65c5 (patch) | |
| tree | 865aebe7877f3e7844df8d109f842be0f3edd9dd /source3/include | |
| parent | d644d4438cfef54733118cbd09f89518ffb318ca (diff) | |
| download | samba-a1f66a820d78244fcab960fe33999c76cc1d65c5.tar.gz samba-a1f66a820d78244fcab960fe33999c76cc1d65c5.tar.bz2 samba-a1f66a820d78244fcab960fe33999c76cc1d65c5.zip | |
Fix for the SID history problem when using a Win2k domain controller
with security=domain. Also fixed to dynamically allocate the SIDs and GIDs.
Jeremy.
(This used to be commit 2b1f66eb82f05fe0b85ac5b4916e32847b8de675)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/include/rpc_lsa.h | 2 | ||||
| -rw-r--r-- | source3/include/rpc_netlogon.h | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 393c417f60..3a43907b4b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2311,6 +2311,7 @@ void init_net_user_info3(NET_USER_INFO_3 *usr, DOM_SID *dom_sid, char *other_sids); +void free_user_info3(NET_USER_INFO_3 *usr); BOOL net_io_q_sam_logon(char *desc, NET_Q_SAM_LOGON *q_l, prs_struct *ps, int depth); BOOL net_io_r_sam_logon(char *desc, NET_R_SAM_LOGON *r_l, prs_struct *ps, int depth); BOOL net_io_q_sam_logoff(char *desc, NET_Q_SAM_LOGOFF *q_l, prs_struct *ps, int depth); @@ -3160,7 +3161,7 @@ uint32 _spoolss_enumprinterdrivers( UNISTR2 *name, UNISTR2 *environment, uint32 uint32 _new_spoolss_enumforms( POLICY_HND *handle, uint32 level, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *numofforms); -uint32 _spoolss_getform( POLICY_HND *handle, uint32 level, UNISTR2 *formname, NEW_BUFFER *buffer, uint32 offered, uint32 *needed); +uint32 _spoolss_getform( POLICY_HND *handle, uint32 level, UNISTR2 *uni_formname, NEW_BUFFER *buffer, uint32 offered, uint32 *needed); uint32 _spoolss_enumports( UNISTR2 *name, uint32 level, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned); diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index c7fe77021b..7ba9cea0a2 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/include/rpc_lsa.h @@ -52,7 +52,7 @@ enum SID_NAME_USE #define LSA_LOOKUPRIDS 0xFD #define LSA_MAX_GROUPS 96 -#define LSA_MAX_SIDS 32 +#define LSA_MAX_SIDS 128 /* DOM_QUERY - info class 3 and 5 LSA Query response */ typedef struct dom_query_info diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index 9f6757ca63..0404afd9e5 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/include/rpc_netlogon.h @@ -120,7 +120,10 @@ typedef struct net_user_info_3 UNISTR2 uni_logon_dom; /* logon domain unicode string */ DOM_SID2 dom_sid; /* domain SID */ - DOM_SID2 other_sids[LSA_MAX_SIDS]; /* undocumented - domain SIDs */ + + uint32 num_other_groups; /* other groups */ + DOM_GID *other_gids; /* group info */ + DOM_SID2 *other_sids; /* undocumented - domain SIDs */ } NET_USER_INFO_3; |