diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-25 11:48:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:14 -0500 |
| commit | 223e78990a16f134a01d1223a0dad8b2accd5fed (patch) | |
| tree | 96f634dc3fa74d9b4b6385ab67bbd3741d48bba2 /source4/librpc/rpc | |
| parent | d79c7d41da373dea7f95506c178b18f0dd896043 (diff) | |
| download | samba-223e78990a16f134a01d1223a0dad8b2accd5fed.tar.gz samba-223e78990a16f134a01d1223a0dad8b2accd5fed.tar.bz2 samba-223e78990a16f134a01d1223a0dad8b2accd5fed.zip | |
r2628: got rid of some warnings and converted a few more places to use hierarchical memory allocation
(This used to be commit 26da45a8019a2d6c9ff2ac2a6739c7d0b42b00de)
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 3 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_tcp.c | 2 |
3 files changed, 3 insertions, 4 deletions
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; } |