sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-01-25 01:03:13 +01:00
commit d35d4f983d
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/librpc/idl/netlogon.idl
View File

@ -992,7 +992,11 @@ interface netlogon
/****************/
/* Function 0x17 */
WERROR netr_NETRLOGONGETTRUSTRID();
WERROR netr_LogonGetTrustRid(
[in] [string,charset(UTF16)] uint16 *server_name,
[in] [string,charset(UTF16)] uint16 *domain_name,
[out,ref] uint32 *rid
);
/****************/
/* Function 0x18 */

64
source/librpc/idl/samr.idl
View File

@ -51,47 +51,47 @@ import "misc.idl", "lsa.idl", "security.idl";
} samr_ConnectAccessMask;
typedef [bitmap32bit] bitmap {
USER_ACCESS_GET_NAME_ETC = 0x00000001,
USER_ACCESS_GET_LOCALE = 0x00000002,
USER_ACCESS_SET_LOC_COM = 0x00000004,
USER_ACCESS_GET_LOGONINFO = 0x00000008,
USER_ACCESS_GET_ATTRIBUTES = 0x00000010,
USER_ACCESS_SET_ATTRIBUTES = 0x00000020,
USER_ACCESS_CHANGE_PASSWORD = 0x00000040,
USER_ACCESS_SET_PASSWORD = 0x00000080,
USER_ACCESS_GET_GROUPS = 0x00000100,
USER_ACCESS_GET_GROUP_MEMBERSHIP = 0x00000200,
USER_ACCESS_CHANGE_GROUP_MEMBERSHIP = 0x00000400
SAMR_USER_ACCESS_GET_NAME_ETC = 0x00000001,
SAMR_USER_ACCESS_GET_LOCALE = 0x00000002,
SAMR_USER_ACCESS_SET_LOC_COM = 0x00000004,
SAMR_USER_ACCESS_GET_LOGONINFO = 0x00000008,
SAMR_USER_ACCESS_GET_ATTRIBUTES = 0x00000010,
SAMR_USER_ACCESS_SET_ATTRIBUTES = 0x00000020,
SAMR_USER_ACCESS_CHANGE_PASSWORD = 0x00000040,
SAMR_USER_ACCESS_SET_PASSWORD = 0x00000080,
SAMR_USER_ACCESS_GET_GROUPS = 0x00000100,
SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP = 0x00000200,
SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP = 0x00000400
} samr_UserAccessMask;
typedef [bitmap32bit] bitmap {
DOMAIN_ACCESS_LOOKUP_INFO_1 = 0x00000001,
DOMAIN_ACCESS_SET_INFO_1 = 0x00000002,
DOMAIN_ACCESS_LOOKUP_INFO_2 = 0x00000004,
DOMAIN_ACCESS_SET_INFO_2 = 0x00000008,
DOMAIN_ACCESS_CREATE_USER = 0x00000010,
DOMAIN_ACCESS_CREATE_GROUP = 0x00000020,
DOMAIN_ACCESS_CREATE_ALIAS = 0x00000040,
DOMAIN_ACCESS_LOOKUP_ALIAS = 0x00000080,
DOMAIN_ACCESS_ENUM_ACCOUNTS = 0x00000100,
DOMAIN_ACCESS_OPEN_ACCOUNT = 0x00000200,
DOMAIN_ACCESS_SET_INFO_3 = 0x00000400
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 = 0x00000001,
SAMR_DOMAIN_ACCESS_SET_INFO_1 = 0x00000002,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 = 0x00000004,
SAMR_DOMAIN_ACCESS_SET_INFO_2 = 0x00000008,
SAMR_DOMAIN_ACCESS_CREATE_USER = 0x00000010,
SAMR_DOMAIN_ACCESS_CREATE_GROUP = 0x00000020,
SAMR_DOMAIN_ACCESS_CREATE_ALIAS = 0x00000040,
SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS = 0x00000080,
SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS = 0x00000100,
SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT = 0x00000200,
SAMR_DOMAIN_ACCESS_SET_INFO_3 = 0x00000400
} samr_DomainAccessMask;
typedef [bitmap32bit] bitmap {
GROUP_ACCESS_LOOKUP_INFO = 0x00000001,
GROUP_ACCESS_SET_INFO = 0x00000002,
GROUP_ACCESS_ADD_MEMBER = 0x00000004,
GROUP_ACCESS_REMOVE_MEMBER = 0x00000008,
GROUP_ACCESS_GET_MEMBERS = 0x00000010
SAMR_GROUP_ACCESS_LOOKUP_INFO = 0x00000001,
SAMR_GROUP_ACCESS_SET_INFO = 0x00000002,
SAMR_GROUP_ACCESS_ADD_MEMBER = 0x00000004,
SAMR_GROUP_ACCESS_REMOVE_MEMBER = 0x00000008,
SAMR_GROUP_ACCESS_GET_MEMBERS = 0x00000010
} samr_GroupAccessMask;
typedef [bitmap32bit] bitmap {
ALIAS_ACCESS_ADD_MEMBER = 0x00000001,
ALIAS_ACCESS_REMOVE_MEMBER = 0x00000002,
ALIAS_ACCESS_GET_MEMBERS = 0x00000004,
ALIAS_ACCESS_LOOKUP_INFO = 0x00000008,
ALIAS_ACCESS_SET_INFO = 0x00000010
SAMR_ALIAS_ACCESS_ADD_MEMBER = 0x00000001,
SAMR_ALIAS_ACCESS_REMOVE_MEMBER = 0x00000002,
SAMR_ALIAS_ACCESS_GET_MEMBERS = 0x00000004,
SAMR_ALIAS_ACCESS_LOOKUP_INFO = 0x00000008,
SAMR_ALIAS_ACCESS_SET_INFO = 0x00000010
} samr_AliasAccessMask;
/******************/

8
source/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -797,11 +797,11 @@ static WERROR dcesrv_netr_NETRLOGONSETSERVICEBITS(struct dcesrv_call_state *dce_
}
/*
netr_NETRLOGONGETTRUSTRID
/*
netr_LogonGetTrustRid
*/
static WERROR dcesrv_netr_NETRLOGONGETTRUSTRID(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct netr_NETRLOGONGETTRUSTRID *r)
static WERROR dcesrv_netr_LogonGetTrustRid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct netr_LogonGetTrustRid *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}