r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the

large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

6 files changed, 21 insertions, 21 deletions

diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c
index c70ed95915..427add0aa2 100644
--- a/source4/smb_server/conn.c
+++ b/source4/smb_server/conn.c
@@ -69,7 +69,7 @@ struct smbsrv_tcon *smbsrv_tcon_new(struct smbsrv_connection *smb_conn)
 	struct smbsrv_tcon *tcon;
 	int i;
 
-	tcon = talloc_zero_p(smb_conn, struct smbsrv_tcon);
+	tcon = talloc_zero(smb_conn, struct smbsrv_tcon);
 	if (!tcon) return NULL;
 
 	i = idr_get_new(smb_conn->tree.idtree_tid, tcon, UINT16_MAX);
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 5875554258..9a3b919d8b 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/nttrans.c
@@ -66,7 +66,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
 	}
 
 	/* parse the request */
-	io = talloc_p(req, union smb_open);
+	io = talloc(req, union smb_open);
 	if (io == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -110,7 +110,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
 		DATA_BLOB blob;
 		blob.data = trans->in.data.data;
 		blob.length = sd_length;
-		io->ntcreatex.in.sec_desc = talloc_p(io, struct security_descriptor);
+		io->ntcreatex.in.sec_desc = talloc(io, struct security_descriptor);
 		if (io->ntcreatex.in.sec_desc == NULL) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -127,7 +127,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
 		DATA_BLOB blob;
 		blob.data = trans->in.data.data + sd_length;
 		blob.length = ea_length;
-		io->ntcreatex.in.ea_list = talloc_p(io, struct smb_ea_list);
+		io->ntcreatex.in.ea_list = talloc(io, struct smb_ea_list);
 		if (io->ntcreatex.in.ea_list == NULL) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -190,7 +190,7 @@ static NTSTATUS nttrans_query_sec_desc(struct smbsrv_request *req,
 	}
 
 	/* parse the request */
-	io = talloc_p(req, union smb_fileinfo);
+	io = talloc(req, union smb_fileinfo);
 	if (io == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -238,7 +238,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req,
 	}
 
 	/* parse the request */
-	io = talloc_p(req, union smb_setfileinfo);
+	io = talloc(req, union smb_setfileinfo);
 	if (io == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -247,7 +247,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req,
 	io->set_secdesc.file.fnum        = SVAL(trans->in.params.data, 0);
 	io->set_secdesc.in.secinfo_flags = IVAL(trans->in.params.data, 4);
 
-	io->set_secdesc.in.sd = talloc_p(io, struct security_descriptor);
+	io->set_secdesc.in.sd = talloc(io, struct security_descriptor);
 	if (io->set_secdesc.in.sd == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -383,7 +383,7 @@ void reply_nttrans(struct smbsrv_request *req)
 	}
 
 	/* parse out the setup words */
-	trans.in.setup = talloc_array_p(req, uint16_t, trans.in.setup_count);
+	trans.in.setup = talloc_array(req, uint16_t, trans.in.setup_count);
 	if (!trans.in.setup) {
 		req_reply_error(req, NT_STATUS_NO_MEMORY);
 		return;
diff --git a/source4/smb_server/password.c b/source4/smb_server/password.c
index 91a9eac3c7..3d7723936d 100644
--- a/source4/smb_server/password.c
+++ b/source4/smb_server/password.c
@@ -99,9 +99,9 @@ uint16_t smbsrv_register_session(struct smbsrv_connection *smb_conn,
 {
 	struct smbsrv_session *sess = NULL;
 
-	sess = talloc_p(smb_conn, struct smbsrv_session);
+	sess = talloc(smb_conn, struct smbsrv_session);
 	if(sess == NULL) {
-		DEBUG(0,("talloc_p(smb_conn->mem_ctx, struct smbsrv_session) failed\n"));
+		DEBUG(0,("talloc(smb_conn->mem_ctx, struct smbsrv_session) failed\n"));
 		return UID_FIELD_INVALID;
 	}
 
diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c
index f7f39f39d5..c2aca04661 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -47,7 +47,7 @@ struct smbsrv_request *init_smb_request(struct smbsrv_connection *smb_conn)
 {
 	struct smbsrv_request *req;
 
-	req = talloc_p(smb_conn, struct smbsrv_request);
+	req = talloc(smb_conn, struct smbsrv_request);
 	if (!req) {
 		return NULL;
 	}
@@ -57,7 +57,7 @@ struct smbsrv_request *init_smb_request(struct smbsrv_connection *smb_conn)
 	/* setup the request context */
 	req->smb_conn = smb_conn;
 
-	req->async_states = talloc_p(req, struct ntvfs_async_state);
+	req->async_states = talloc(req, struct ntvfs_async_state);
 	if (!req->async_states) {
 		talloc_free(req);
 		return NULL;
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 1cbc831a17..394923635d 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -80,7 +80,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t
 			return NT_STATUS_NO_MEMORY;
 		}
 
-		req->in.buffer = talloc_array_p(req, uint8_t, NBT_HDR_SIZE);
+		req->in.buffer = talloc_array(req, uint8_t, NBT_HDR_SIZE);
 		if (req->in.buffer == NULL) {
 			talloc_free(req);
 			return NT_STATUS_NO_MEMORY;
@@ -805,7 +805,7 @@ static void smbsrv_accept(struct server_connection *conn)
 
 	DEBUG(5,("smbsrv_accept\n"));
 
-	smb_conn = talloc_zero_p(conn, struct smbsrv_connection);
+	smb_conn = talloc_zero(conn, struct smbsrv_connection);
 	if (!smb_conn) return;
 
 	/* now initialise a few default values associated with this smb socket */
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index 2b9573383f..a1033e9476 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -426,7 +426,7 @@ static NTSTATUS trans2_open(struct smbsrv_request *req, struct smb_trans2 *trans
 		return NT_STATUS_FOOBAR;
 	}
 
-	io = talloc_p(req, union smb_open);
+	io = talloc(req, union smb_open);
 	if (io == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -487,7 +487,7 @@ static NTSTATUS trans2_mkdir(struct smbsrv_request *req, struct smb_trans2 *tran
 		return NT_STATUS_FOOBAR;
 	}
 
-	io = talloc_p(req, union smb_mkdir);
+	io = talloc(req, union smb_mkdir);
 	if (io == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -1437,7 +1437,7 @@ static void reply_trans_continue(struct smbsrv_request *req, uint8_t command,
 		return;
 	}
 
-	tp = talloc_p(req, struct smbsrv_trans_partial);
+	tp = talloc(req, struct smbsrv_trans_partial);
 
 	tp->req = talloc_reference(tp, req);
 	tp->trans = trans;
@@ -1563,7 +1563,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command)
 	uint16_t param_count, data_count;
 	uint16_t param_total, data_total;
 
-	trans = talloc_p(req, struct smb_trans2);
+	trans = talloc(req, struct smb_trans2);
 	if (trans == NULL) {
 		req_reply_error(req, NT_STATUS_NO_MEMORY);
 		return;
@@ -1594,7 +1594,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command)
 	}
 
 	/* parse out the setup words */
-	trans->in.setup = talloc_array_p(req, uint16_t, trans->in.setup_count);
+	trans->in.setup = talloc_array(req, uint16_t, trans->in.setup_count);
 	if (trans->in.setup_count && !trans->in.setup) {
 		req_reply_error(req, NT_STATUS_NO_MEMORY);
 		return;
@@ -1682,7 +1682,7 @@ static void reply_transs_generic(struct smbsrv_request *req, uint8_t command)
 
 	/* add to the existing request */
 	if (param_count != 0) {
-		trans->in.params.data = talloc_realloc_p(trans, 
+		trans->in.params.data = talloc_realloc(trans, 
 							 trans->in.params.data, 
 							 uint8_t, 
 							 param_disp + param_count);
@@ -1693,7 +1693,7 @@ static void reply_transs_generic(struct smbsrv_request *req, uint8_t command)
 	}
 
 	if (data_count != 0) {
-		trans->in.data.data = talloc_realloc_p(trans, 
+		trans->in.data.data = talloc_realloc(trans, 
 						       trans->in.data.data, 
 						       uint8_t, 
 						       data_disp + data_count);