Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

28 files changed, 1645 insertions, 1266 deletions

diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index a82ceac843..ee083785fc 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -66,12 +66,72 @@ CHANGES SINCE Alpha5
 =====================
 
 In the time since Samba4 Alpha5 was released in June 2008, Samba has
-continued to evolve, but you may particularly notice these areas:
+continued to evolve, but you may particularly notice these areas 
+(in no particular order):
 
  The source code for various libraries that are used by both Samba 3 and 
  Samba 4 are now shared between the two rather than duplicated 
  (and being slightly diverged).
 
+ The tevent library has been split out and is now usable on its own.
+
+ Several crash bugs and memory leaks in the registry library have been fixed.
+
+ The Python modules have been extended and are no longer generated using SWIG.
+
+ Stream renames are now supported.
+
+ The provision script now has an interactive mode.
+
+ The (broken) copy of CTDB has been removed.
+
+ More work towards supporting an OpenLDAP backend. 
+
+ Initial work on using the Microsoft LDAP schema.
+
+ The storage of schemas in LDB is now much more efficient.
+
+ Support for extended DNs in LDB has been added.
+
+ Incoming trusts are now supported.
+
+ Compatibility of the registry server with several Windows versions has been 
+ improved.
+
+ Improvements to LSA.idl for better functionality in the usrmgr.exe.
+
+ Improved handling of non-standard characters in passwords.
+
+ The embedded JavaScript library has been removed in favor of Python.
+
+ The WMI implementation has been re-added, but does not completely work yet.
+
+ xpress compression is now supported in the NDR layer.
+
+ The main binary is now named "samba" rather than "smbd".
+
+ A simple script for setting the expiration of a user was added.
+
+ It is now possible to use the system-installed Heimdal using the 
+ experimental --enable-external-heimdal option to configure.
+
+ The LDB library is now completely asynchronous internally.
+
+ Various unknowns and correctness issues in the drsblobs and drsuapi RPC 
+ interface implementations have been fixed.
+
+ It is now possible to connect to an LDAP backend using SASL credentials.
+
+ Multi-fragment NTtrans request support has been added.
+
+ The DCE/RPC server can now listen on a separate pipe to allow DCE/RPC 
+ connections forwarded from Samba 3. The user credentials are provided 
+ by the client.
+
+ A large number of bugs in the SMB2 implementation have been fixed.
+
+ Auxiliary classes in LDAP schema conversion are now collapsed.
+
 These are just some of the highlights of the work done in the past few
 months.  More details can be found in our GIT history.
 
diff --git a/source3/include/async_req.h b/source3/include/async_req.h
index 1b8dbf3346..3907a08f67 100644
--- a/source3/include/async_req.h
+++ b/source3/include/async_req.h
@@ -150,4 +150,11 @@ bool async_req_enqueue(struct async_req_queue *queue,
 		       struct async_req *req,
 		       void (*trigger)(struct async_req *req));
 
+bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq,
+		      void *pstate, size_t state_size, const char *typename);
+
+#define async_req_setup(_mem_ctx, _preq, _pstate, type) \
+	_async_req_setup((_mem_ctx), (_preq), (_pstate), sizeof(type), #type)
+
+
 #endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d644b09a6a..71ad259085 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5197,10 +5197,22 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
 
 /* The following definitions come from rpc_client/cli_pipe.c  */
 
-NTSTATUS rpc_api_pipe_req(struct rpc_pipe_client *cli,
+struct async_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
+					struct event_context *ev,
+					struct rpc_pipe_client *cli,
+					uint8_t op_num,
+					prs_struct *req_data);
+NTSTATUS rpc_api_pipe_req_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+			       prs_struct *reply_pdu);
+NTSTATUS rpc_api_pipe_req(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
 			uint8 op_num,
 			prs_struct *in_data,
 			prs_struct *out_data);
+struct async_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
+				     struct event_context *ev,
+				     struct rpc_pipe_client *cli,
+				     struct cli_pipe_auth_data *auth);
+NTSTATUS rpc_pipe_bind_recv(struct async_req *req);
 NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
 		       struct cli_pipe_auth_data *auth);
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 684044b871..61b861c3b4 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -49,9 +49,8 @@
 	if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \
 		return WERR_NOMEM;\
 	}\
-	prs_init_empty( &r_ps, ctx, UNMARSHALL );\
 	if ( q_io_fn("", &q_in, &q_ps, 0) ) {\
-		NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(pcli, opnum, &q_ps, &r_ps); \
+		NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(ctx, pcli, opnum, &q_ps, &r_ps); \
 		if (!NT_STATUS_IS_OK(_smb_pipe_stat_)) {\
 			prs_mem_free( &q_ps );\
 			prs_mem_free( &r_ps );\
diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index a5b45e6a1d..127176b887 100644
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -25,13 +25,6 @@
 #include "talloc.h" /* for tdb_wrap_open() */
 #include "../libcli/util/ntstatus.h" /* for map_nt_error_from_tdb() */
 
-/* single node of a list returned by tdb_search_keys */
-typedef struct keys_node 
-{
-	struct keys_node *prev, *next;
-	TDB_DATA node_key;
-} TDB_LIST_NODE;
-
 struct tdb_wrap {
 	struct tdb_context *tdb;
 	const char *name;
@@ -52,9 +45,6 @@ TDB_DATA make_tdb_data(const uint8_t *dptr, size_t dsize);
 TDB_DATA string_tdb_data(const char *string);
 TDB_DATA string_term_tdb_data(const char *string);
 
-TDB_LIST_NODE *tdb_search_keys(struct tdb_context*, const char*);
-void tdb_search_list_free(TDB_LIST_NODE*);
-
 int tdb_chainlock_with_timeout( struct tdb_context *tdb, TDB_DATA key,
 				unsigned int timeout);
 int tdb_lock_bystring(struct tdb_context *tdb, const char *keyval);
diff --git a/source3/lib/async_req.c b/source3/lib/async_req.c
index 13b64ba79a..011948a158 100644
--- a/source3/lib/async_req.c
+++ b/source3/lib/async_req.c
@@ -313,3 +313,28 @@ bool async_req_enqueue(struct async_req_queue *queue, struct event_context *ev,
 
 	return true;
 }
+
+bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq,
+		      void *pstate, size_t state_size, const char *typename)
+{
+	struct async_req *req;
+	void **ppstate = (void **)pstate;
+	void *state;
+
+	req = async_req_new(mem_ctx);
+	if (req == NULL) {
+		return false;
+	}
+	state = talloc_size(req, state_size);
+	if (state == NULL) {
+		TALLOC_FREE(req);
+		return false;
+	}
+	talloc_set_name(state, typename);
+	req->private_data = state;
+
+	*preq = req;
+	*ppstate = state;
+
+	return true;
+}
diff --git a/source3/lib/async_sock.c b/source3/lib/async_sock.c
index bb89a1353a..73ff6f2870 100644
--- a/source3/lib/async_sock.c
+++ b/source3/lib/async_sock.c
@@ -106,17 +106,10 @@ static struct async_req *async_syscall_new(TALLOC_CTX *mem_ctx,
 	struct async_req *result;
 	struct async_syscall_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		return NULL;
-	}
-
-	state = talloc(result, struct async_syscall_state);
-	if (state == NULL) {
-		TALLOC_FREE(result);
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct async_syscall_state)) {
 		return NULL;
 	}
-
 	state->syscall_type = type;
 
 	result->private_data = state;
@@ -569,15 +562,10 @@ struct async_req *async_connect_send(TALLOC_CTX *mem_ctx,
 	struct fd_event *fde;
 	NTSTATUS status;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct async_connect_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct async_connect_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
 
 	/**
 	 * We have to set the socket to nonblocking for async connect(2). Keep
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index b773f83c58..7f133f20b0 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -5,17 +5,17 @@
    by various parts of the Samba code
 
    Copyright (C) Rafal Szczesniak    2002
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -52,7 +52,7 @@ static TDB_CONTEXT *cache;
 bool gencache_init(void)
 {
 	char* cache_fname = NULL;
-	
+
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
@@ -84,7 +84,7 @@ bool gencache_init(void)
  * @return true on successful closing the cache or
  *         false on failure during cache shutdown
  **/
- 
+
 bool gencache_shutdown(void)
 {
 	int ret;
@@ -108,18 +108,18 @@ bool gencache_shutdown(void)
  * @retval true when entry is successfuly stored
  * @retval false on failure
  **/
- 
+
 bool gencache_set(const char *keystr, const char *value, time_t timeout)
 {
 	int ret;
 	TDB_DATA databuf;
 	char* valstr = NULL;
-	
+
 	/* fail completely if get null pointers passed */
 	SMB_ASSERT(keystr && value);
 
 	if (!gencache_init()) return False;
-	
+
 	if (asprintf(&valstr, CACHE_DATA_FMT, (int)timeout, value) == -1) {
 		return False;
 	}
@@ -132,7 +132,7 @@ bool gencache_set(const char *keystr, const char *value, time_t timeout)
 
 	ret = tdb_store_bystring(cache, keystr, databuf, 0);
 	SAFE_FREE(valstr);
-	
+
 	return ret == 0;
 }
 
@@ -148,15 +148,15 @@ bool gencache_set(const char *keystr, const char *value, time_t timeout)
 bool gencache_del(const char *keystr)
 {
 	int ret;
-	
+
 	/* fail completely if get null pointers passed */
 	SMB_ASSERT(keystr);
 
 	if (!gencache_init()) return False;	
-	
+
 	DEBUG(10, ("Deleting cache entry (key = %s)\n", keystr));
 	ret = tdb_delete_bystring(cache, keystr);
-	
+
 	return ret == 0;
 }
 
@@ -224,7 +224,7 @@ bool gencache_get(const char *keystr, char **valstr, time_t *timeout)
 			return False;
 		}
 	}
-	
+
 	SAFE_FREE(databuf.dptr);
 
 	if (timeout) {
@@ -396,15 +396,74 @@ bool gencache_set_data_blob(const char *keystr, const DATA_BLOB *blob, time_t ti
  *
  **/
 
+struct gencache_iterate_state {
+	void (*fn)(const char *key, const char *value, time_t timeout,
+		   void *priv);
+	const char *pattern;
+	void *priv;
+};
+
+static int gencache_iterate_fn(struct tdb_context *tdb, TDB_DATA key,
+			       TDB_DATA value, void *priv)
+{
+	struct gencache_iterate_state *state =
+		(struct gencache_iterate_state *)priv;
+	char *keystr;
+	char *free_key = NULL;
+	char *valstr;
+	char *free_val = NULL;
+	unsigned long u;
+	time_t timeout;
+	char *timeout_endp;
+
+	if (key.dptr[key.dsize-1] == '\0') {
+		keystr = (char *)key.dptr;
+	} else {
+		/* ensure 0-termination */
+		keystr = SMB_STRNDUP((char *)key.dptr, key.dsize);
+		free_key = keystr;
+	}
+
+	if ((value.dptr == NULL) || (value.dsize <= TIMEOUT_LEN)) {
+		goto done;
+	}
+
+	if (fnmatch(state->pattern, keystr, 0) != 0) {
+		goto done;
+	}
+
+	if (value.dptr[value.dsize-1] == '\0') {
+		valstr = (char *)value.dptr;
+	} else {
+		/* ensure 0-termination */
+		valstr = SMB_STRNDUP((char *)value.dptr, value.dsize);
+		free_val = valstr;
+	}
+
+	u = strtoul(valstr, &timeout_endp, 10);
+
+	if ((*timeout_endp != '/') || ((timeout_endp-valstr) != TIMEOUT_LEN)) {
+		goto done;
+	}
+
+	timeout = u;
+	timeout_endp += 1;
+
+	DEBUG(10, ("Calling function with arguments "
+		   "(key = %s, value = %s, timeout = %s)\n",
+		   keystr, timeout_endp, ctime(&timeout)));
+	state->fn(keystr, timeout_endp, timeout, state->priv);
+
+ done:
+	SAFE_FREE(free_key);
+	SAFE_FREE(free_val);
+	return 0;
+}
+
 void gencache_iterate(void (*fn)(const char* key, const char *value, time_t timeout, void* dptr),
                       void* data, const char* keystr_pattern)
 {
-	TDB_LIST_NODE *node, *first_node;
-	TDB_DATA databuf;
-	char *keystr = NULL, *valstr = NULL, *entry = NULL;
-	time_t timeout = 0;
-	int status;
-	unsigned u;
+	struct gencache_iterate_state state;
 
 	/* fail completely if get null pointers passed */
 	SMB_ASSERT(fn && keystr_pattern);
@@ -412,72 +471,11 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 	if (!gencache_init()) return;
 
 	DEBUG(5, ("Searching cache keys with pattern %s\n", keystr_pattern));
-	node = tdb_search_keys(cache, keystr_pattern);
-	first_node = node;
-	
-	while (node) {
-		char *fmt;
-
-		/* ensure null termination of the key string */
-		keystr = SMB_STRNDUP((const char *)node->node_key.dptr, node->node_key.dsize);
-		if (!keystr) {
-			break;
-		}
-		
-		/* 
-		 * We don't use gencache_get function, because we need to iterate through
-		 * all of the entries. Validity verification is up to fn routine.
-		 */
-		databuf = tdb_fetch(cache, node->node_key);
-		if (!databuf.dptr || databuf.dsize <= TIMEOUT_LEN) {
-			SAFE_FREE(databuf.dptr);
-			SAFE_FREE(keystr);
-			node = node->next;
-			continue;
-		}
-		entry = SMB_STRNDUP((const char *)databuf.dptr, databuf.dsize);
-		if (!entry) {
-			SAFE_FREE(databuf.dptr);
-			SAFE_FREE(keystr);
-			break;
-		}
-
-		SAFE_FREE(databuf.dptr);
 
-		valstr = (char *)SMB_MALLOC(databuf.dsize + 1 - TIMEOUT_LEN);
-		if (!valstr) {
-			SAFE_FREE(entry);
-			SAFE_FREE(keystr);
-			break;
-		}
-
-		if (asprintf(&fmt, READ_CACHE_DATA_FMT_TEMPLATE,
-			     (unsigned int)databuf.dsize - TIMEOUT_LEN)
-		    == -1) {
-			SAFE_FREE(valstr);
-			SAFE_FREE(entry);
-			SAFE_FREE(keystr);
-			break;
-		}
-		status = sscanf(entry, fmt, &u, valstr);
-		SAFE_FREE(fmt);
-
-		if ( status != 2 ) {
-			DEBUG(0,("gencache_iterate: invalid return from sscanf %d\n",status));
-		}
-		timeout = u;
-		
-		DEBUG(10, ("Calling function with arguments (key = %s, value = %s, timeout = %s)\n",
-		           keystr, valstr, ctime(&timeout)));
-		fn(keystr, valstr, timeout, data);
-		
-		SAFE_FREE(valstr);
-		SAFE_FREE(entry);
-		SAFE_FREE(keystr);
-		node = node->next;
-	}
-	
-	tdb_search_list_free(first_node);
+	state.fn = fn;
+	state.pattern = keystr_pattern;
+	state.priv = data;
+	tdb_traverse(cache, gencache_iterate_fn, &state);
 }
 
 /********************************************************************
@@ -488,7 +486,7 @@ int gencache_lock_entry( const char *key )
 {
 	if (!gencache_init())
 		return -1;
-	
+
 	return tdb_lock_bystring(cache, key);
 }
 
@@ -500,7 +498,7 @@ void gencache_unlock_entry( const char *key )
 {
 	if (!gencache_init())
 		return;
-	
+
 	tdb_unlock_bystring(cache, key);
 	return;
 }
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 0e059edb29..e616a2509f 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -165,7 +165,6 @@ static NTSTATUS pipe_cm_open(TALLOC_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)
 {
 	struct rpc_pipe_client *result = NULL;
@@ -192,7 +191,6 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
 	}
 
 	*presult = result;
-	*pcli = cli;
 
 	return WERR_OK;
 }
diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 0d66be0eb1..0d1bc08ad3 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -32,12 +32,10 @@ WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -53,10 +51,6 @@ WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -118,7 +112,6 @@ WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	union srvsvc_NetFileInfo info;
 	uint32_t num_entries = 0;
@@ -137,7 +130,6 @@ WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -163,10 +155,6 @@ WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -187,7 +175,6 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct srvsvc_NetFileInfoCtr info_ctr;
 	struct srvsvc_NetFileCtr2 ctr2;
@@ -209,7 +196,6 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -273,10 +259,6 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 76c0d0be2a..d3f58f6684 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -40,14 +40,12 @@ WERROR NetGetDCName_l(struct libnetapi_ctx *ctx,
 WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
 		      struct NetGetDCName *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_netlogon.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -82,14 +80,12 @@ WERROR NetGetAnyDCName_l(struct libnetapi_ctx *ctx,
 WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx,
 			 struct NetGetAnyDCName *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_netlogon.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -141,12 +137,10 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_netlogon.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 95c012a7f6..617bde2c9a 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -30,7 +30,6 @@
 WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 		     struct NetGroupAdd *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -73,7 +72,6 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -195,10 +193,6 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 				      &group_handle);
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -226,7 +220,6 @@ WERROR NetGroupAdd_l(struct libnetapi_ctx *ctx,
 WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 		     struct NetGroupDel *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -250,7 +243,6 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -362,10 +354,6 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -393,7 +381,6 @@ WERROR NetGroupDel_l(struct libnetapi_ctx *ctx,
 WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 			 struct NetGroupSetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -421,7 +408,6 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -547,10 +533,6 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -639,7 +621,6 @@ static WERROR map_group_info_to_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 			 struct NetGroupGetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -662,7 +643,6 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -732,10 +712,6 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -763,7 +739,6 @@ WERROR NetGroupGetInfo_l(struct libnetapi_ctx *ctx,
 WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 			 struct NetGroupAddUser *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -784,7 +759,6 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -859,10 +833,6 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -890,7 +860,6 @@ WERROR NetGroupAddUser_l(struct libnetapi_ctx *ctx,
 WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 			 struct NetGroupDelUser *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -911,7 +880,6 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -985,10 +953,6 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -1166,7 +1130,6 @@ static WERROR convert_samr_disp_groups_to_GROUP_INFO_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 		      struct NetGroupEnum *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle;
 	struct dom_sid2 *domain_sid = NULL;
@@ -1195,7 +1158,6 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1260,10 +1222,6 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	/* if last query */
 	if (NT_STATUS_IS_OK(status) ||
 	    NT_STATUS_IS_ERR(status)) {
@@ -1294,7 +1252,6 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 {
 	/* FIXME: this call needs to cope with large replies */
 
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_account_name;
@@ -1331,7 +1288,6 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1419,10 +1375,6 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -1450,7 +1402,6 @@ WERROR NetGroupGetUsers_l(struct libnetapi_ctx *ctx,
 WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
 			  struct NetGroupSetUsers *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_account_name;
@@ -1494,7 +1445,6 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1665,10 +1615,6 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d15e2e733c..9eedc5de03 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -98,7 +98,6 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
 WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 		       struct NetJoinDomain *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
@@ -107,7 +106,6 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server,
 				   &ndr_table_wkssvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -116,11 +114,11 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 	if (r->in.password) {
 		encode_wkssvc_join_password_buffer(ctx,
 						   r->in.password,
-						   &cli->user_session_key,
+						   &pipe_cli->auth->user_session_key,
 						   &encrypted_password);
 	}
 
-	old_timeout = cli_set_timeout(cli, 600000);
+	old_timeout = rpccli_set_timeout(pipe_cli, 600000);
 
 	status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, ctx,
 					       r->in.server,
@@ -136,10 +134,8 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (cli) {
-		if (old_timeout) {
-			cli_set_timeout(cli, old_timeout);
-		}
+	if (pipe_cli && old_timeout) {
+		rpccli_set_timeout(pipe_cli, old_timeout);
 	}
 
 	return werr;
@@ -227,7 +223,6 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
 WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 			 struct NetUnjoinDomain *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
@@ -236,7 +231,6 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_wkssvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -245,11 +239,11 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 	if (r->in.password) {
 		encode_wkssvc_join_password_buffer(ctx,
 						   r->in.password,
-						   &cli->user_session_key,
+						   &pipe_cli->auth->user_session_key,
 						   &encrypted_password);
 	}
 
-	old_timeout = cli_set_timeout(cli, 60000);
+	old_timeout = rpccli_set_timeout(pipe_cli, 60000);
 
 	status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, ctx,
 						 r->in.server_name,
@@ -263,10 +257,8 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (cli) {
-		if (old_timeout) {
-			cli_set_timeout(cli, old_timeout);
-		}
+	if (pipe_cli && old_timeout) {
+		rpccli_set_timeout(pipe_cli, old_timeout);
 	}
 
 	return werr;
@@ -278,7 +270,6 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
 			       struct NetGetJoinInformation *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -286,7 +277,6 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_wkssvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -410,7 +400,6 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 			   struct NetGetJoinableOUs *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
@@ -418,7 +407,6 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_wkssvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -427,7 +415,7 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 	if (r->in.password) {
 		encode_wkssvc_join_password_buffer(ctx,
 						   r->in.password,
-						   &cli->user_session_key,
+						   &pipe_cli->auth->user_session_key,
 						   &encrypted_password);
 	}
 
@@ -454,7 +442,6 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
 				  struct NetRenameMachineInDomain *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct wkssvc_PasswordBuffer *encrypted_password = NULL;
 	NTSTATUS status;
@@ -462,7 +449,6 @@ WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_wkssvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -471,7 +457,7 @@ WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
 	if (r->in.password) {
 		encode_wkssvc_join_password_buffer(ctx,
 						   r->in.password,
-						   &cli->user_session_key,
+						   &pipe_cli->auth->user_session_key,
 						   &encrypted_password);
 	}
 
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index 5e738e1262..13405b553e 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -113,7 +113,6 @@ static NTSTATUS libnetapi_samr_open_alias_queryinfo(TALLOC_CTX *mem_ctx,
 WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 			  struct NetLocalGroupAdd *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -152,7 +151,6 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -227,10 +225,6 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&alias_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &alias_handle);
 	}
@@ -260,7 +254,6 @@ WERROR NetLocalGroupAdd_l(struct libnetapi_ctx *ctx,
 WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 			  struct NetLocalGroupDel *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -278,7 +271,6 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -349,10 +341,6 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&alias_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &alias_handle);
 	}
@@ -427,7 +415,6 @@ static WERROR map_alias_info_to_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 			      struct NetLocalGroupGetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -456,7 +443,6 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -530,10 +516,6 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 					r->out.buffer);
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&alias_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &alias_handle);
 	}
@@ -603,7 +585,6 @@ static WERROR map_buffer_to_alias_info(TALLOC_CTX *mem_ctx,
 WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 			      struct NetLocalGroupSetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -633,7 +614,6 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -710,10 +690,6 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&alias_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &alias_handle);
 	}
@@ -742,7 +718,6 @@ WERROR NetLocalGroupSetInfo_l(struct libnetapi_ctx *ctx,
 WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 			   struct NetLocalGroupEnum *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -781,7 +756,6 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -911,10 +885,6 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (ctx->disable_policy_handle_cache) {
 		libnetapi_samr_close_domain_handle(ctx, &domain_handle);
 		libnetapi_samr_close_builtin_handle(ctx, &builtin_handle);
@@ -997,7 +967,6 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 {
 	struct NetLocalGroupAddMembers *r = NULL;
 
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct rpc_pipe_client *lsa_pipe = NULL;
 	NTSTATUS status;
@@ -1074,7 +1043,6 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 	if (r->in.level == 3) {
 		werr = libnetapi_open_pipe(ctx, r->in.server_name,
 					   &ndr_table_lsarpc.syntax_id,
-					   &cli,
 					   &lsa_pipe);
 		if (!W_ERROR_IS_OK(werr)) {
 			goto done;
@@ -1094,7 +1062,6 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1267,10 +1234,6 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&alias_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &alias_handle);
 	}
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index e6a2eb8e99..effe2eb9a0 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -54,7 +54,6 @@ 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,
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index b2a134b0af..d77145eef3 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -161,7 +161,6 @@ static NTSTATUS map_server_info_to_SERVER_INFO_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 			  struct NetServerGetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -183,7 +182,6 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -274,7 +272,6 @@ WERROR NetServerSetInfo_l(struct libnetapi_ctx *ctx,
 WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 			  struct NetServerSetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -282,7 +279,6 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -318,7 +314,6 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 		      struct NetRemoteTOD *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -326,7 +321,6 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index e6aed36064..84c275248d 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -181,7 +181,6 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	union srvsvc_NetShareInfo info;
 
@@ -201,7 +200,6 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -227,10 +225,6 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -251,7 +245,6 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	if (!r->in.net_name) {
@@ -260,7 +253,6 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -277,10 +269,6 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -301,7 +289,6 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct srvsvc_NetShareInfoCtr info_ctr;
 	struct srvsvc_NetShareCtr0 ctr0;
@@ -329,7 +316,6 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -387,10 +373,6 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -411,7 +393,6 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	union srvsvc_NetShareInfo info;
 	uint32_t num_entries = 0;
@@ -436,7 +417,6 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -463,10 +443,6 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
@@ -487,7 +463,6 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
 {
 	WERROR werr;
 	NTSTATUS status;
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	union srvsvc_NetShareInfo info;
 
@@ -512,7 +487,6 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -539,10 +513,6 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	return werr;
 }
 
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 770ffe3263..9d7f299f59 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -349,7 +349,6 @@ static NTSTATUS set_user_info_USER_INFO_X(TALLOC_CTX *ctx,
 WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 		    struct NetUserAdd *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -383,7 +382,6 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -452,7 +450,7 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 	uX.usriX_flags |= ACB_NORMAL;
 
 	status = set_user_info_USER_INFO_X(ctx, pipe_cli,
-					   &cli->user_session_key,
+					   &pipe_cli->auth->user_session_key,
 					   &user_handle,
 					   &uX);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -468,10 +466,6 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 			       &user_handle);
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&user_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &user_handle);
 	}
@@ -499,7 +493,6 @@ WERROR NetUserAdd_l(struct libnetapi_ctx *ctx,
 WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 		    struct NetUserDel *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -516,7 +509,6 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 
 	if (!W_ERROR_IS_OK(werr)) {
@@ -587,10 +579,6 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&user_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &user_handle);
 	}
@@ -1188,7 +1176,6 @@ static NTSTATUS libnetapi_samr_lookup_user_map_USER_INFO(TALLOC_CTX *mem_ctx,
 WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 		     struct NetUserEnum *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle;
 	struct dom_sid2 *domain_sid = NULL;
@@ -1229,7 +1216,6 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1310,10 +1296,6 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	/* if last query */
 	if (NT_STATUS_IS_OK(status) ||
 	    NT_STATUS_IS_ERR(status)) {
@@ -1504,7 +1486,6 @@ static WERROR convert_samr_dispinfo_to_NET_DISPLAY(TALLOC_CTX *mem_ctx,
 WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 				    struct NetQueryDisplayInformation *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle;
 	struct dom_sid2 *domain_sid = NULL;
@@ -1531,7 +1512,6 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1570,10 +1550,6 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 						    r->out.entries_read,
 						    r->out.buffer);
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	/* if last query */
 	if (NT_STATUS_IS_OK(status) ||
 	    NT_STATUS_IS_ERR(status)) {
@@ -1622,7 +1598,6 @@ WERROR NetUserChangePassword_l(struct libnetapi_ctx *ctx,
 WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
 			struct NetUserGetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -1660,7 +1635,6 @@ WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1716,10 +1690,6 @@ WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&user_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &user_handle);
 	}
@@ -1747,7 +1717,6 @@ WERROR NetUserGetInfo_l(struct libnetapi_ctx *ctx,
 WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
 			struct NetUserSetInfo *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -1818,7 +1787,6 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1877,7 +1845,7 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	status = set_user_info_USER_INFO_X(ctx, pipe_cli,
-					   &cli->user_session_key,
+					   &pipe_cli->auth->user_session_key,
 					   &user_handle,
 					   &uX);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -1888,10 +1856,6 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&user_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &user_handle);
 	}
@@ -2209,7 +2173,6 @@ static NTSTATUS query_USER_MODALS_INFO_to_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
 			  struct NetUserModalsGet *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -2244,7 +2207,6 @@ WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2278,10 +2240,6 @@ WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (ctx->disable_policy_handle_cache) {
 		libnetapi_samr_close_domain_handle(ctx, &domain_handle);
 		libnetapi_samr_close_connect_handle(ctx, &connect_handle);
@@ -2680,7 +2638,6 @@ static NTSTATUS set_USER_MODALS_INFO_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
 			  struct NetUserModalsSet *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
@@ -2728,7 +2685,6 @@ WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2757,10 +2713,6 @@ WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (ctx->disable_policy_handle_cache) {
 		libnetapi_samr_close_domain_handle(ctx, &domain_handle);
 		libnetapi_samr_close_connect_handle(ctx, &connect_handle);
@@ -2829,7 +2781,6 @@ NTSTATUS add_GROUP_USERS_INFO_X_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 			  struct NetUserGetGroups *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle, domain_handle, user_handle;
 	struct lsa_String lsa_account_name;
@@ -2866,7 +2817,6 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2957,10 +2907,6 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (ctx->disable_policy_handle_cache) {
 		libnetapi_samr_close_domain_handle(ctx, &domain_handle);
 		libnetapi_samr_close_connect_handle(ctx, &connect_handle);
@@ -2984,7 +2930,6 @@ WERROR NetUserGetGroups_l(struct libnetapi_ctx *ctx,
 WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 			  struct NetUserSetGroups *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle, domain_handle, user_handle, group_handle;
 	struct lsa_String lsa_account_name;
@@ -3027,7 +2972,6 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -3214,10 +3158,6 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 	werr = WERR_OK;
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (is_valid_policy_hnd(&group_handle)) {
 		rpccli_samr_Close(pipe_cli, ctx, &group_handle);
 	}
@@ -3271,7 +3211,6 @@ static NTSTATUS add_LOCALGROUP_USERS_INFO_X_buffer(TALLOC_CTX *mem_ctx,
 WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 			       struct NetUserGetLocalGroups *r)
 {
-	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
 	struct policy_handle connect_handle, domain_handle, user_handle,
 	builtin_handle;
@@ -3314,7 +3253,6 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_samr.syntax_id,
-				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -3472,10 +3410,6 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (!cli) {
-		return werr;
-	}
-
 	if (ctx->disable_policy_handle_cache) {
 		libnetapi_samr_close_domain_handle(ctx, &domain_handle);
 		libnetapi_samr_close_connect_handle(ctx, &connect_handle);
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 98c25c1e24..3ddc4342a7 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -978,16 +978,10 @@ struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
 	struct open_socket_out_state *state;
 	NTSTATUS status;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct open_socket_out_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct open_socket_out_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
-
 	state->ev = ev;
 	state->ss = *pss;
 	state->port = port;
@@ -1170,16 +1164,10 @@ struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
 	struct open_socket_out_defer_state *state;
 	NTSTATUS status;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct open_socket_out_defer_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct open_socket_out_defer_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
-
 	state->ev = ev;
 	state->ss = *pss;
 	state->port = port;
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 03f72dfcee..2dbdd57947 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -422,74 +422,6 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags,
 	return tdb;
 }
 
-
-/**
- * Search across the whole tdb for keys that match the given pattern
- * return the result as a list of keys
- *
- * @param tdb pointer to opened tdb file context
- * @param pattern searching pattern used by fnmatch(3) functions
- *
- * @return list of keys found by looking up with given pattern
- **/
-TDB_LIST_NODE *tdb_search_keys(TDB_CONTEXT *tdb, const char* pattern)
-{
-	TDB_DATA key, next;
-	TDB_LIST_NODE *list = NULL;
-	TDB_LIST_NODE *rec = NULL;
-	
-	for (key = tdb_firstkey(tdb); key.dptr; key = next) {
-		/* duplicate key string to ensure null-termination */
-		char *key_str = SMB_STRNDUP((const char *)key.dptr, key.dsize);
-		if (!key_str) {
-			DEBUG(0, ("tdb_search_keys: strndup() failed!\n"));
-			smb_panic("strndup failed!\n");
-		}
-		
-		DEBUG(18, ("checking %s for match to pattern %s\n", key_str, pattern));
-		
-		next = tdb_nextkey(tdb, key);
-
-		/* do the pattern checking */
-		if (fnmatch(pattern, key_str, 0) == 0) {
-			rec = SMB_MALLOC_P(TDB_LIST_NODE);
-			ZERO_STRUCTP(rec);
-
-			rec->node_key = key;
-	
-			DLIST_ADD_END(list, rec, TDB_LIST_NODE *);
-		
-			DEBUG(18, ("checking %s matched pattern %s\n", key_str, pattern));
-		} else {
-			free(key.dptr);
-		}
-		
-		/* free duplicated key string */
-		free(key_str);
-	}
-	
-	return list;
-
-}
-
-
-/**
- * Free the list returned by tdb_search_keys
- *
- * @param node list of results found by tdb_search_keys
- **/
-void tdb_search_list_free(TDB_LIST_NODE* node)
-{
-	TDB_LIST_NODE *next_node;
-	
-	while (node) {
-		next_node = node->next;
-		SAFE_FREE(node->node_key.dptr);
-		SAFE_FREE(node);
-		node = next_node;
-	};
-}
-
 /****************************************************************************
  tdb_store, wrapped in a transaction. This way we make sure that a process
  that dies within writing does not leave a corrupt tdb behind.
diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index 1f5f181aa1..0e6e5d15c4 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -43,17 +43,10 @@ struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct req_read_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct req_read_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct req_read_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->max_extra_data = max_extra_data;
@@ -205,17 +198,10 @@ struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct req_write_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct req_write_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct req_write_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_req = wb_req;
@@ -304,17 +290,10 @@ struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct resp_read_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct resp_read_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct resp_read_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_resp = talloc(state, struct winbindd_response);
@@ -458,17 +437,10 @@ struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct resp_write_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct resp_write_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct resp_write_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_resp = wb_resp;
diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index d58c934c07..ea0bcb512e 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -289,15 +289,10 @@ static struct async_req *wb_int_trans_send(TALLOC_CTX *mem_ctx,
 	struct async_req *subreq;
 	struct wb_int_trans_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct wb_int_trans_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct wb_int_trans_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
 
 	if (winbind_closed_fd(fd)) {
 		if (!async_post_status(result, ev,
@@ -420,16 +415,10 @@ static struct async_req *wb_open_pipe_send(TALLOC_CTX *mem_ctx,
 	struct async_req *subreq;
 	struct wb_open_pipe_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct wb_open_pipe_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct wb_open_pipe_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
-
 	state->wb_ctx = wb_ctx;
 	state->ev = ev;
 	state->need_priv = need_priv;
@@ -617,16 +606,10 @@ struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 	struct async_req *result;
 	struct wb_trans_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct wb_trans_state)) {
 		return NULL;
 	}
-	state = talloc(result, struct wb_trans_state);
-	if (state == NULL) {
-		goto fail;
-	}
-	result->private_data = state;
-
 	state->wb_ctx = wb_ctx;
 	state->ev = ev;
 	state->wb_req = winbindd_request_copy(state, wb_req);
diff --git a/source3/librpc/rpc/dcerpc.c b/source3/librpc/rpc/dcerpc.c
index 69bfc6f329..21a2004422 100644
--- a/source3/librpc/rpc/dcerpc.c
+++ b/source3/librpc/rpc/dcerpc.c
@@ -84,7 +84,8 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
 
 	prs_init_empty( &r_ps, req, UNMARSHALL );
 
-	status = rpc_api_pipe_req(req->pipe->rpc_cli, req->opnum, &req->q_ps, &r_ps); 
+	status = rpc_api_pipe_req(req, req->pipe->rpc_cli, req->opnum,
+				  &req->q_ps, &r_ps);
 
 	prs_mem_free( &req->q_ps );
 
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 1d5582e61d..1ba93d827d 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -278,15 +278,10 @@ struct async_req *cli_pull_send(TALLOC_CTX *mem_ctx,
 	struct cli_pull_state *state;
 	int i;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto failed;
-	}
-	state = talloc(result, struct cli_pull_state);
-	if (state == NULL) {
-		goto failed;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_pull_state)) {
+		return NULL;
 	}
-	result->private_data = state;
 	result->print = cli_pull_print;
 	state->req = result;
 
@@ -843,16 +838,10 @@ static struct async_req *cli_writeall_send(TALLOC_CTX *mem_ctx,
 	struct async_req *subreq;
 	struct cli_writeall_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto fail;
-	}
-	state = talloc(result, struct cli_writeall_state);
-	if (state == NULL) {
-		goto fail;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_writeall_state)) {
+		return NULL;
 	}
-	result->private_data = state;
-
 	state->ev = ev;
 	state->cli = cli;
 	state->fnum = fnum;
@@ -969,15 +958,10 @@ struct async_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 	struct cli_push_state *state;
 	int i;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
-		goto failed;
-	}
-	state = talloc(result, struct cli_push_state);
-	if (state == NULL) {
-		goto failed;
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_push_state)) {
+		return NULL;
 	}
-	result->private_data = state;
 	state->req = result;
 
 	state->cli = cli;
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 28bbfa57b6..cf621343e7 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -172,57 +172,6 @@ static uint32 get_rpc_call_id(void)
 	return ++call_id;
 }
 
-/*******************************************************************
- Read from a RPC named pipe
- ********************************************************************/
-static NTSTATUS rpc_read_np(struct cli_state *cli, const char *pipe_name,
-			    int fnum, char *buf, size_t size,
-			    ssize_t *pnum_read)
-{
-       ssize_t num_read;
-
-       num_read = cli_read(cli, fnum, buf, 0, size);
-
-       DEBUG(5,("rpc_read_np: num_read = %d, to read: %u\n", (int)num_read,
-		(unsigned int)size));
-
-       /*
-	* A dos error of ERRDOS/ERRmoredata is not an error.
-	*/
-       if (cli_is_dos_error(cli)) {
-	       uint32 ecode;
-	       uint8 eclass;
-	       cli_dos_error(cli, &eclass, &ecode);
-	       if (eclass != ERRDOS && ecode != ERRmoredata) {
-		       DEBUG(0,("rpc_read: DOS Error %d/%u (%s) in cli_read "
-				"on fnum 0x%x\n", eclass, (unsigned int)ecode,
-				cli_errstr(cli), fnum));
-		       return dos_to_ntstatus(eclass, ecode);
-	       }
-       }
-
-       /*
-	* Likewise for NT_STATUS_BUFFER_TOO_SMALL
-	*/
-       if (cli_is_nt_error(cli)) {
-	       if (!NT_STATUS_EQUAL(cli_nt_error(cli),
-				    NT_STATUS_BUFFER_TOO_SMALL)) {
-		       DEBUG(0,("rpc_read: Error (%s) in cli_read on fnum "
-				"0x%x\n", nt_errstr(cli_nt_error(cli)), fnum));
-		       return cli_nt_error(cli);
-	       }
-       }
-
-       if (num_read == -1) {
-	       DEBUG(0,("rpc_read: Error - cli_read on fnum 0x%x returned "
-			"-1\n", fnum));
-	       return cli_get_nt_error(cli);
-       }
-
-       *pnum_read = num_read;
-       return NT_STATUS_OK;
-}
-
 /*
  * Realloc pdu to have a least "size" bytes
  */
@@ -254,83 +203,275 @@ static bool rpc_grow_buffer(prs_struct *pdu, size_t size)
  Reads the whole size or give an error message
  ********************************************************************/
 
-static NTSTATUS rpc_read(struct rpc_pipe_client *cli,
-			 char *pdata, size_t size)
-{
-	ssize_t num_read = 0;
+struct rpc_read_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	char *data;
+	size_t size;
+	size_t num_read;
+};
 
-	DEBUG(5, ("rpc_read: data_to_read: %u\n", (unsigned int)size));
+static void rpc_read_np_done(struct async_req *subreq);
+static void rpc_read_sock_done(struct async_req *subreq);
 
-	while (num_read < size) {
-		ssize_t thistime = 0;
-		NTSTATUS status;
+static struct async_req *rpc_read_send(TALLOC_CTX *mem_ctx,
+				       struct event_context *ev,
+				       struct rpc_pipe_client *cli,
+				       char *data, size_t size)
+{
+	struct async_req *result, *subreq;
+	struct rpc_read_state *state;
 
-		switch (cli->transport_type) {
-		case NCACN_NP:
-			status = rpc_read_np(cli->trans.np.cli,
-					     cli->trans.np.pipe_name,
-					     cli->trans.np.fnum,
-					     pdata + num_read,
-					     size - num_read, &thistime);
-			break;
-		case NCACN_IP_TCP:
-		case NCACN_UNIX_STREAM:
-			status = NT_STATUS_OK;
-			thistime = sys_read(cli->trans.sock.fd,
-					    pdata + num_read,
-					    size - num_read);
-			if (thistime == -1) {
-				status = map_nt_error_from_unix(errno);
-			}
-			break;
-		default:
-			DEBUG(0, ("unknown transport type %d\n",
-				  cli->transport_type));
-			return NT_STATUS_INTERNAL_ERROR;
-		}
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct rpc_read_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->data = data;
+	state->size = size;
+	state->num_read = 0;
 
-		if (!NT_STATUS_IS_OK(status)) {
-			return status;
+	DEBUG(5, ("rpc_read_send: data_to_read: %u\n", (unsigned int)size));
+
+	if (cli->transport_type == NCACN_NP) {
+		subreq = cli_read_andx_send(
+			state, ev, cli->trans.np.cli,
+			cli->trans.np.fnum, 0, size);
+		if (subreq == NULL) {
+			DEBUG(10, ("cli_read_andx_send failed\n"));
+			goto fail;
 		}
-		if (thistime == 0) {
-			return NT_STATUS_END_OF_FILE;
+		subreq->async.fn = rpc_read_np_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	if ((cli->transport_type == NCACN_IP_TCP)
+	    || (cli->transport_type == NCACN_UNIX_STREAM)) {
+		subreq = recvall_send(state, ev, cli->trans.sock.fd,
+				      data, size, 0);
+		if (subreq == NULL) {
+			DEBUG(10, ("recvall_send failed\n"));
+			goto fail;
 		}
+		subreq->async.fn = rpc_read_sock_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	if (async_post_status(result, ev, NT_STATUS_INVALID_PARAMETER)) {
+		return result;
+	}
+ fail:
+	TALLOC_FREE(result);
+	return NULL;
+}
 
-		num_read += thistime;
+static void rpc_read_np_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_read_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_read_state);
+	NTSTATUS status;
+	ssize_t received;
+	uint8_t *rcvbuf;
 
+	status = cli_read_andx_recv(subreq, &received, &rcvbuf);
+	/*
+	 * We can't TALLOC_FREE(subreq) as usual here, as rcvbuf still is a
+	 * child of that.
+	 */
+	if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
+		status = NT_STATUS_OK;
+	}
+	if (!NT_STATUS_IS_OK(status)) {
+		TALLOC_FREE(subreq);
+		async_req_error(req, status);
+		return;
 	}
 
-	return NT_STATUS_OK;
+	memcpy(state->data + state->num_read, rcvbuf, received);
+	TALLOC_FREE(subreq);
+
+	state->num_read += received;
+
+	if (state->num_read == state->size) {
+		async_req_done(req);
+		return;
+	}
+
+	subreq = cli_read_andx_send(
+		state, state->ev, state->cli->trans.np.cli,
+		state->cli->trans.np.fnum, 0,
+		state->size - state->num_read);
+
+	if (async_req_nomem(subreq, req)) {
+		return;
+	}
+
+	subreq->async.fn = rpc_read_np_done;
+	subreq->async.priv = req;
 }
 
-/****************************************************************************
- Try and get a PDU's worth of data from current_pdu. If not, then read more
- from the wire.
- ****************************************************************************/
+static void rpc_read_sock_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	NTSTATUS status;
+
+	status = recvall_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	async_req_done(req);
+}
 
-static NTSTATUS cli_pipe_get_current_pdu(struct rpc_pipe_client *cli, RPC_HDR *prhdr, prs_struct *current_pdu)
+static NTSTATUS rpc_read_recv(struct async_req *req)
 {
-	NTSTATUS ret = NT_STATUS_OK;
-	uint32 current_pdu_len = prs_data_size(current_pdu);
+	return async_req_simple_recv(req);
+}
 
-	/* Ensure we have at least RPC_HEADER_LEN worth of data to parse. */
-	if (current_pdu_len < RPC_HEADER_LEN) {
-		if (!rpc_grow_buffer(current_pdu, RPC_HEADER_LEN)) {
-			return NT_STATUS_NO_MEMORY;
+struct rpc_write_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	const char *data;
+	size_t size;
+	size_t num_written;
+};
+
+static void rpc_write_np_done(struct async_req *subreq);
+static void rpc_write_sock_done(struct async_req *subreq);
+
+static struct async_req *rpc_write_send(TALLOC_CTX *mem_ctx,
+					struct event_context *ev,
+					struct rpc_pipe_client *cli,
+					const char *data, size_t size)
+{
+	struct async_req *result, *subreq;
+	struct rpc_write_state *state;
+
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct rpc_write_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->data = data;
+	state->size = size;
+	state->num_written = 0;
+
+	DEBUG(5, ("rpc_write_send: data_to_write: %u\n", (unsigned int)size));
+
+	if (cli->transport_type == NCACN_NP) {
+		subreq = cli_write_andx_send(
+			state, ev, cli->trans.np.cli,
+			cli->trans.np.fnum, 8, /* 8 means message mode. */
+			(uint8_t *)data, 0, size);
+		if (subreq == NULL) {
+			DEBUG(10, ("cli_write_andx_send failed\n"));
+			goto fail;
 		}
-		ret = rpc_read(cli,
-			       prs_data_p(current_pdu) + current_pdu_len,
-			       RPC_HEADER_LEN - current_pdu_len);
-		if (!NT_STATUS_IS_OK(ret)) {
-			return ret;
+		subreq->async.fn = rpc_write_np_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	if ((cli->transport_type == NCACN_IP_TCP)
+	    || (cli->transport_type == NCACN_UNIX_STREAM)) {
+		subreq = sendall_send(state, ev, cli->trans.sock.fd,
+				      data, size, 0);
+		if (subreq == NULL) {
+			DEBUG(10, ("sendall_send failed\n"));
+			goto fail;
 		}
-		current_pdu_len = RPC_HEADER_LEN;
+		subreq->async.fn = rpc_write_sock_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	if (async_post_status(result, ev, NT_STATUS_INVALID_PARAMETER)) {
+		return result;
+	}
+ fail:
+	TALLOC_FREE(result);
+	return NULL;
+}
+
+static void rpc_write_np_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_write_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_write_state);
+	NTSTATUS status;
+	size_t written;
+
+	status = cli_write_andx_recv(subreq, &written);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	state->num_written += written;
+
+	if (state->num_written == state->size) {
+		async_req_done(req);
+		return;
+	}
+
+	subreq = cli_write_andx_send(
+		state, state->ev, state->cli->trans.np.cli,
+		state->cli->trans.np.fnum, 8,
+		(uint8_t *)(state->data + state->num_written),
+		0, state->size - state->num_written);
+
+	if (async_req_nomem(subreq, req)) {
+		return;
+	}
+
+	subreq->async.fn = rpc_write_np_done;
+	subreq->async.priv = req;
+}
+
+static void rpc_write_sock_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	NTSTATUS status;
+
+	status = sendall_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
 	}
 
-	/* This next call sets the endian bit correctly in current_pdu. */
-	/* We will propagate this to rbuf later. */
-	if(!smb_io_rpc_hdr("rpc_hdr   ", prhdr, current_pdu, 0)) {
-		DEBUG(0,("cli_pipe_get_current_pdu: Failed to unmarshall RPC_HDR.\n"));
+	async_req_done(req);
+}
+
+static NTSTATUS rpc_write_recv(struct async_req *req)
+{
+	return async_req_simple_recv(req);
+}
+
+
+static NTSTATUS parse_rpc_header(struct rpc_pipe_client *cli,
+				 struct rpc_hdr_info *prhdr,
+				 prs_struct *pdu)
+{
+	/*
+	 * This next call sets the endian bit correctly in current_pdu. We
+	 * will propagate this to rbuf later.
+	 */
+
+	if(!smb_io_rpc_hdr("rpc_hdr   ", prhdr, pdu, 0)) {
+		DEBUG(0, ("get_current_pdu: Failed to unmarshall RPC_HDR.\n"));
 		return NT_STATUS_BUFFER_TOO_SMALL;
 	}
 
@@ -341,20 +482,155 @@ static NTSTATUS cli_pipe_get_current_pdu(struct rpc_pipe_client *cli, RPC_HDR *p
 		return NT_STATUS_BUFFER_TOO_SMALL;
 	}
 
-	/* Ensure we have frag_len bytes of data. */
-	if (current_pdu_len < prhdr->frag_len) {
-		if (!rpc_grow_buffer(current_pdu, prhdr->frag_len)) {
-			return NT_STATUS_NO_MEMORY;
+	return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Try and get a PDU's worth of data from current_pdu. If not, then read more
+ from the wire.
+ ****************************************************************************/
+
+struct get_complete_frag_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	struct rpc_hdr_info *prhdr;
+	prs_struct *pdu;
+};
+
+static void get_complete_frag_got_header(struct async_req *subreq);
+static void get_complete_frag_got_rest(struct async_req *subreq);
+
+static struct async_req *get_complete_frag_send(TALLOC_CTX *mem_ctx,
+					       struct event_context *ev,
+					       struct rpc_pipe_client *cli,
+					       struct rpc_hdr_info *prhdr,
+					       prs_struct *pdu)
+{
+	struct async_req *result, *subreq;
+	struct get_complete_frag_state *state;
+	uint32_t pdu_len;
+	NTSTATUS status;
+
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct get_complete_frag_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->prhdr = prhdr;
+	state->pdu = pdu;
+
+	pdu_len = prs_data_size(pdu);
+	if (pdu_len < RPC_HEADER_LEN) {
+		if (!rpc_grow_buffer(pdu, RPC_HEADER_LEN)) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
 		}
-		ret = rpc_read(cli,
-			       prs_data_p(current_pdu) + current_pdu_len,
-			       prhdr->frag_len - current_pdu_len);
-		if (!NT_STATUS_IS_OK(ret)) {
-			return ret;
+		subreq = rpc_read_send(state, state->ev, state->cli,
+				       prs_data_p(state->pdu) + pdu_len,
+				       RPC_HEADER_LEN - pdu_len);
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
 		}
+		subreq->async.fn = get_complete_frag_got_header;
+		subreq->async.priv = result;
+		return result;
 	}
 
-	return NT_STATUS_OK;
+	status = parse_rpc_header(cli, prhdr, pdu);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto post_status;
+	}
+
+	/*
+	 * Ensure we have frag_len bytes of data.
+	 */
+	if (pdu_len < prhdr->frag_len) {
+		if (!rpc_grow_buffer(pdu, prhdr->frag_len)) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
+		}
+		subreq = rpc_read_send(state, state->ev, state->cli,
+				       prs_data_p(pdu) + pdu_len,
+				       prhdr->frag_len - pdu_len);
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
+		}
+		subreq->async.fn = get_complete_frag_got_rest;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	status = NT_STATUS_OK;
+ post_status:
+	if (async_post_status(result, ev, status)) {
+		return result;
+	}
+	TALLOC_FREE(result);
+	return NULL;
+}
+
+static void get_complete_frag_got_header(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct get_complete_frag_state *state = talloc_get_type_abort(
+		req->private_data, struct get_complete_frag_state);
+	NTSTATUS status;
+
+	status = rpc_read_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	status = parse_rpc_header(state->cli, state->prhdr, state->pdu);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	if (!rpc_grow_buffer(state->pdu, state->prhdr->frag_len)) {
+		async_req_error(req, NT_STATUS_NO_MEMORY);
+		return;
+	}
+
+	/*
+	 * We're here in this piece of code because we've read exactly
+	 * RPC_HEADER_LEN bytes into state->pdu.
+	 */
+
+	subreq = rpc_read_send(state, state->ev, state->cli,
+			       prs_data_p(state->pdu) + RPC_HEADER_LEN,
+			       state->prhdr->frag_len - RPC_HEADER_LEN);
+	if (async_req_nomem(subreq, req)) {
+		return;
+	}
+	subreq->async.fn = get_complete_frag_got_rest;
+	subreq->async.priv = req;
+}
+
+static void get_complete_frag_got_rest(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	NTSTATUS status;
+
+	status = rpc_read_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+	async_req_done(req);
+}
+
+static NTSTATUS get_complete_frag_recv(struct async_req *req)
+{
+	return async_req_simple_recv(req);
 }
 
 /****************************************************************************
@@ -848,26 +1124,165 @@ static NTSTATUS cli_pipe_reset_current_pdu(struct rpc_pipe_client *cli, RPC_HDR
  Call a remote api on an arbitrary pipe.  takes param, data and setup buffers.
 ****************************************************************************/
 
-static bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
-			 uint16 *setup, uint32 setup_count,
-			 uint32 max_setup_count,
-			 char *params, uint32 param_count,
-			 uint32 max_param_count,
-			 char *data, uint32 data_count,
-			 uint32 max_data_count,
-			 char **rparam, uint32 *rparam_count,
-			 char **rdata, uint32 *rdata_count)
+struct cli_api_pipe_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	uint32_t max_rdata_len;
+	uint8_t *rdata;
+	uint32_t rdata_len;
+};
+
+static void cli_api_pipe_np_trans_done(struct async_req *subreq);
+static void cli_api_pipe_sock_send_done(struct async_req *subreq);
+static void cli_api_pipe_sock_read_done(struct async_req *subreq);
+
+static struct async_req *cli_api_pipe_send(TALLOC_CTX *mem_ctx,
+					   struct event_context *ev,
+					   struct rpc_pipe_client *cli,
+					   uint8_t *data, size_t data_len,
+					   uint32_t max_rdata_len)
+{
+	struct async_req *result, *subreq;
+	struct cli_api_pipe_state *state;
+	NTSTATUS status;
+
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct cli_api_pipe_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->max_rdata_len = max_rdata_len;
+
+	if (state->max_rdata_len < RPC_HEADER_LEN) {
+		/*
+		 * For a RPC reply we always need at least RPC_HEADER_LEN
+		 * bytes. We check this here because we will receive
+		 * RPC_HEADER_LEN bytes in cli_trans_sock_send_done.
+		 */
+		status = NT_STATUS_INVALID_PARAMETER;
+		goto post_status;
+	}
+
+	if (cli->transport_type == NCACN_NP) {
+
+		uint16_t setup[2];
+		SSVAL(setup+0, 0, TRANSACT_DCERPCCMD);
+		SSVAL(setup+1, 0, cli->trans.np.fnum);
+
+		subreq = cli_trans_send(
+			state, ev, cli->trans.np.cli, SMBtrans,
+			"\\PIPE\\", 0, 0, 0, setup, 2, 0,
+			NULL, 0, 0, data, data_len, max_rdata_len);
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
+		}
+		subreq->async.fn = cli_api_pipe_np_trans_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	if ((cli->transport_type == NCACN_IP_TCP)
+	    || (cli->transport_type == NCACN_UNIX_STREAM)) {
+		subreq = sendall_send(state, ev, cli->trans.sock.fd,
+				      data, data_len, 0);
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
+		}
+		subreq->async.fn = cli_api_pipe_sock_send_done;
+		subreq->async.priv = result;
+		return result;
+	}
+
+	status = NT_STATUS_INVALID_PARAMETER;
+
+ post_status:
+	if (async_post_status(result, ev, status)) {
+		return result;
+	}
+	TALLOC_FREE(result);
+	return NULL;
+}
+
+static void cli_api_pipe_np_trans_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct cli_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct cli_api_pipe_state);
+	NTSTATUS status;
+
+	status = cli_trans_recv(subreq, state, NULL, NULL, NULL, NULL,
+				&state->rdata, &state->rdata_len);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+	async_req_done(req);
+}
+
+static void cli_api_pipe_sock_send_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct cli_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct cli_api_pipe_state);
+	NTSTATUS status;
+
+	status = sendall_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	state->rdata = TALLOC_ARRAY(state, uint8_t, RPC_HEADER_LEN);
+	if (async_req_nomem(state->rdata, req)) {
+		return;
+	}
+	state->rdata_len = RPC_HEADER_LEN;
+
+	subreq = recvall_send(state, state->ev, state->cli->trans.sock.fd,
+			      state->rdata, RPC_HEADER_LEN, 0);
+	if (async_req_nomem(subreq, req)) {
+		return;
+	}
+	subreq->async.fn = cli_api_pipe_sock_read_done;
+	subreq->async.priv = req;
+}
+
+static void cli_api_pipe_sock_read_done(struct async_req *subreq)
 {
-	cli_send_trans(cli, SMBtrans,
-                 pipe_name,
-                 0,0,                         /* fid, flags */
-                 setup, setup_count, max_setup_count,
-                 params, param_count, max_param_count,
-                 data, data_count, max_data_count);
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	NTSTATUS status;
 
-	return (cli_receive_trans(cli, SMBtrans,
-                            rparam, (unsigned int *)rparam_count,
-                            rdata, (unsigned int *)rdata_count));
+	status = recvall_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+	async_req_done(req);
+}
+
+static NTSTATUS cli_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+				  uint8_t **prdata, uint32_t *prdata_len)
+{
+	struct cli_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct cli_api_pipe_state);
+	NTSTATUS status;
+
+	if (async_req_is_error(req, &status)) {
+		return status;
+	}
+
+	*prdata = talloc_move(mem_ctx, &state->rdata);
+	*prdata_len = state->rdata_len;
+	return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -896,199 +1311,251 @@ static bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
 
  ****************************************************************************/
 
-static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
-			prs_struct *data, /* Outgoing pdu fragment, already formatted for send. */
-			prs_struct *rbuf, /* Incoming reply - return as an NDR stream. */
-			uint8 expected_pkt_type)
+struct rpc_api_pipe_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	uint8_t expected_pkt_type;
+
+	prs_struct incoming_frag;
+	struct rpc_hdr_info rhdr;
+
+	prs_struct incoming_pdu;	/* Incoming reply */
+	uint32_t incoming_pdu_offset;
+};
+
+static int rpc_api_pipe_state_destructor(struct rpc_api_pipe_state *state)
 {
-	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-	char *rparam = NULL;
-	uint32 rparam_len = 0;
-	char *pdata = prs_data_p(data);
-	uint32 data_len = prs_offset(data);
-	char *prdata = NULL;
-	uint32 rdata_len = 0;
-	uint32 max_data = cli->max_xmit_frag ? cli->max_xmit_frag : RPC_MAX_PDU_FRAG_LEN;
-	uint32 current_rbuf_offset = 0;
-	prs_struct current_pdu;
+	prs_mem_free(&state->incoming_frag);
+	prs_mem_free(&state->incoming_pdu);
+	return 0;
+}
 
-#ifdef DEVELOPER
-	/* Ensure we're not sending too much. */
-	SMB_ASSERT(data_len <= max_data);
-#endif
+static void rpc_api_pipe_trans_done(struct async_req *subreq);
+static void rpc_api_pipe_got_pdu(struct async_req *subreq);
 
-	/* Set up the current pdu parse struct. */
-	prs_init_empty(&current_pdu, prs_get_mem_context(rbuf), UNMARSHALL);
+static struct async_req *rpc_api_pipe_send(TALLOC_CTX *mem_ctx,
+					   struct event_context *ev,
+					   struct rpc_pipe_client *cli,
+					   prs_struct *data, /* Outgoing PDU */
+					   uint8_t expected_pkt_type)
+{
+	struct async_req *result, *subreq;
+	struct rpc_api_pipe_state *state;
+	uint16_t max_recv_frag;
+	NTSTATUS status;
 
-	DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct rpc_api_pipe_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->expected_pkt_type = expected_pkt_type;
+	state->incoming_pdu_offset = 0;
 
-	switch (cli->transport_type) {
-	case NCACN_NP: {
-		uint16 setup[2];
-		/* Create setup parameters - must be in native byte order. */
-		setup[0] = TRANSACT_DCERPCCMD;
-		setup[1] = cli->trans.np.fnum; /* Pipe file handle. */
+	prs_init_empty(&state->incoming_frag, state, UNMARSHALL);
 
-		/*
-		 * Send the last (or only) fragment of an RPC request. For
-		 * small amounts of data (about 1024 bytes or so) the RPC
-		 * request and response appears in a SMBtrans request and
-		 * response.
-		 */
+	prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+	/* Make incoming_pdu dynamic with no memory. */
+	prs_give_memory(&state->incoming_pdu, 0, 0, true);
 
-		if (!cli_api_pipe(cli->trans.np.cli, "\\PIPE\\",
-				  setup, 2, 0,     /* Setup, length, max */
-				  NULL, 0, 0,      /* Params, length, max */
-				  pdata, data_len, max_data, /* data, length,
-							      * max */
-				  &rparam, &rparam_len, /* return params,
-							 * len */
-				  &prdata, &rdata_len)) /* return data, len */
-		{
-			DEBUG(0, ("rpc_api_pipe: %s returned critical error. "
-				  "Error was %s\n",
-				  rpccli_pipe_txt(debug_ctx(), cli),
-				  cli_errstr(cli->trans.np.cli)));
-			ret = cli_get_nt_error(cli->trans.np.cli);
-			SAFE_FREE(rparam);
-			SAFE_FREE(prdata);
-			goto err;
-		}
-		break;
+	talloc_set_destructor(state, rpc_api_pipe_state_destructor);
+
+	/*
+	 * Ensure we're not sending too much.
+	 */
+	if (prs_offset(data) > cli->max_xmit_frag) {
+		status = NT_STATUS_INVALID_PARAMETER;
+		goto post_status;
 	}
-	case NCACN_IP_TCP:
-	case NCACN_UNIX_STREAM:
-	{
-		ssize_t nwritten, nread;
-		nwritten = write_data(cli->trans.sock.fd, pdata, data_len);
-		if (nwritten == -1) {
-			ret = map_nt_error_from_unix(errno);
-			DEBUG(0, ("rpc_api_pipe: write_data returned %s\n",
-				  strerror(errno)));
-			goto err;
-		}
-		rparam = NULL;
-		prdata = SMB_MALLOC_ARRAY(char, 1);
-		if (prdata == NULL) {
-			return NT_STATUS_NO_MEMORY;
-		}
-		nread = sys_read(cli->trans.sock.fd, prdata, 1);
-		if (nread == 0) {
-			SAFE_FREE(prdata);
-		}
-		if (nread == -1) {
-			ret = NT_STATUS_END_OF_FILE;
-			goto err;
-		}
-		rdata_len = nread;
-		break;
+
+	DEBUG(5,("rpc_api_pipe: %s\n", rpccli_pipe_txt(debug_ctx(), cli)));
+
+	max_recv_frag = cli->max_recv_frag;
+
+#ifdef DEVELOPER
+	max_recv_frag = RPC_HEADER_LEN + 10 + (sys_random() % 32);
+#endif
+
+	subreq = cli_api_pipe_send(state, ev, cli, (uint8_t *)prs_data_p(data),
+				   prs_offset(data), max_recv_frag);
+	if (subreq == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto post_status;
 	}
-	default:
-		DEBUG(0, ("unknown transport type %d\n",
-			  cli->transport_type));
-		return NT_STATUS_INTERNAL_ERROR;
+	subreq->async.fn = rpc_api_pipe_trans_done;
+	subreq->async.priv = result;
+	return result;
+
+ post_status:
+	if (async_post_status(result, ev, status)) {
+		return result;
 	}
+	TALLOC_FREE(result);
+	return NULL;
+}
 
-	/* Throw away returned params - we know we won't use them. */
+static void rpc_api_pipe_trans_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_state);
+	NTSTATUS status;
+	uint8_t *rdata = NULL;
+	uint32_t rdata_len = 0;
+	char *rdata_copy;
 
-	SAFE_FREE(rparam);
+	status = cli_api_pipe_recv(subreq, state, &rdata, &rdata_len);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(5, ("cli_api_pipe failed: %s\n", nt_errstr(status)));
+		async_req_error(req, status);
+		return;
+	}
 
-	if (prdata == NULL) {
+	if (rdata == NULL) {
 		DEBUG(3,("rpc_api_pipe: %s failed to return data.\n",
-			 rpccli_pipe_txt(debug_ctx(), cli)));
-		/* Yes - some calls can truely return no data... */
-		prs_mem_free(&current_pdu);
-		return NT_STATUS_OK;
+			 rpccli_pipe_txt(debug_ctx(), state->cli)));
+		async_req_done(req);
+		return;
 	}
 
 	/*
-	 * Give this memory as dynamic to the current pdu.
+	 * Give the memory received from cli_trans as dynamic to the current
+	 * pdu. Duplicating it sucks, but prs_struct doesn't know about talloc
+	 * :-(
 	 */
+	rdata_copy = (char *)memdup(rdata, rdata_len);
+	TALLOC_FREE(rdata);
+	if (async_req_nomem(rdata_copy, req)) {
+		return;
+	}
+	prs_give_memory(&state->incoming_frag, rdata_copy, rdata_len, true);
 
-	prs_give_memory(&current_pdu, prdata, rdata_len, True);
-
-	/* Ensure we can mess with the return prs_struct. */
-	SMB_ASSERT(UNMARSHALLING(rbuf));
-	SMB_ASSERT(prs_data_size(rbuf) == 0);
+	/* Ensure we have enough data for a pdu. */
+	subreq = get_complete_frag_send(state, state->ev, state->cli,
+					&state->rhdr, &state->incoming_frag);
+	if (async_req_nomem(subreq, req)) {
+		return;
+	}
+	subreq->async.fn = rpc_api_pipe_got_pdu;
+	subreq->async.priv = req;
+}
 
-	/* Make rbuf dynamic with no memory. */
-	prs_give_memory(rbuf, 0, 0, True);
+static void rpc_api_pipe_got_pdu(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_state);
+	NTSTATUS status;
+	char *rdata = NULL;
+	uint32_t rdata_len = 0;
 
-	while(1) {
-		RPC_HDR rhdr;
-		char *ret_data = NULL;
-		uint32 ret_data_len = 0;
+	status = get_complete_frag_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(5, ("get_complete_frag failed: %s\n",
+			  nt_errstr(status)));
+		async_req_error(req, status);
+		return;
+	}
 
-		/* Ensure we have enough data for a pdu. */
-		ret = cli_pipe_get_current_pdu(cli, &rhdr, &current_pdu);
-		if (!NT_STATUS_IS_OK(ret)) {
-			goto err;
-		}
+	status = cli_pipe_validate_current_pdu(
+		state->cli, &state->rhdr, &state->incoming_frag,
+		state->expected_pkt_type, &rdata, &rdata_len,
+		&state->incoming_pdu);
 
-		/* We pass in rbuf here so if the alloc hint is set correctly 
-		   we can set the output size and avoid reallocs. */
+	DEBUG(10,("rpc_api_pipe: got frag len of %u at offset %u: %s\n",
+		  (unsigned)prs_data_size(&state->incoming_frag),
+		  (unsigned)state->incoming_pdu_offset,
+		  nt_errstr(status)));
 
-		ret = cli_pipe_validate_current_pdu(cli, &rhdr, &current_pdu, expected_pkt_type,
-				&ret_data, &ret_data_len, rbuf);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
 
-		DEBUG(10,("rpc_api_pipe: got PDU len of %u at offset %u\n",
-			prs_data_size(&current_pdu), current_rbuf_offset ));
+	if ((state->rhdr.flags & RPC_FLG_FIRST)
+	    && (state->rhdr.pack_type[0] == 0)) {
+		/*
+		 * Set the data type correctly for big-endian data on the
+		 * first packet.
+		 */
+		DEBUG(10,("rpc_api_pipe: On %s PDU data format is "
+			  "big-endian.\n",
+			  rpccli_pipe_txt(debug_ctx(), state->cli)));
+		prs_set_endian_data(&state->incoming_pdu, RPC_BIG_ENDIAN);
+	}
+	/*
+	 * Check endianness on subsequent packets.
+	 */
+	if (state->incoming_frag.bigendian_data
+	    != state->incoming_pdu.bigendian_data) {
+		DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to "
+			 "%s\n",
+			 state->incoming_pdu.bigendian_data?"big":"little",
+			 state->incoming_frag.bigendian_data?"big":"little"));
+		async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+		return;
+	}
 
-		if (!NT_STATUS_IS_OK(ret)) {
-			goto err;
-		}
+	/* Now copy the data portion out of the pdu into rbuf. */
+	if (!prs_force_grow(&state->incoming_pdu, rdata_len)) {
+		async_req_error(req, NT_STATUS_NO_MEMORY);
+		return;
+	}
 
-		if ((rhdr.flags & RPC_FLG_FIRST)) {
-			if (rhdr.pack_type[0] == 0) {
-				/* Set the data type correctly for big-endian data on the first packet. */
-				DEBUG(10,("rpc_api_pipe: On %s "
-					"PDU data format is big-endian.\n",
-					rpccli_pipe_txt(debug_ctx(), cli)));
+	memcpy(prs_data_p(&state->incoming_pdu) + state->incoming_pdu_offset,
+	       rdata, (size_t)rdata_len);
+	state->incoming_pdu_offset += rdata_len;
 
-				prs_set_endian_data(rbuf, RPC_BIG_ENDIAN);
-			} else {
-				/* Check endianness on subsequent packets. */
-				if (current_pdu.bigendian_data != rbuf->bigendian_data) {
-					DEBUG(0,("rpc_api_pipe: Error : Endianness changed from %s to %s\n",
-						rbuf->bigendian_data ? "big" : "little",
-						current_pdu.bigendian_data ? "big" : "little" ));
-					ret = NT_STATUS_INVALID_PARAMETER;
-					goto err;
-				}
-			}
-		}
+	status = cli_pipe_reset_current_pdu(state->cli, &state->rhdr,
+					    &state->incoming_frag);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
 
-		/* Now copy the data portion out of the pdu into rbuf. */
-		if (!prs_force_grow(rbuf, ret_data_len)) {
-                        ret = NT_STATUS_NO_MEMORY;
-                        goto err;
-                }
-		memcpy(prs_data_p(rbuf)+current_rbuf_offset, ret_data, (size_t)ret_data_len);
-		current_rbuf_offset += ret_data_len;
-
-		/* See if we've finished with all the data in current_pdu yet ? */
-		ret = cli_pipe_reset_current_pdu(cli, &rhdr, &current_pdu);
-		if (!NT_STATUS_IS_OK(ret)) {
-			goto err;
-		}
+	if (state->rhdr.flags & RPC_FLG_LAST) {
+		DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
+			  rpccli_pipe_txt(debug_ctx(), state->cli),
+			  (unsigned)prs_data_size(&state->incoming_pdu)));
+		async_req_done(req);
+		return;
+	}
 
-		if (rhdr.flags & RPC_FLG_LAST) {
-			break; /* We're done. */
-		}
+	subreq = get_complete_frag_send(state, state->ev, state->cli,
+					&state->rhdr, &state->incoming_frag);
+	if (async_req_nomem(subreq, req)) {
+		return;
 	}
+	subreq->async.fn = rpc_api_pipe_got_pdu;
+	subreq->async.priv = req;
+}
 
-	DEBUG(10,("rpc_api_pipe: %s returned %u bytes.\n",
-		rpccli_pipe_txt(debug_ctx(), cli),
-		(unsigned int)prs_data_size(rbuf) ));
+static NTSTATUS rpc_api_pipe_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+				  prs_struct *reply_pdu)
+{
+	struct rpc_api_pipe_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_state);
+	NTSTATUS status;
 
-	prs_mem_free(&current_pdu);
-	return NT_STATUS_OK;
+	if (async_req_is_error(req, &status)) {
+		return status;
+	}
 
-  err:
+	*reply_pdu = state->incoming_pdu;
+	reply_pdu->mem_ctx = mem_ctx;
 
-	prs_mem_free(&current_pdu);
-	prs_mem_free(rbuf);
-	return ret;
+	/*
+	 * Prevent state->incoming_pdu from being freed in
+	 * rpc_api_pipe_state_destructor()
+	 */
+	prs_init_empty(&state->incoming_pdu, state, UNMARSHALL);
+
+	return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -1591,6 +2058,12 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
 {
 	uint32 data_space, data_len;
 
+#ifdef DEVELOPER
+	if ((data_left > 0) && (sys_random() % 2)) {
+		data_left = MAX(data_left/2, 1);
+	}
+#endif
+
 	switch (cli->auth->auth_level) {
 		case PIPE_AUTH_LEVEL_NONE:
 		case PIPE_AUTH_LEVEL_CONNECT:
@@ -1621,6 +2094,7 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
 						RPC_HDR_AUTH_LEN - *p_auth_len;
 
 			data_len = MIN(data_space, data_left);
+			*p_ss_padding = 0;
 			if (data_len % 8) {
 				*p_ss_padding = 8 - (data_len % 8);
 			}
@@ -1643,170 +2117,302 @@ static uint32 calculate_data_len_tosend(struct rpc_pipe_client *cli,
  and deals with signing/sealing details.
  ********************************************************************/
 
-NTSTATUS rpc_api_pipe_req(struct rpc_pipe_client *cli,
-			uint8 op_num,
-			prs_struct *in_data,
-			prs_struct *out_data)
+struct rpc_api_pipe_req_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	uint8_t op_num;
+	uint32_t call_id;
+	prs_struct *req_data;
+	uint32_t req_data_sent;
+	prs_struct outgoing_frag;
+	prs_struct reply_pdu;
+};
+
+static int rpc_api_pipe_req_state_destructor(struct rpc_api_pipe_req_state *s)
 {
-	NTSTATUS ret;
-	uint32 data_left = prs_offset(in_data);
-	uint32 alloc_hint = prs_offset(in_data);
-	uint32 data_sent_thistime = 0;
-	uint32 current_data_offset = 0;
-	uint32 call_id = get_rpc_call_id();
-	char pad[8];
-	prs_struct outgoing_pdu;
+	prs_mem_free(&s->outgoing_frag);
+	prs_mem_free(&s->reply_pdu);
+	return 0;
+}
 
-	memset(pad, '\0', 8);
+static void rpc_api_pipe_req_write_done(struct async_req *subreq);
+static void rpc_api_pipe_req_done(struct async_req *subreq);
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+				  bool *is_last_frag);
 
-	if (cli->max_xmit_frag < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
+struct async_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
+					struct event_context *ev,
+					struct rpc_pipe_client *cli,
+					uint8_t op_num,
+					prs_struct *req_data)
+{
+	struct async_req *result, *subreq;
+	struct rpc_api_pipe_req_state *state;
+	NTSTATUS status;
+	bool is_last_frag;
+
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct rpc_api_pipe_req_state)) {
+		return NULL;
+	}
+	state->ev = ev;
+	state->cli = cli;
+	state->op_num = op_num;
+	state->req_data = req_data;
+	state->req_data_sent = 0;
+	state->call_id = get_rpc_call_id();
+
+	if (cli->max_xmit_frag
+	    < RPC_HEADER_LEN + RPC_HDR_REQ_LEN + RPC_MAX_SIGN_SIZE) {
 		/* Server is screwed up ! */
-		return NT_STATUS_INVALID_PARAMETER;
+		status = NT_STATUS_INVALID_PARAMETER;
+		goto post_status;
 	}
 
-	if (!prs_init(&outgoing_pdu, cli->max_xmit_frag, prs_get_mem_context(in_data), MARSHALL))
-		return NT_STATUS_NO_MEMORY;
+	prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
 
-	while (1) {
-		RPC_HDR hdr;
-		RPC_HDR_REQ hdr_req;
-		uint16 auth_len = 0;
-		uint16 frag_len = 0;
-		uint8 flags = 0;
-		uint32 ss_padding = 0;
-		ssize_t num_written;
+	if (!prs_init(&state->outgoing_frag, cli->max_xmit_frag,
+		      state, MARSHALL)) {
+		status = NT_STATUS_NO_MEMORY;
+		goto post_status;
+	}
 
-		data_sent_thistime = calculate_data_len_tosend(cli, data_left,
-						&frag_len, &auth_len, &ss_padding);
+	talloc_set_destructor(state, rpc_api_pipe_req_state_destructor);
 
-		if (current_data_offset == 0) {
-			flags = RPC_FLG_FIRST;
-		}
+	status = prepare_next_frag(state, &is_last_frag);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto post_status;
+	}
 
-		if (data_sent_thistime == data_left) {
-			flags |= RPC_FLG_LAST;
+	if (is_last_frag) {
+		subreq = rpc_api_pipe_send(state, ev, state->cli,
+					   &state->outgoing_frag,
+					   RPC_RESPONSE);
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
+		}
+		subreq->async.fn = rpc_api_pipe_req_done;
+		subreq->async.priv = result;
+	} else {
+		subreq = rpc_write_send(state, ev, cli,
+					prs_data_p(&state->outgoing_frag),
+					prs_offset(&state->outgoing_frag));
+		if (subreq == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto post_status;
 		}
+		subreq->async.fn = rpc_api_pipe_req_write_done;
+		subreq->async.priv = result;
+	}
+	return result;
 
-		/* Create and marshall the header and request header. */
-		init_rpc_hdr(&hdr, RPC_REQUEST, flags, call_id, frag_len, auth_len);
+ post_status:
+	if (async_post_status(result, ev, status)) {
+		return result;
+	}
+	TALLOC_FREE(result);
+	return NULL;
+}
 
-		if(!smb_io_rpc_hdr("hdr    ", &hdr, &outgoing_pdu, 0)) {
-			prs_mem_free(&outgoing_pdu);
-			return NT_STATUS_NO_MEMORY;
-		}
+static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+				  bool *is_last_frag)
+{
+	RPC_HDR hdr;
+	RPC_HDR_REQ hdr_req;
+	uint32_t data_sent_thistime;
+	uint16_t auth_len;
+	uint16_t frag_len;
+	uint8_t flags = 0;
+	uint32_t ss_padding;
+	uint32_t data_left;
+	char pad[8] = { 0, };
+	NTSTATUS status;
 
-		/* Create the rpc request RPC_HDR_REQ */
-		init_rpc_hdr_req(&hdr_req, alloc_hint, op_num);
+	data_left = prs_offset(state->req_data) - state->req_data_sent;
 
-		if(!smb_io_rpc_hdr_req("hdr_req", &hdr_req, &outgoing_pdu, 0)) {
-			prs_mem_free(&outgoing_pdu);
-			return NT_STATUS_NO_MEMORY;
-		}
+	data_sent_thistime = calculate_data_len_tosend(
+		state->cli, data_left, &frag_len, &auth_len, &ss_padding);
 
-		/* Copy in the data, plus any ss padding. */
-		if (!prs_append_some_prs_data(&outgoing_pdu, in_data, current_data_offset, data_sent_thistime)) {
-			prs_mem_free(&outgoing_pdu);
-			return NT_STATUS_NO_MEMORY;
-		}
+	if (state->req_data_sent == 0) {
+		flags = RPC_FLG_FIRST;
+	}
 
-		/* Copy the sign/seal padding data. */
-		if (ss_padding) {
-			if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding)) {
-				prs_mem_free(&outgoing_pdu);
-				return NT_STATUS_NO_MEMORY;
-			}
-		}
+	if (data_sent_thistime == data_left) {
+		flags |= RPC_FLG_LAST;
+	}
 
-		/* Generate any auth sign/seal and add the auth footer. */
-		if (auth_len) {
-			switch (cli->auth->auth_type) {
-				case PIPE_AUTH_TYPE_NONE:
-					break;
-				case PIPE_AUTH_TYPE_NTLMSSP:
-				case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-					ret = add_ntlmssp_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-					if (!NT_STATUS_IS_OK(ret)) {
-						prs_mem_free(&outgoing_pdu);
-						return ret;
-					}
-					break;
-				case PIPE_AUTH_TYPE_SCHANNEL:
-					ret = add_schannel_auth_footer(cli, &hdr, ss_padding, &outgoing_pdu);
-					if (!NT_STATUS_IS_OK(ret)) {
-						prs_mem_free(&outgoing_pdu);
-						return ret;
-					}
-					break;
-				default:
-					smb_panic("bad auth type");
-					break; /* notreached */
-			}
-		}
+	if (!prs_set_offset(&state->outgoing_frag, 0)) {
+		return NT_STATUS_NO_MEMORY;
+	}
 
-		/* Actually send the packet. */
-		if (flags & RPC_FLG_LAST) {
-			/* Last packet - send the data, get the reply and return. */
-			ret = rpc_api_pipe(cli, &outgoing_pdu, out_data, RPC_RESPONSE);
-			prs_mem_free(&outgoing_pdu);
-
-			if ((DEBUGLEVEL >= 50)
-			    && (cli->transport_type == NCACN_NP)) {
-				char *dump_name = NULL;
-				/* Also capture received data */
-				if (asprintf(&dump_name, "%s/reply_%s_%d",
-					     get_dyn_LOGFILEBASE(),
-					     cli->trans.np.pipe_name, op_num) > 0) {
-					prs_dump(dump_name, op_num, out_data);
-					SAFE_FREE(dump_name);
-				}
-			}
+	/* Create and marshall the header and request header. */
+	init_rpc_hdr(&hdr, RPC_REQUEST, flags, state->call_id, frag_len,
+		     auth_len);
 
-			return ret;
-		}
+	if (!smb_io_rpc_hdr("hdr    ", &hdr, &state->outgoing_frag, 0)) {
+		return NT_STATUS_NO_MEMORY;
+	}
 
-		switch (cli->transport_type) {
-		case NCACN_NP:
-			num_written = cli_write(cli->trans.np.cli,
-						cli->trans.np.fnum,
-						8, /* 8 means message mode. */
-						prs_data_p(&outgoing_pdu),
-						(off_t)0,
-						(size_t)hdr.frag_len);
-
-			if (num_written != hdr.frag_len) {
-				prs_mem_free(&outgoing_pdu);
-				return cli_get_nt_error(cli->trans.np.cli);
-			}
-			break;
-		case NCACN_IP_TCP:
-		case NCACN_UNIX_STREAM:
-			num_written = write_data(
-				cli->trans.sock.fd,
-				prs_data_p(&outgoing_pdu),
-				(size_t)hdr.frag_len);
-			if (num_written != hdr.frag_len) {
-				NTSTATUS status;
-				status = map_nt_error_from_unix(errno);
-				prs_mem_free(&outgoing_pdu);
-				return status;
-			}
-			break;
-		default:
-			DEBUG(0, ("unknown transport type %d\n",
-				  cli->transport_type));
-			return NT_STATUS_INTERNAL_ERROR;
-		}
+	/* Create the rpc request RPC_HDR_REQ */
+	init_rpc_hdr_req(&hdr_req, prs_offset(state->req_data),
+			 state->op_num);
 
-		current_data_offset += data_sent_thistime;
-		data_left -= data_sent_thistime;
+	if (!smb_io_rpc_hdr_req("hdr_req", &hdr_req,
+				&state->outgoing_frag, 0)) {
+		return NT_STATUS_NO_MEMORY;
+	}
 
-		/* Reset the marshalling position back to zero. */
-		if (!prs_set_offset(&outgoing_pdu, 0)) {
-			prs_mem_free(&outgoing_pdu);
-			return NT_STATUS_NO_MEMORY;
+	/* Copy in the data, plus any ss padding. */
+	if (!prs_append_some_prs_data(&state->outgoing_frag,
+				      state->req_data, state->req_data_sent,
+				      data_sent_thistime)) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	/* Copy the sign/seal padding data. */
+	if (!prs_copy_data_in(&state->outgoing_frag, pad, ss_padding)) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	/* Generate any auth sign/seal and add the auth footer. */
+	switch (state->cli->auth->auth_type) {
+	case PIPE_AUTH_TYPE_NONE:
+		status = NT_STATUS_OK;
+		break;
+	case PIPE_AUTH_TYPE_NTLMSSP:
+	case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+		status = add_ntlmssp_auth_footer(state->cli, &hdr, ss_padding,
+						 &state->outgoing_frag);
+		break;
+	case PIPE_AUTH_TYPE_SCHANNEL:
+		status = add_schannel_auth_footer(state->cli, &hdr, ss_padding,
+						  &state->outgoing_frag);
+		break;
+	default:
+		status = NT_STATUS_INVALID_PARAMETER;
+		break;
+	}
+
+	state->req_data_sent += data_sent_thistime;
+	*is_last_frag = ((flags & RPC_FLG_LAST) != 0);
+
+	return status;
+}
+
+static void rpc_api_pipe_req_write_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_req_state);
+	NTSTATUS status;
+	bool is_last_frag;
+
+	status = rpc_write_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	status = prepare_next_frag(state, &is_last_frag);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+
+	if (is_last_frag) {
+		subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+					   &state->outgoing_frag,
+					   RPC_RESPONSE);
+		if (async_req_nomem(subreq, req)) {
+			return;
+		}
+		subreq->async.fn = rpc_api_pipe_req_done;
+		subreq->async.priv = req;
+	} else {
+		subreq = rpc_write_send(state, state->ev, state->cli,
+					prs_data_p(&state->outgoing_frag),
+					prs_offset(&state->outgoing_frag));
+		if (async_req_nomem(subreq, req)) {
+			return;
 		}
+		subreq->async.fn = rpc_api_pipe_req_write_done;
+		subreq->async.priv = req;
 	}
 }
+
+static void rpc_api_pipe_req_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_req_state);
+	NTSTATUS status;
+
+	status = rpc_api_pipe_recv(subreq, state, &state->reply_pdu);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+	async_req_done(req);
+}
+
+NTSTATUS rpc_api_pipe_req_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+			       prs_struct *reply_pdu)
+{
+	struct rpc_api_pipe_req_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_api_pipe_req_state);
+	NTSTATUS status;
+
+	if (async_req_is_error(req, &status)) {
+		return status;
+	}
+
+	*reply_pdu = state->reply_pdu;
+	reply_pdu->mem_ctx = mem_ctx;
+
+	/*
+	 * Prevent state->req_pdu from being freed in
+	 * rpc_api_pipe_req_state_destructor()
+	 */
+	prs_init_empty(&state->reply_pdu, state, UNMARSHALL);
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS rpc_api_pipe_req(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *cli,
+			uint8 op_num,
+			prs_struct *in_data,
+			prs_struct *out_data)
+{
+	TALLOC_CTX *frame = talloc_stackframe();
+	struct event_context *ev;
+	struct async_req *req;
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+	ev = event_context_init(frame);
+	if (ev == NULL) {
+		goto fail;
+	}
+
+	req = rpc_api_pipe_req_send(frame, ev, cli, op_num, in_data);
+	if (req == NULL) {
+		goto fail;
+	}
+
+	while (req->state < ASYNC_REQ_DONE) {
+		event_loop_once(ev);
+	}
+
+	status = rpc_api_pipe_req_recv(req, mem_ctx, out_data);
+ fail:
+	TALLOC_FREE(frame);
+	return status;
+}
+
 #if 0
 /****************************************************************************
  Set the handle state.
@@ -1942,107 +2548,6 @@ static NTSTATUS create_rpc_bind_auth3(struct rpc_pipe_client *cli,
 	return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Create and send the third packet in an RPC auth.
-****************************************************************************/
-
-static NTSTATUS rpc_finish_auth3_bind(struct rpc_pipe_client *cli,
-				RPC_HDR *phdr,
-				prs_struct *rbuf,
-				uint32 rpc_call_id,
-				enum pipe_auth_type auth_type,
-				enum pipe_auth_level auth_level)
-{
-	DATA_BLOB server_response = data_blob_null;
-	DATA_BLOB client_reply = data_blob_null;
-	RPC_HDR_AUTH hdr_auth;
-	NTSTATUS nt_status;
-	prs_struct rpc_out;
-	ssize_t ret;
-
-	if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	/* Process the returned NTLMSSP blob first. */
-	if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	/* TODO - check auth_type/auth_level match. */
-
-	server_response = data_blob(NULL, phdr->auth_len);
-	prs_copy_data_out((char *)server_response.data, rbuf, phdr->auth_len);
-
-	nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-				   server_response,
-				   &client_reply);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(0,("rpc_finish_auth3_bind: NTLMSSP update using server blob failed.\n"));
-		data_blob_free(&server_response);
-		return nt_status;
-	}
-
-	prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
-
-	nt_status = create_rpc_bind_auth3(cli, rpc_call_id,
-				auth_type, auth_level,
-				&client_reply, &rpc_out);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		prs_mem_free(&rpc_out);
-		data_blob_free(&client_reply);
-		data_blob_free(&server_response);
-		return nt_status;
-	}
-
-	switch (cli->transport_type) {
-	case NCACN_NP:
-		/* 8 here is named pipe message mode. */
-		ret = cli_write(cli->trans.np.cli, cli->trans.np.fnum,
-				0x8, prs_data_p(&rpc_out), 0,
-				(size_t)prs_offset(&rpc_out));
-		break;
-
-		if (ret != (ssize_t)prs_offset(&rpc_out)) {
-			nt_status = cli_get_nt_error(cli->trans.np.cli);
-		}
-	case NCACN_IP_TCP:
-	case NCACN_UNIX_STREAM:
-		ret = write_data(cli->trans.sock.fd, prs_data_p(&rpc_out),
-				 (size_t)prs_offset(&rpc_out));
-		if (ret != (ssize_t)prs_offset(&rpc_out)) {
-			nt_status = map_nt_error_from_unix(errno);
-		}
-		break;
-	default:
-		DEBUG(0, ("unknown transport type %d\n", cli->transport_type));
-		return NT_STATUS_INTERNAL_ERROR;
-	}
-
-	if (ret != (ssize_t)prs_offset(&rpc_out)) {
-		DEBUG(0,("rpc_send_auth_auth3: write failed. Return was %s\n",
-			 nt_errstr(nt_status)));
-		prs_mem_free(&rpc_out);
-		data_blob_free(&client_reply);
-		data_blob_free(&server_response);
-		return nt_status;
-	}
-
-	DEBUG(5,("rpc_send_auth_auth3: %s sent auth3 response ok.\n",
-		 rpccli_pipe_txt(debug_ctx(), cli)));
-
-	prs_mem_free(&rpc_out);
-	data_blob_free(&client_reply);
-	data_blob_free(&server_response);
-	return NT_STATUS_OK;
-}
-
 /*******************************************************************
  Creates a DCE/RPC bind alter context authentication request which
  may contain a spnego auth blobl
@@ -2084,46 +2589,295 @@ static NTSTATUS create_rpc_alter_context(uint32 rpc_call_id,
 	return ret;
 }
 
-/*******************************************************************
- Third leg of the SPNEGO bind mechanism - sends alter context PDU
- and gets a response.
- ********************************************************************/
+/****************************************************************************
+ Do an rpc bind.
+****************************************************************************/
 
-static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
-                                RPC_HDR *phdr,
-                                prs_struct *rbuf,
-                                uint32 rpc_call_id,
-				const RPC_IFACE *abstract,
-				const RPC_IFACE *transfer,
-                                enum pipe_auth_type auth_type,
-                                enum pipe_auth_level auth_level)
+struct rpc_pipe_bind_state {
+	struct event_context *ev;
+	struct rpc_pipe_client *cli;
+	prs_struct rpc_out;
+	uint32_t rpc_call_id;
+};
+
+static int rpc_pipe_bind_state_destructor(struct rpc_pipe_bind_state *state)
+{
+	prs_mem_free(&state->rpc_out);
+	return 0;
+}
+
+static void rpc_pipe_bind_step_one_done(struct async_req *subreq);
+static NTSTATUS rpc_finish_auth3_bind_send(struct async_req *req,
+					   struct rpc_pipe_bind_state *state,
+					   struct rpc_hdr_info *phdr,
+					   prs_struct *reply_pdu);
+static void rpc_bind_auth3_write_done(struct async_req *subreq);
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct async_req *req,
+						    struct rpc_pipe_bind_state *state,
+						    struct rpc_hdr_info *phdr,
+						    prs_struct *reply_pdu);
+static void rpc_bind_ntlmssp_api_done(struct async_req *subreq);
+
+struct async_req *rpc_pipe_bind_send(TALLOC_CTX *mem_ctx,
+				     struct event_context *ev,
+				     struct rpc_pipe_client *cli,
+				     struct cli_pipe_auth_data *auth)
+{
+	struct async_req *result, *subreq;
+	struct rpc_pipe_bind_state *state;
+	NTSTATUS status;
+
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct rpc_pipe_bind_state)) {
+		return NULL;
+	}
+
+	DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
+		rpccli_pipe_txt(debug_ctx(), cli),
+		(unsigned int)auth->auth_type,
+		(unsigned int)auth->auth_level ));
+
+	state->ev = ev;
+	state->cli = cli;
+	state->rpc_call_id = get_rpc_call_id();
+
+	prs_init_empty(&state->rpc_out, state, MARSHALL);
+	talloc_set_destructor(state, rpc_pipe_bind_state_destructor);
+
+	cli->auth = talloc_move(cli, &auth);
+
+	/* Marshall the outgoing data. */
+	status = create_rpc_bind_req(cli, &state->rpc_out,
+				     state->rpc_call_id,
+				     &cli->abstract_syntax,
+				     &cli->transfer_syntax,
+				     cli->auth->auth_type,
+				     cli->auth->auth_level);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		goto post_status;
+	}
+
+	subreq = rpc_api_pipe_send(state, ev, cli, &state->rpc_out,
+				   RPC_BINDACK);
+	if (subreq == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto post_status;
+	}
+	subreq->async.fn = rpc_pipe_bind_step_one_done;
+	subreq->async.priv = result;
+	return result;
+
+ post_status:
+	if (async_post_status(result, ev, status)) {
+		return result;
+	}
+	TALLOC_FREE(result);
+	return NULL;
+}
+
+static void rpc_pipe_bind_step_one_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_pipe_bind_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_pipe_bind_state);
+	prs_struct reply_pdu;
+	struct rpc_hdr_info hdr;
+	struct rpc_hdr_ba_info hdr_ba;
+	NTSTATUS status;
+
+	status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(3, ("rpc_pipe_bind: %s bind request returned %s\n",
+			  rpccli_pipe_txt(debug_ctx(), state->cli),
+			  nt_errstr(status)));
+		async_req_error(req, status);
+		return;
+	}
+
+	/* Unmarshall the RPC header */
+	if (!smb_io_rpc_hdr("hdr", &hdr, &reply_pdu, 0)) {
+		DEBUG(0, ("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
+		async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+		return;
+	}
+
+	if (!smb_io_rpc_hdr_ba("", &hdr_ba, &reply_pdu, 0)) {
+		DEBUG(0, ("rpc_pipe_bind: Failed to unmarshall "
+			  "RPC_HDR_BA.\n"));
+		async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+		return;
+	}
+
+	if (!check_bind_response(&hdr_ba, &state->cli->transfer_syntax)) {
+		DEBUG(2, ("rpc_pipe_bind: check_bind_response failed.\n"));
+		async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+		return;
+	}
+
+	state->cli->max_xmit_frag = hdr_ba.bba.max_tsize;
+	state->cli->max_recv_frag = hdr_ba.bba.max_rsize;
+
+	/*
+	 * For authenticated binds we may need to do 3 or 4 leg binds.
+	 */
+
+	switch(state->cli->auth->auth_type) {
+
+	case PIPE_AUTH_TYPE_NONE:
+	case PIPE_AUTH_TYPE_SCHANNEL:
+		/* Bind complete. */
+		async_req_done(req);
+		break;
+
+	case PIPE_AUTH_TYPE_NTLMSSP:
+		/* Need to send AUTH3 packet - no reply. */
+		status = rpc_finish_auth3_bind_send(req, state, &hdr,
+						    &reply_pdu);
+		if (!NT_STATUS_IS_OK(status)) {
+			async_req_error(req, status);
+		}
+		break;
+
+	case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
+		/* Need to send alter context request and reply. */
+		status = rpc_finish_spnego_ntlmssp_bind_send(req, state, &hdr,
+							     &reply_pdu);
+		if (!NT_STATUS_IS_OK(status)) {
+			async_req_error(req, status);
+		}
+		break;
+
+	case PIPE_AUTH_TYPE_KRB5:
+		/* */
+
+	default:
+		DEBUG(0,("cli_finish_bind_auth: unknown auth type %u\n",
+			 (unsigned int)state->cli->auth->auth_type));
+		async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+	}
+}
+
+static NTSTATUS rpc_finish_auth3_bind_send(struct async_req *req,
+					   struct rpc_pipe_bind_state *state,
+					   struct rpc_hdr_info *phdr,
+					   prs_struct *reply_pdu)
+{
+	DATA_BLOB server_response = data_blob_null;
+	DATA_BLOB client_reply = data_blob_null;
+	struct rpc_hdr_auth_info hdr_auth;
+	struct async_req *subreq;
+	NTSTATUS status;
+
+	if ((phdr->auth_len == 0)
+	    || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	if (!prs_set_offset(
+		    reply_pdu,
+		    phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	/* TODO - check auth_type/auth_level match. */
+
+	server_response = data_blob_talloc(talloc_tos(), NULL, phdr->auth_len);
+	prs_copy_data_out((char *)server_response.data, reply_pdu,
+			  phdr->auth_len);
+
+	status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+				server_response, &client_reply);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0, ("rpc_finish_auth3_bind: NTLMSSP update using server "
+			  "blob failed: %s.\n", nt_errstr(status)));
+		return status;
+	}
+
+	prs_init_empty(&state->rpc_out, talloc_tos(), MARSHALL);
+
+	status = create_rpc_bind_auth3(state->cli, state->rpc_call_id,
+				       state->cli->auth->auth_type,
+				       state->cli->auth->auth_level,
+				       &client_reply, &state->rpc_out);
+	data_blob_free(&client_reply);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+
+	subreq = rpc_write_send(state, state->ev, state->cli,
+				prs_data_p(&state->rpc_out),
+				prs_offset(&state->rpc_out));
+	if (subreq == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+	subreq->async.fn = rpc_bind_auth3_write_done;
+	subreq->async.priv = req;
+	return NT_STATUS_OK;
+}
+
+static void rpc_bind_auth3_write_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	NTSTATUS status;
+
+	status = rpc_write_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
+	}
+	async_req_done(req);
+}
+
+static NTSTATUS rpc_finish_spnego_ntlmssp_bind_send(struct async_req *req,
+						    struct rpc_pipe_bind_state *state,
+						    struct rpc_hdr_info *phdr,
+						    prs_struct *reply_pdu)
 {
 	DATA_BLOB server_spnego_response = data_blob_null;
 	DATA_BLOB server_ntlm_response = data_blob_null;
 	DATA_BLOB client_reply = data_blob_null;
 	DATA_BLOB tmp_blob = data_blob_null;
 	RPC_HDR_AUTH hdr_auth;
-	NTSTATUS nt_status;
-	prs_struct rpc_out;
+	struct async_req *subreq;
+	NTSTATUS status;
 
-	if (!phdr->auth_len || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
+	if ((phdr->auth_len == 0)
+	    || (phdr->frag_len < phdr->auth_len + RPC_HDR_AUTH_LEN)) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	/* Process the returned NTLMSSP blob first. */
-	if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
+	if (!prs_set_offset(
+		    reply_pdu,
+		    phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
+	if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, reply_pdu, 0)) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	server_spnego_response = data_blob(NULL, phdr->auth_len);
-	prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+	prs_copy_data_out((char *)server_spnego_response.data,
+			  reply_pdu, phdr->auth_len);
 
-	/* The server might give us back two challenges - tmp_blob is for the second. */
-	if (!spnego_parse_challenge(server_spnego_response, &server_ntlm_response, &tmp_blob)) {
+	/*
+	 * The server might give us back two challenges - tmp_blob is for the
+	 * second.
+	 */
+	if (!spnego_parse_challenge(server_spnego_response,
+				    &server_ntlm_response, &tmp_blob)) {
 		data_blob_free(&server_spnego_response);
 		data_blob_free(&server_ntlm_response);
 		data_blob_free(&tmp_blob);
@@ -2134,220 +2888,142 @@ static NTSTATUS rpc_finish_spnego_ntlmssp_bind(struct rpc_pipe_client *cli,
 	data_blob_free(&server_spnego_response);
 	data_blob_free(&tmp_blob);
 
-	nt_status = ntlmssp_update(cli->auth->a_u.ntlmssp_state,
-				   server_ntlm_response,
-				   &client_reply);
+	status = ntlmssp_update(state->cli->auth->a_u.ntlmssp_state,
+				server_ntlm_response, &client_reply);
 
 	/* Finished with the server_ntlm response */
 	data_blob_free(&server_ntlm_response);
 
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update using server blob failed.\n"));
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: NTLMSSP update "
+			  "using server blob failed.\n"));
 		data_blob_free(&client_reply);
-		return nt_status;
+		return status;
 	}
 
 	/* SPNEGO wrap the client reply. */
 	tmp_blob = spnego_gen_auth(client_reply);
 	data_blob_free(&client_reply);
 	client_reply = tmp_blob;
-	tmp_blob = data_blob_null; /* Ensure it's safe to free this just in case. */
+	tmp_blob = data_blob_null;
 
 	/* Now prepare the alter context pdu. */
-	prs_init_empty(&rpc_out, prs_get_mem_context(rbuf), MARSHALL);
-
-	nt_status = create_rpc_alter_context(rpc_call_id,
-						abstract,
-						transfer,
-						auth_level,
-						&client_reply,
-						&rpc_out);
-
+	prs_init_empty(&state->rpc_out, state, MARSHALL);
+
+	status = create_rpc_alter_context(state->rpc_call_id,
+					  &state->cli->abstract_syntax,
+					  &state->cli->transfer_syntax,
+					  state->cli->auth->auth_level,
+					  &client_reply,
+					  &state->rpc_out);
 	data_blob_free(&client_reply);
 
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		prs_mem_free(&rpc_out);
-		return nt_status;
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
-	/* Initialize the returning data struct. */
-	prs_mem_free(rbuf);
-	prs_init_empty(rbuf, talloc_tos(), UNMARSHALL);
+	subreq = rpc_api_pipe_send(state, state->ev, state->cli,
+				   &state->rpc_out, RPC_ALTCONTRESP);
+	if (subreq == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+	subreq->async.fn = rpc_bind_ntlmssp_api_done;
+	subreq->async.priv = req;
+	return NT_STATUS_OK;
+}
 
-	nt_status = rpc_api_pipe(cli, &rpc_out, rbuf, RPC_ALTCONTRESP);
-	prs_mem_free(&rpc_out);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
+static void rpc_bind_ntlmssp_api_done(struct async_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.priv, struct async_req);
+	struct rpc_pipe_bind_state *state = talloc_get_type_abort(
+		req->private_data, struct rpc_pipe_bind_state);
+	DATA_BLOB server_spnego_response = data_blob_null;
+	DATA_BLOB tmp_blob = data_blob_null;
+	prs_struct reply_pdu;
+	struct rpc_hdr_info hdr;
+	struct rpc_hdr_auth_info hdr_auth;
+	NTSTATUS status;
+
+	status = rpc_api_pipe_recv(subreq, talloc_tos(), &reply_pdu);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		async_req_error(req, status);
+		return;
 	}
 
 	/* Get the auth blob from the reply. */
-	if(!smb_io_rpc_hdr("rpc_hdr   ", phdr, rbuf, 0)) {
-		DEBUG(0,("rpc_finish_spnego_ntlmssp_bind: Failed to unmarshall RPC_HDR.\n"));
-		return NT_STATUS_BUFFER_TOO_SMALL;
+	if (!smb_io_rpc_hdr("rpc_hdr   ", &hdr, &reply_pdu, 0)) {
+		DEBUG(0, ("rpc_finish_spnego_ntlmssp_bind: Failed to "
+			  "unmarshall RPC_HDR.\n"));
+		async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
+		return;
 	}
 
-	if (!prs_set_offset(rbuf, phdr->frag_len - phdr->auth_len - RPC_HDR_AUTH_LEN)) {
-		return NT_STATUS_INVALID_PARAMETER;
+	if (!prs_set_offset(
+		    &reply_pdu,
+		    hdr.frag_len - hdr.auth_len - RPC_HDR_AUTH_LEN)) {
+		async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+		return;
 	}
 
-	if(!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, rbuf, 0)) {
-		return NT_STATUS_INVALID_PARAMETER;
+	if (!smb_io_rpc_hdr_auth("hdr_auth", &hdr_auth, &reply_pdu, 0)) {
+		async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+		return;
 	}
 
-	server_spnego_response = data_blob(NULL, phdr->auth_len);
-	prs_copy_data_out((char *)server_spnego_response.data, rbuf, phdr->auth_len);
+	server_spnego_response = data_blob(NULL, hdr.auth_len);
+	prs_copy_data_out((char *)server_spnego_response.data, &reply_pdu,
+			  hdr.auth_len);
 
 	/* Check we got a valid auth response. */
-	if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK, OID_NTLMSSP, &tmp_blob)) {
+	if (!spnego_parse_auth_response(server_spnego_response, NT_STATUS_OK,
+					OID_NTLMSSP, &tmp_blob)) {
 		data_blob_free(&server_spnego_response);
 		data_blob_free(&tmp_blob);
-		return NT_STATUS_INVALID_PARAMETER;
+		async_req_error(req, NT_STATUS_INVALID_PARAMETER);
+		return;
 	}
 
 	data_blob_free(&server_spnego_response);
 	data_blob_free(&tmp_blob);
 
 	DEBUG(5,("rpc_finish_spnego_ntlmssp_bind: alter context request to "
-		 "%s.\n", rpccli_pipe_txt(debug_ctx(), cli)));
-
-	return NT_STATUS_OK;
+		 "%s.\n", rpccli_pipe_txt(debug_ctx(), state->cli)));
+	async_req_done(req);
 }
 
-/****************************************************************************
- Do an rpc bind.
-****************************************************************************/
+NTSTATUS rpc_pipe_bind_recv(struct async_req *req)
+{
+	return async_req_simple_recv(req);
+}
 
 NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
 		       struct cli_pipe_auth_data *auth)
 {
-	RPC_HDR hdr;
-	RPC_HDR_BA hdr_ba;
-	prs_struct rpc_out;
-	prs_struct rbuf;
-	uint32 rpc_call_id;
-	NTSTATUS status;
-
-	DEBUG(5,("Bind RPC Pipe: %s auth_type %u, auth_level %u\n",
-		rpccli_pipe_txt(debug_ctx(), cli),
-		(unsigned int)auth->auth_type,
-		(unsigned int)auth->auth_level ));
-
-	cli->auth = talloc_move(cli, &auth);
-
-	prs_init_empty(&rpc_out, talloc_tos(), MARSHALL);
-
-	rpc_call_id = get_rpc_call_id();
-
-	/* Marshall the outgoing data. */
-	status = create_rpc_bind_req(cli, &rpc_out, rpc_call_id,
-				&cli->abstract_syntax,
-				&cli->transfer_syntax,
-				cli->auth->auth_type,
-				cli->auth->auth_level);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		prs_mem_free(&rpc_out);
-		return status;
-	}
-
-	/* Initialize the incoming data struct. */
-	prs_init_empty(&rbuf, talloc_tos(), UNMARSHALL);
-
-	/* send data on \PIPE\.  receive a response */
-	status = rpc_api_pipe(cli, &rpc_out, &rbuf, RPC_BINDACK);
-	prs_mem_free(&rpc_out);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	DEBUG(3,("rpc_pipe_bind: %s bind request returned ok.\n",
-		 rpccli_pipe_txt(debug_ctx(), cli)));
-
-	/* Unmarshall the RPC header */
-	if(!smb_io_rpc_hdr("hdr"   , &hdr, &rbuf, 0)) {
-		DEBUG(0,("rpc_pipe_bind: failed to unmarshall RPC_HDR.\n"));
-		prs_mem_free(&rbuf);
-		return NT_STATUS_BUFFER_TOO_SMALL;
-	}
-
-	if(!smb_io_rpc_hdr_ba("", &hdr_ba, &rbuf, 0)) {
-		DEBUG(0,("rpc_pipe_bind: Failed to unmarshall RPC_HDR_BA.\n"));
-		prs_mem_free(&rbuf);
-		return NT_STATUS_BUFFER_TOO_SMALL;
-	}
+	TALLOC_CTX *frame = talloc_stackframe();
+	struct event_context *ev;
+	struct async_req *req;
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-	if(!check_bind_response(&hdr_ba, &cli->transfer_syntax)) {
-		DEBUG(2,("rpc_pipe_bind: check_bind_response failed.\n"));
-		prs_mem_free(&rbuf);
-		return NT_STATUS_BUFFER_TOO_SMALL;
+	ev = event_context_init(frame);
+	if (ev == NULL) {
+		goto fail;
 	}
 
-	cli->max_xmit_frag = hdr_ba.bba.max_tsize;
-	cli->max_recv_frag = hdr_ba.bba.max_rsize;
-
-	/* For authenticated binds we may need to do 3 or 4 leg binds. */
-	switch(cli->auth->auth_type) {
-
-		case PIPE_AUTH_TYPE_NONE:
-		case PIPE_AUTH_TYPE_SCHANNEL:
-			/* Bind complete. */
-			break;
-
-		case PIPE_AUTH_TYPE_NTLMSSP:
-			/* Need to send AUTH3 packet - no reply. */
-			status = rpc_finish_auth3_bind(
-				cli, &hdr, &rbuf, rpc_call_id,
-				cli->auth->auth_type,
-				cli->auth->auth_level);
-			if (!NT_STATUS_IS_OK(status)) {
-				prs_mem_free(&rbuf);
-				return status;
-			}
-			break;
-
-		case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-			/* Need to send alter context request and reply. */
-			status = rpc_finish_spnego_ntlmssp_bind(
-				cli, &hdr, &rbuf, rpc_call_id,
-				&cli->abstract_syntax, &cli->transfer_syntax,
-				cli->auth->auth_type, cli->auth->auth_level);
-			if (!NT_STATUS_IS_OK(status)) {
-				prs_mem_free(&rbuf);
-				return status;
-			}
-			break;
-
-		case PIPE_AUTH_TYPE_KRB5:
-			/* */
-
-		default:
-			DEBUG(0,("cli_finish_bind_auth: unknown auth type "
-				 "%u\n", (unsigned int)cli->auth->auth_type));
-			prs_mem_free(&rbuf);
-			return NT_STATUS_INVALID_INFO_CLASS;
+	req = rpc_pipe_bind_send(frame, ev, cli, auth);
+	if (req == NULL) {
+		goto fail;
 	}
 
-	/* For NTLMSSP ensure the server gave us the auth_level we wanted. */
-	if (cli->auth->auth_type == PIPE_AUTH_TYPE_NTLMSSP
-	    || cli->auth->auth_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
-		if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-			if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-				DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP signing and server refused.\n"));
-				prs_mem_free(&rbuf);
-				return NT_STATUS_INVALID_PARAMETER;
-			}
-		}
-		if (cli->auth->auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
-			if (!(cli->auth->a_u.ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-				DEBUG(0,("cli_finish_bind_auth: requested NTLMSSSP sealing and server refused.\n"));
-				prs_mem_free(&rbuf);
-				return NT_STATUS_INVALID_PARAMETER;
-			}
-		}
+	while (req->state < ASYNC_REQ_DONE) {
+		event_loop_once(ev);
 	}
 
-	prs_mem_free(&rbuf);
-	return NT_STATUS_OK;
+	status = rpc_pipe_bind_recv(req);
+ fail:
+	TALLOC_FREE(frame);
+	return status;
 }
 
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c
index 9ada47a3f5..9c3205eca3 100644
--- a/source3/rpc_client/ndr.c
+++ b/source3/rpc_client/ndr.c
@@ -59,9 +59,7 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
 
 	talloc_free(push);
 
-	prs_init_empty( &r_ps, mem_ctx, UNMARSHALL );
-
-	status = rpc_api_pipe_req(cli, opnum, &q_ps, &r_ps); 
+	status = rpc_api_pipe_req(mem_ctx, cli, opnum, &q_ps, &r_ps);
 
 	prs_mem_free( &q_ps );
 
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index d549265fa1..1332a8311a 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -361,13 +361,10 @@ uint32 prs_offset(prs_struct *ps)
 
 bool prs_set_offset(prs_struct *ps, uint32 offset)
 {
-	if(offset <= ps->data_offset) {
-		ps->data_offset = offset;
-		return True;
-	}
-
-	if(!prs_grow(ps, offset - ps->data_offset))
+	if ((offset > ps->data_offset)
+	    && !prs_grow(ps, offset - ps->data_offset)) {
 		return False;
+	}
 
 	ps->data_offset = offset;
 	return True;
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 9984bf0cfc..5f616ecd19 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1918,6 +1918,7 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 	uint32 reject_reason;
 	struct samr_DomInfo1 *dominfo = NULL;
 	struct samr_ChangeReject *reject = NULL;
+	uint32_t tmp;
 
 	DEBUG(5,("_samr_ChangePasswordUser3: %d\n", __LINE__));
 
@@ -1967,11 +1968,11 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 
 		/* AS ROOT !!! */
 
-		pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
-				       (uint32_t *)&dominfo->min_password_length);
+		pdb_get_account_policy(AP_MIN_PASSWORD_LEN, &tmp);
+		dominfo->min_password_length = tmp;
 
-		pdb_get_account_policy(AP_PASSWORD_HISTORY,
-				       (uint32_t *)&dominfo->password_history_length);
+		pdb_get_account_policy(AP_PASSWORD_HISTORY, &tmp);
+		dominfo->password_history_length = tmp;
 
 		pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
 				       &dominfo->password_properties);
@@ -2833,10 +2834,11 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
 			/* AS ROOT !!! */
 
 			pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
-			       (uint32_t *)&dom_info->info1.min_password_length);
+					       &account_policy_temp);
+			dom_info->info1.min_password_length = account_policy_temp;
 
-			pdb_get_account_policy(AP_PASSWORD_HISTORY,
-				(uint32_t *)&dom_info->info1.password_history_length);
+			pdb_get_account_policy(AP_PASSWORD_HISTORY, &account_policy_temp);
+			dom_info->info1.password_history_length = account_policy_temp;
 
 			pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
 				&dom_info->info1.password_properties);
@@ -2965,7 +2967,8 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
 			u_reset_time = account_policy_temp * 60;
 
 			pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
-				(uint32_t *)&dom_info->info12.lockout_threshold);
+					       &account_policy_temp);
+			dom_info->info12.lockout_threshold = account_policy_temp;
 
 			/* !AS ROOT */