r15920: Move userman.c and userinfo.c definition into respective

header files instead of composite.h

rafal
(This used to be commit 8cafbe7afedc90346cbd0cbedc2571143ae3dbc6)

5 files changed, 102 insertions, 74 deletions

diff --git a/source4/libnet/composite.h b/source4/libnet/composite.h
index 516fdd4ef9..4f8e8489ae 100644
--- a/source4/libnet/composite.h
+++ b/source4/libnet/composite.h
@@ -19,12 +19,6 @@
 */
 
 /*
-  composite function io definitions
-*/
-
-#include "librpc/gen_ndr/samr.h"
-
-/*
  * Monitor structure and message types definitions. Composite function monitoring
  * allows client application to be notified on function progress. This enables
  * eg. gui client to display progress bars, status messages, etc.
@@ -44,70 +38,3 @@ struct monitor_msg {
 	void       *data;
 	size_t     data_size;
 };
-
-struct libnet_rpc_userinfo {
-	struct {
-		struct policy_handle domain_handle;
-		const char *sid;
-		uint16_t level;
-	} in;
-	struct {
-		union samr_UserInfo info;
-	} out;
-};
-
-
-struct libnet_rpc_useradd {
-	struct {
-		struct policy_handle domain_handle;
-		const char *username;
-	} in;
-	struct {
-		struct policy_handle user_handle;
-	} out;
-};
-
-
-struct libnet_rpc_userdel {
-	struct {
-		struct policy_handle domain_handle;
-		const char *username;
-	} in;
-	struct {
-		struct policy_handle user_handle;
-	} out;
-};
-
-
-#define USERMOD_FIELD_ACCOUNT_NAME    ( 0x00000001 )
-#define USERMOD_FIELD_FULL_NAME       ( 0x00000002 )
-#define USERMOD_FIELD_DESCRIPTION     ( 0x00000010 )
-#define USERMOD_FIELD_COMMENT         ( 0x00000020 )
-#define USERMOD_FIELD_LOGON_SCRIPT    ( 0x00000100 )
-#define USERMOD_FIELD_PROFILE_PATH    ( 0x00000200 )
-#define USERMOD_FIELD_ACCT_EXPIRY     ( 0x00004000 )
-#define USERMOD_FIELD_ALLOW_PASS_CHG  ( 0x00008000 )
-#define USERMOD_FIELD_FORCE_PASS_CHG  ( 0x00010000 )
-#define USERMOD_FIELD_ACCT_FLAGS      ( 0x00100000 )
-
-struct libnet_rpc_usermod {
-	struct {
-		struct policy_handle domain_handle;
-		const char *username;
-
-		struct usermod_change {
-			uint32_t fields;    /* bitmask field */
-
-			const char *account_name;
-			const char *full_name;
-			const char *description;
-			const char *comment;
-			const char *logon_script;
-			const char *profile_path;
-			struct timeval *acct_expiry;
-			struct timeval *allow_password_change;
-			struct timeval *force_password_change;
-			uint32_t acct_flags;
-		} change;
-	} in;
-};
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 39dbb21f32..6b6b250182 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -47,6 +47,9 @@ struct libnet_context {
 
 
 #include "lib/ldb/include/ldb.h"
+#include "libnet/composite.h"
+#include "libnet/userman.h"
+#include "libnet/userinfo.h"
 #include "libnet/libnet_passwd.h"
 #include "libnet/libnet_time.h"
 #include "libnet/libnet_rpc.h"
@@ -57,5 +60,4 @@ struct libnet_context {
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
 #include "libnet/libnet_domain.h"
-#include "libnet/composite.h"
 #include "libnet/libnet_proto.h"
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 2182ccb4e4..23ced096b4 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -54,3 +54,24 @@ struct libnet_DeleteUser {
 		const char *error_string;
 	} out;
 };
+
+
+struct libnet_ModifyUser {
+	struct {
+		const char *user_name;
+		const char *domain_name;
+
+		const char *full_name;
+		const char *description;
+		const char *comment;
+		const char *logon_script;
+		const char *profile_path;
+		struct timeval *acct_expiry;
+		struct timeval *allow_password_change;
+		struct timeval *force_password_change;
+		uint32_t acct_flags;
+	} in;
+	struct {
+		const char *error_string;
+	} out;
+};
diff --git a/source4/libnet/userinfo.h b/source4/libnet/userinfo.h
index d1e69726c0..7289a05cce 100644
--- a/source4/libnet/userinfo.h
+++ b/source4/libnet/userinfo.h
@@ -19,6 +19,24 @@
 */
 
 
+#include "librpc/gen_ndr/samr.h"
+
+/*
+ * IO structures for userinfo.c functions
+ */
+
+struct libnet_rpc_userinfo {
+	struct {
+		struct policy_handle domain_handle;
+		const char *sid;
+		uint16_t level;
+	} in;
+	struct {
+		union samr_UserInfo info;
+	} out;
+};
+
+
 /*
  * Monitor messages sent from userinfo.c functions
  */
diff --git a/source4/libnet/userman.h b/source4/libnet/userman.h
index 3a49ae89ca..0eb7216eab 100644
--- a/source4/libnet/userman.h
+++ b/source4/libnet/userman.h
@@ -20,6 +20,66 @@
 
 
 /*
+ * IO structures for userman.c functions
+ */
+
+struct libnet_rpc_useradd {
+	struct {
+		struct policy_handle domain_handle;
+		const char *username;
+	} in;
+	struct {
+		struct policy_handle user_handle;
+	} out;
+};
+
+
+struct libnet_rpc_userdel {
+	struct {
+		struct policy_handle domain_handle;
+		const char *username;
+	} in;
+	struct {
+		struct policy_handle user_handle;
+	} out;
+};
+
+
+#define USERMOD_FIELD_ACCOUNT_NAME    ( 0x00000001 )
+#define USERMOD_FIELD_FULL_NAME       ( 0x00000002 )
+#define USERMOD_FIELD_DESCRIPTION     ( 0x00000010 )
+#define USERMOD_FIELD_COMMENT         ( 0x00000020 )
+#define USERMOD_FIELD_LOGON_SCRIPT    ( 0x00000100 )
+#define USERMOD_FIELD_PROFILE_PATH    ( 0x00000200 )
+#define USERMOD_FIELD_ACCT_EXPIRY     ( 0x00004000 )
+#define USERMOD_FIELD_ALLOW_PASS_CHG  ( 0x00008000 )
+#define USERMOD_FIELD_FORCE_PASS_CHG  ( 0x00010000 )
+#define USERMOD_FIELD_ACCT_FLAGS      ( 0x00100000 )
+
+struct libnet_rpc_usermod {
+	struct {
+		struct policy_handle domain_handle;
+		const char *username;
+
+		struct usermod_change {
+			uint32_t fields;    /* bitmask field */
+
+			const char *account_name;
+			const char *full_name;
+			const char *description;
+			const char *comment;
+			const char *logon_script;
+			const char *profile_path;
+			struct timeval *acct_expiry;
+			struct timeval *allow_password_change;
+			struct timeval *force_password_change;
+			uint32_t acct_flags;
+		} change;
+	} in;
+};
+
+
+/*
  * Monitor messages sent from userman.c functions
  */