changed wks to wkssvc (suggestion from metze). Started adding samr_CreateUser().

(This used to be commit 04e9269c1e37c9c2984ee2886fa6c0eda5c19669)

2 files changed, 73 insertions, 50 deletions

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index a9891c9a19..2ff79c2fd3 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -211,7 +211,13 @@
 
 	/************************/
 	/* Function    0x0c     */
-	NTSTATUS samr_CREATE_USER_IN_DOMAIN();
+	NTSTATUS samr_CreateUser(
+		[in,ref]      policy_handle *handle,
+		[in]          samr_Name *username,
+		[in]          uint32 access_mask,
+		[out]         policy_handle *acct_handle,
+		[out]         uint32 *rid
+		);
 
 	/************************/
 	/* Function    0x0d     */
@@ -240,7 +246,22 @@
 
 	/************************/
 	/* Function    0x10     */
-	NTSTATUS samr_GET_ALIAS_MEMBERSHIP();
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] dom_sid2 *sids;
+	} samr_Sids;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] uint32 *rids;
+	} samr_Rids;
+
+	NTSTATUS samr_GetAliasMembership(
+		[in,ref]      policy_handle *handle,
+		[in]          samr_Sids *sids,
+		[out]         samr_Rids *rids
+		);
 
 	/************************/
 	/* Function    0x11     */
@@ -390,7 +411,9 @@
 
 	/************************/
 	/* Function    0x23     */
-	NTSTATUS samr_DELETE_DOM_USER();
+	NTSTATUS samr_DeleteUser(
+		[in,out]      policy_handle *handle
+		);
 
 	/************************/
 	/* Function    0x24     */
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index 1e82d3c767..4036527621 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -15,7 +15,7 @@
 		unistr *domain;
 		uint32 ver_major;
 		uint32 ver_minor;
-	} wks_Info100;
+	} wkssvc_Info100;
 
 	typedef struct {
 		uint32 platform_id;
@@ -24,7 +24,7 @@
 		uint32 ver_major;
 		uint32 ver_minor;
 		unistr *lan_root;
-	} wks_Info101;
+	} wkssvc_Info101;
 
 	typedef struct {
 		uint32 platform_id;
@@ -34,36 +34,36 @@
 		uint32 ver_minor;
 		unistr *lan_root;
 		uint32 logged_on_users;
-	} wks_Info102;
+	} wkssvc_Info102;
 
 	typedef union {
-		case (100) wks_Info100 *info100;
-		case (101) wks_Info101 *info101;
-		case (102) wks_Info102 *info102;
-	} wks_Info;
+		case (100) wkssvc_Info100 *info100;
+		case (101) wkssvc_Info101 *info101;
+		case (102) wkssvc_Info102 *info102;
+	} wkssvc_Info;
 
-	WERROR wks_QueryInfo(
+	WERROR wkssvc_QueryInfo(
 		[in]   unistr *server_name,
 		[in]   uint32 level,
-		[out,switch_is(level)]  wks_Info info
+		[out,switch_is(level)]  wkssvc_Info info
 		);
 
 
 	/******************/
 	/* Function: 0x01 */
-	WERROR wks_SetInfo();
+	WERROR wkssvc_SetInfo();
 
 	/*****************************/
 	/* Function        0x02      */
-	WERROR WKS_NETRWKSTAUSERENUM ();
+	WERROR WKSSVC_NETRWKSTAUSERENUM ();
 
 	/*****************************/
 	/* Function        0x03      */
-	WERROR WKS_NETRWKSTAUSERGETINFO ();
+	WERROR WKSSVC_NETRWKSTAUSERGETINFO ();
 
 	/*****************************/
 	/* Function        0x04      */
-	WERROR WKS_NETRWKSTAUSERSETINFO ();
+	WERROR WKSSVC_NETRWKSTAUSERSETINFO ();
 
 
 	/*****************************/
@@ -75,25 +75,25 @@
 		unistr *name;
 		unistr *address;
 		uint32 wan_link;
-	} wks_TransportInfo0;
+	} wkssvc_TransportInfo0;
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] wks_TransportInfo0 *transports;
-	} wks_TransportInfoArray;
+		[size_is(count)] wkssvc_TransportInfo0 *transports;
+	} wkssvc_TransportInfoArray;
 
 	typedef union {
-		case(0) wks_TransportInfoArray *array;
-	} wks_TransportUnion;
+		case(0) wkssvc_TransportInfoArray *array;
+	} wkssvc_TransportUnion;
 
 	typedef struct {
 		uint32 level;
-		[switch_is(level)] wks_TransportUnion u;
-	} wks_TransportInfo;
+		[switch_is(level)] wkssvc_TransportUnion u;
+	} wkssvc_TransportInfo;
 
-	WERROR wks_TransportEnum (
+	WERROR wkssvc_TransportEnum (
 		[in]         unistr *server_name,
-		[in,out,ref] wks_TransportInfo *info,
+		[in,out,ref] wkssvc_TransportInfo *info,
 		[in]         uint32 max_buffer,
 		[out]        uint32 unknown,
 		[in,out]     uint32 *resume_handle
@@ -102,101 +102,101 @@
 
 	/*****************************/
 	/* Function        0x06      */
-	WERROR WKS_NETRWKSTATRANSPORTADD ();
+	WERROR WKSSVC_NETRWKSTATRANSPORTADD ();
 
 	/*****************************/
 	/* Function        0x07      */
-	WERROR WKS_NETRWKSTATRANSPORTDEL ();
+	WERROR WKSSVC_NETRWKSTATRANSPORTDEL ();
 
 	/*****************************/
 	/* Function        0x08      */
-	WERROR WKS_NETRUSEADD ();
+	WERROR WKSSVC_NETRUSEADD ();
 
 	/*****************************/
 	/* Function        0x09      */
-	WERROR WKS_NETRUSEGETINFO ();
+	WERROR WKSSVC_NETRUSEGETINFO ();
 
 	/*****************************/
 	/* Function        0x0a      */
-	WERROR WKS_NETRUSEDEL ();
+	WERROR WKSSVC_NETRUSEDEL ();
 
 	/*****************************/
 	/* Function        0x0b      */
-	WERROR WKS_NETRUSEENUM ();
+	WERROR WKSSVC_NETRUSEENUM ();
 
 	/*****************************/
 	/* Function        0x0c      */
-	WERROR WKS_NETRMESSAGEBUFFERSEND ();
+	WERROR WKSSVC_NETRMESSAGEBUFFERSEND ();
 
 	/*****************************/
 	/* Function        0x0d      */
-	WERROR WKS_NETRWORKSTATIONSTATISTICSGET ();
+	WERROR WKSSVC_NETRWORKSTATIONSTATISTICSGET ();
 
 	/*****************************/
 	/* Function        0x0e      */
-	WERROR WKS_NETRLOGONDOMAINNAMEADD ();
+	WERROR WKSSVC_NETRLOGONDOMAINNAMEADD ();
 
 	/*****************************/
 	/* Function        0x0f      */
-	WERROR WKS_NETRLOGONDOMAINNAMEDEL ();
+	WERROR WKSSVC_NETRLOGONDOMAINNAMEDEL ();
 
 	/*****************************/
 	/* Function        0x10      */
-	WERROR WKS_NETRJOINDOMAIN ();
+	WERROR WKSSVC_NETRJOINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x11      */
-	WERROR WKS_NETRUNJOINDOMAIN ();
+	WERROR WKSSVC_NETRUNJOINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x12      */
-	WERROR WKS_NETRRENAMEMACHINEINDOMAIN ();
+	WERROR WKSSVC_NETRRENAMEMACHINEINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x13      */
-	WERROR WKS_NETRVALIDATENAME ();
+	WERROR WKSSVC_NETRVALIDATENAME ();
 
 	/*****************************/
 	/* Function        0x14      */
-	WERROR WKS_NETRGETJOININFORMATION ();
+	WERROR WKSSVC_NETRGETJOININFORMATION ();
 
 	/*****************************/
 	/* Function        0x15      */
-	WERROR WKS_NETRGETJOINABLEOUS ();
+	WERROR WKSSVC_NETRGETJOINABLEOUS ();
 
 	/*****************************/
 	/* Function        0x16      */
-	WERROR WKS_NETRJOINDOMAIN2 ();
+	WERROR WKSSVC_NETRJOINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x17      */
-	WERROR WKS_NETRUNJOINDOMAIN2 ();
+	WERROR WKSSVC_NETRUNJOINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x18      */
-	WERROR WKS_NETRRENAMEMACHINEINDOMAIN2 ();
+	WERROR WKSSVC_NETRRENAMEMACHINEINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x19      */
-	WERROR WKS_NETRVALIDATENAME2 ();
+	WERROR WKSSVC_NETRVALIDATENAME2 ();
 
 	/*****************************/
 	/* Function        0x1a      */
-	WERROR WKS_NETRGETJOINABLEOUS2 ();
+	WERROR WKSSVC_NETRGETJOINABLEOUS2 ();
 
 	/*****************************/
 	/* Function        0x1b      */
-	WERROR WKS_NETRADDALTERNATECOMPUTERNAME ();
+	WERROR WKSSVC_NETRADDALTERNATECOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1c      */
-	WERROR WKS_NETRREMOVEALTERNATECOMPUTERNAME ();
+	WERROR WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1d      */
-	WERROR WKS_NETRSETPRIMARYCOMPUTERNAME ();
+	WERROR WKSSVC_NETRSETPRIMARYCOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1e      */
-	WERROR WKS_NETRENUMERATECOMPUTERNAMES ();
+	WERROR WKSSVC_NETRENUMERATECOMPUTERNAMES ();
 }