r4591: - converted the other _p talloc functions to not need _p

- added #if TALLOC_DEPRECATED around the _p functions

- fixes the code that broke from the above

while doing this I fixed quite a number of places that were
incorrectly using the non type-safe talloc functions to use the type
safe ones. Some were even doing multiplies for array allocation, which
is potentially unsafe.
(This used to be commit 6e7754abd0c225527fb38363996a6e241b87b37e)

1 files changed, 3 insertions, 2 deletions

diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index 8aa60daa6d..2b9573383f 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -42,7 +42,8 @@ static BOOL trans2_grow_data_allocation(struct smbsrv_request *req,
 	if (new_size <= trans->out.data.length) {
 		return True;
 	}
-	trans->out.data.data = talloc_realloc(req, trans->out.data.data, new_size);
+	trans->out.data.data = talloc_realloc(req, trans->out.data.data, 
+					      uint8_t, new_size);
 	return (trans->out.data.data != NULL);
 }
 
@@ -83,7 +84,7 @@ static void trans2_setup_reply(struct smbsrv_request *req,
 {
 	trans->out.setup_count = setup_count;
 	if (setup_count != 0) {
-		trans->out.setup = talloc_zero_array_p(req, uint16_t, setup_count);
+		trans->out.setup = talloc_zero_array(req, uint16_t, setup_count);
 	}
 	trans->out.params = data_blob_talloc(req, NULL, param_size);
 	trans->out.data = data_blob_talloc(req, NULL, data_size);