r8075: Make rpc connect function part of libnet api, as I suppose many

implementers of more complex function might need to use it.
Also simplify io structure which essentially does the same thing
when connecting arbitrary rpc server or a domain pdc.

rafal
(This used to be commit b28d2e96392e89e39f2499f54b6e549a8f3cfb4b)

1 files changed, 28 insertions, 39 deletions

diff --git a/source4/libnet/libnet_rpc.h b/source4/libnet/libnet_rpc.h
index f241aea19a..3a4e9459cc 100644
--- a/source4/libnet/libnet_rpc.h
+++ b/source4/libnet/libnet_rpc.h
@@ -18,6 +18,34 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+
+/*
+ * struct definition for connecting to a dcerpc inferface
+ */
+
+enum libnet_RpcConnect_level {
+	LIBNET_RPC_CONNECT_SERVER,      /* connect to a standalone rpc server */
+	LIBNET_RPC_CONNECT_PDC          /* connect to a domain pdc */
+};
+
+struct libnet_RpcConnect {
+	enum libnet_RpcConnect_level level;
+
+	struct {
+		const char *domain_name;
+		const char *dcerpc_iface_name;
+		const char *dcerpc_iface_uuid;
+		uint32_t dcerpc_iface_version;
+	} in;
+	struct {
+		struct dcerpc_pipe *dcerpc_pipe;
+		const char *error_string;
+	} out;
+};
+
+
+
+
 /* struct and enum for finding a domain controller */
 enum libnet_find_pdc_level {
 	LIBNET_FIND_PDC_GENERIC
@@ -37,42 +65,3 @@ union libnet_find_pdc {
 		} out;
 	} generic;
 };
-
-/* struct and enum for connecting to a dcerpc inferface */
-enum libnet_rpc_connect_level {
-	LIBNET_RPC_CONNECT_STANDARD,
-	LIBNET_RPC_CONNECT_PDC
-};
-
-union libnet_rpc_connect {
-	/* connect to a standard server */
-	struct {
-		enum libnet_rpc_connect_level level;
-
-		struct {
-			const char *server_name;
-			const char *dcerpc_iface_name;
-			const char *dcerpc_iface_uuid;
-			uint32_t dcerpc_iface_version;
-		} in;
-
-		struct _libnet_rpc_connect_out {
-			struct dcerpc_pipe *dcerpc_pipe;
-			const char *error_string;
-		} out;
-	} standard;
-
-	/* connect to a domain PDC */
-	struct {
-		enum libnet_rpc_connect_level level;
-
-		struct {
-			const char *domain_name;
-			const char *dcerpc_iface_name;
-			const char *dcerpc_iface_uuid;
-			uint32_t dcerpc_iface_version;
-		} in;
-
-		struct _libnet_rpc_connect_out out;
-	} pdc;
-};