sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

r5080: patch from ronnie to make our samr IDL a little more consistent

Browse Source 
(This used to be commit 7607ddda3f221bd5a68d28c0eae297569fbb58b1)
This commit is contained in:
Andrew Tridgell 2005-01-29 02:46:37 +00:00 committed by Gerald (Jerry) Carter
parent 6e614bf632
commit 465e089dd3
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source4/librpc/idl/samr.idl
View File

@ -376,24 +376,24 @@
} samr_GroupInfoDesciption;
typedef enum {
GroupInfoAll = 1,
GroupInfoName = 2,
GroupInfoX = 3,
GroupInfoDescription = 4,
GroupInfoAll2 = 5
} GroupInfo;
GROUPINFOALL = 1,
GROUPINFONAME = 2,
GROUPINFOX = 3,
GROUPINFODESCRIPTION = 4,
GROUPINFOALL2 = 5
} samr_GroupInfoEnum;
typedef union {
[case(GroupInfoAll)] samr_GroupInfoAll all;
[case(GroupInfoName)] samr_String name;
[case(GroupInfoX)] samr_GroupInfoX unknown;
[case(GroupInfoDescription)] samr_String description;
[case(GroupInfoAll2)] samr_GroupInfoAll all2;
[case(GROUPINFOALL)] samr_GroupInfoAll all;
[case(GROUPINFONAME)] samr_String name;
[case(GROUPINFOX)] samr_GroupInfoX unknown;
[case(GROUPINFODESCRIPTION)] samr_String description;
[case(GROUPINFOALL2)] samr_GroupInfoAll all2;
} samr_GroupInfo;
NTSTATUS samr_QueryGroupInfo(
[in,ref] policy_handle *group_handle,
[in] GroupInfo level,
[in] samr_GroupInfoEnum level,
[out,switch_is(level)] samr_GroupInfo *info
);
@ -401,7 +401,7 @@
/* Function 0x15 */
NTSTATUS samr_SetGroupInfo(
[in,ref] policy_handle *group_handle,
[in] GroupInfo level,
[in] samr_GroupInfoEnum level,
[in,switch_is(level),ref] samr_GroupInfo *info
);
@ -477,20 +477,20 @@
} samr_AliasInfoAll;
typedef enum {
AliasInfoAll = 1,
AliasInfoName = 2,
AliasInfoDescription = 3
} AliasInfo;
ALIASINFOALL = 1,
ALIASINFONAME = 2,
ALIASINFODESCRIPTION = 3
} samr_AliasInfoEnum;
typedef union {
[case(AliasInfoAll)] samr_AliasInfoAll all;
[case(AliasInfoName)] samr_String name;
[case(AliasInfoDescription)] samr_String description;
[case(ALIASINFOALL)] samr_AliasInfoAll all;
[case(ALIASINFONAME)] samr_String name;
[case(ALIASINFODESCRIPTION)] samr_String description;
} samr_AliasInfo;
NTSTATUS samr_QueryAliasInfo(
[in,ref] policy_handle *alias_handle,
[in] AliasInfo level,
[in] samr_AliasInfoEnum level,
[out,switch_is(level)] samr_AliasInfo *info
);
@ -498,7 +498,7 @@
/* Function 0x1d */
NTSTATUS samr_SetAliasInfo(
[in,ref] policy_handle *alias_handle,
[in] AliasInfo level,
[in] samr_AliasInfoEnum level,
[in,switch_is(level),ref] samr_AliasInfo *info
);

24
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -1562,19 +1562,19 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
/* Fill in the level */
switch (r->in.level) {
case GroupInfoAll:
case GROUPINFOALL:
QUERY_STRING(msg, all.name.string, "sAMAccountName");
r->out.info->all.attributes = 7; /* Do like w2k3 */
QUERY_UINT (msg, all.num_members, "numMembers")
QUERY_STRING(msg, all.description.string, "description");
break;
case GroupInfoName:
case GROUPINFONAME:
QUERY_STRING(msg, name.string, "sAMAccountName");
break;
case GroupInfoX:
case GROUPINFOX:
r->out.info->unknown.unknown = 7;
break;
case GroupInfoDescription:
case GROUPINFODESCRIPTION:
QUERY_STRING(msg, description.string, "description");
break;
default:
@ -1612,15 +1612,15 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
}
switch (r->in.level) {
case GroupInfoDescription:
case GROUPINFODESCRIPTION:
SET_STRING(msg, description.string, "description");
break;
case GroupInfoName:
case GROUPINFONAME:
/* On W2k3 this does not change the name, it changes the
* sAMAccountName attribute */
SET_STRING(msg, name.string, "sAMAccountName");
break;
case GroupInfoX:
case GROUPINFOX:
/* This does not do anything obviously visible in W2k3 LDAP */
break;
default:
@ -1987,15 +1987,15 @@ static NTSTATUS samr_QueryAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_C
ZERO_STRUCTP(r->out.info);
switch(r->in.level) {
case AliasInfoAll:
case ALIASINFOALL:
QUERY_STRING(msg, all.name.string, "sAMAccountName");
QUERY_UINT (msg, all.num_members, "numMembers");
QUERY_STRING(msg, all.description.string, "description");
break;
case AliasInfoName:
case ALIASINFONAME:
QUERY_STRING(msg, name.string, "sAMAccountName");
break;
case AliasInfoDescription:
case ALIASINFODESCRIPTION:
QUERY_STRING(msg, description.string, "description");
break;
default:
@ -2033,10 +2033,10 @@ static NTSTATUS samr_SetAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
}
switch (r->in.level) {
case AliasInfoDescription:
case ALIASINFODESCRIPTION:
SET_STRING(msg, description.string, "description");
break;
case AliasInfoName:
case ALIASINFONAME:
/* On W2k3 this does not change the name, it changes the
* sAMAccountName attribute */
SET_STRING(msg, name.string, "sAMAccountName");