1 files changed, 6 insertions, 57 deletions

diff --git a/source/lib/netapi/netapi_private.h b/source/lib/netapi/netapi_private.h
index e6a2eb8e99..a575f42f4e 100644
--- a/source/lib/netapi/netapi_private.h
+++ b/source/lib/netapi/netapi_private.h
@@ -20,68 +20,17 @@
 #ifndef __LIB_NETAPI_PRIVATE_H__
 #define __LIB_NETAPI_PRIVATE_H__
 
-#define LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, fn) \
-	DEBUG(10,("redirecting call %s to localhost\n", #fn)); \
-	if (!r->in.server_name) { \
-		r->in.server_name = "localhost"; \
-	} \
-	return fn ## _r(ctx, r);
-
-struct libnetapi_private_ctx {
-	struct {
-		const char *domain_name;
-		struct dom_sid *domain_sid;
-		struct rpc_pipe_client *cli;
-
-		uint32_t connect_mask;
-		struct policy_handle connect_handle;
-
-		uint32_t domain_mask;
-		struct policy_handle domain_handle;
-
-		uint32_t builtin_mask;
-		struct policy_handle builtin_handle;
-	} samr;
-
-};
-
 NET_API_STATUS libnetapi_get_password(struct libnetapi_ctx *ctx, char **password);
 NET_API_STATUS libnetapi_get_username(struct libnetapi_ctx *ctx, char **username);
 NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx, const char *format, ...);
 NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx, char **debuglevel);
 
+WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
+				     const char *server_name,
+				     struct cli_state **cli);
 WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx);
 WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
-			   const char *server_name,
-			   const struct ndr_syntax_id *interface,
-			   struct cli_state **pcli,
-			   struct rpc_pipe_client **presult);
-WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
-				  struct rpc_pipe_client *pipe_cli,
-				  uint32_t connect_mask,
-				  uint32_t domain_mask,
-				  struct policy_handle *connect_handle,
-				  struct policy_handle *domain_handle,
-				  struct dom_sid2 **domain_sid);
-WERROR libnetapi_samr_open_builtin_domain(struct libnetapi_ctx *mem_ctx,
-					  struct rpc_pipe_client *pipe_cli,
-					  uint32_t connect_mask,
-					  uint32_t builtin_mask,
-					  struct policy_handle *connect_handle,
-					  struct policy_handle *builtin_handle);
-void libnetapi_samr_close_domain_handle(struct libnetapi_ctx *ctx,
-					struct policy_handle *handle);
-void libnetapi_samr_close_builtin_handle(struct libnetapi_ctx *ctx,
-					 struct policy_handle *handle);
-void libnetapi_samr_close_connect_handle(struct libnetapi_ctx *ctx,
-					 struct policy_handle *handle);
-void libnetapi_samr_free(struct libnetapi_ctx *ctx);
-
-NTSTATUS add_GROUP_USERS_INFO_X_buffer(TALLOC_CTX *mem_ctx,
-				       uint32_t level,
-				       const char *group_name,
-				       uint32_t attributes,
-				       uint8_t **buffer,
-				       uint32_t *num_entries);
-
+			   struct cli_state *cli,
+			   int pipe_idx,
+			   struct rpc_pipe_client **pipe_cli);
 #endif