r17670: 1) Refactor libnet context structure a bit, to have rpc connection

   properties more consistently reflected.
2) Add domain open routine for lsa pipe - this is needed for ongoing
   name resolve function.

Tests (still neglected) and comments to follow.

rafal
(This used to be commit fe5652c2b8121bbe3b9932c43164035355478611)

1 files changed, 11 insertions, 5 deletions

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 293e4e6505..e394c1c88e 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -26,20 +26,26 @@ struct libnet_context {
 	 */
 	struct cli_credentials *cred;
 
-	/* pipes */
 	struct dcerpc_pipe *pipe;
-	struct dcerpc_pipe *lsa_pipe;
-	struct dcerpc_pipe *samr_pipe;
 
-	/* opened handles and related properties */
+	/* samr connection parameters - opened handles and related properties */
 	struct {
+		struct dcerpc_pipe *pipe;
 		const char *name;
 		uint32_t access_mask;
 		struct policy_handle handle;
-	} domain;
+	} samr;
 
 	struct policy_handle user_handle;
 
+	/* lsa connection parameters - opened handles and related properties */
+	struct {
+		struct dcerpc_pipe *pipe;
+		const char *name;
+		uint32_t access_mask;
+		struct policy_handle handle;
+	} lsa;
+
 	/* name resolution methods */
 	const char **name_res_methods;