From 465e089dd30f8804994c00f31136fc041cf2a604 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 29 Jan 2005 02:46:37 +0000
Subject: r5080: patch from ronnie to make our samr IDL a little more
 consistent (This used to be commit 7607ddda3f221bd5a68d28c0eae297569fbb58b1)

---
 source4/rpc_server/samr/dcesrv_samr.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source4/rpc_server')

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 0bc44c410b..43cad59c7a 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -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");
-- 
cgit