From 223e78990a16f134a01d1223a0dad8b2accd5fed Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 25 Sep 2004 11:48:30 +0000
Subject: r2628: got rid of some warnings and converted a few more places to
 use hierarchical memory allocation (This used to be commit
 26da45a8019a2d6c9ff2ac2a6739c7d0b42b00de)

---
 source4/librpc/rpc/dcerpc.c     | 3 +--
 source4/librpc/rpc/dcerpc_smb.c | 2 +-
 source4/librpc/rpc/dcerpc_tcp.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/librpc')

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 23e9f04d96..352db37d2b 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -22,8 +22,7 @@
 
 #include "includes.h"
 
-/* initialise a dcerpc pipe. This currently assumes a SMB named pipe
-   transport */
+/* initialise a dcerpc pipe. */
 struct dcerpc_pipe *dcerpc_pipe_init(void)
 {
 	struct dcerpc_pipe *p;
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index d80d5ea927..dac95f5aec 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -433,7 +433,7 @@ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe **p,
 	/* Over-ride the default session key with the SMB session key */
 	(*p)->security_state.session_key = smb_session_key;
 
-	smb = talloc((*p), sizeof(*smb));
+	smb = talloc_p((*p), struct smb_private);
 	if (!smb) {
 		dcerpc_pipe_close(*p);
 		return NT_STATUS_NO_MEMORY;
diff --git a/source4/librpc/rpc/dcerpc_tcp.c b/source4/librpc/rpc/dcerpc_tcp.c
index 170e84a763..acf3d58262 100644
--- a/source4/librpc/rpc/dcerpc_tcp.c
+++ b/source4/librpc/rpc/dcerpc_tcp.c
@@ -329,7 +329,7 @@ NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_pipe **p,
 
 	set_socket_options(fd, lp_socket_options());
 
-    if (!(*p = dcerpc_pipe_init())) {
+	if (!(*p = dcerpc_pipe_init())) {
                 return NT_STATUS_NO_MEMORY;
 	}
  
-- 
cgit