r7379: Simplify CreateUser function and io structure. Also, implementing

it based on composite functions. Moving to fully async CreateUser
on the way...

rafal
(This used to be commit 240409bc3cfa1426db15fc0537fcf0841f51ede0)

2 files changed, 9 insertions, 18 deletions

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 934dc6e192..5ec7509e76 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -135,7 +135,7 @@ union libnet_find_pdc;
 union libnet_rpc_connect;
 union libnet_RemoteTOD;
 union libnet_JoinDomain;
-union libnet_CreateUser;
+struct libnet_CreateUser;
 struct libnet_ListShares;
 struct libnet_AddShare;
 struct libnet_DelShare;
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 29d97637bd..358f0d0b0f 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -25,23 +25,14 @@ enum libnet_CreateUser_level {
 };
 
 
-union libnet_CreateUser {
-	struct {
-		enum libnet_CreateUser_level level;
-
-		struct _libnet_CreateUser_in {
-			const char *user_name;
-			const char *domain_name;
-		} in;
-		
-		struct _libnet_CreateUser_out {
-			const char *error_string;
-		} out;
-	} generic;
+struct libnet_CreateUser {
+	enum libnet_CreateUser_level level;
 
 	struct {
-		enum libnet_CreateUser_level level;
-		struct _libnet_CreateUser_in in;
-		struct _libnet_CreateUser_out out;
-	} samr;
+		const char *user_name;
+		const char *domain_name;
+	} in;
+	struct {
+		const char *error_string;
+	} out;
 };