diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-07-01 14:53:32 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-07-01 15:15:37 +1000 |
| commit | 0534ae012b3ef962f52fef9968eef30e88668874 (patch) | |
| tree | 13019d8c5082726ba26ef82a524d169a066b1652 /source4 | |
| parent | 5fe1d8dc1275e43d96da1297f5fb0d0088a1c3ab (diff) | |
| download | samba-0534ae012b3ef962f52fef9968eef30e88668874.tar.gz samba-0534ae012b3ef962f52fef9968eef30e88668874.tar.bz2 samba-0534ae012b3ef962f52fef9968eef30e88668874.zip | |
use the new talloc_reparent in two places
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 81578a1a88..d7b80abc55 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -839,7 +839,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru r->out.realm = connect_with_info->out.realm; talloc_steal(mem_ctx, r->out.realm); r->out.samr_pipe = samr_pipe; - talloc_steal(mem_ctx, samr_pipe); + talloc_reparent(tmp_ctx, mem_ctx, samr_pipe); r->out.samr_binding = samr_pipe->binding; talloc_steal(mem_ctx, r->out.samr_binding); r->out.user_handle = u_handle; diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 5ac5624745..efeee95363 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -384,7 +384,7 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice) smbsrv_terminate_connection(req->smb_conn, "reply_nt1: is this a secondary negprot? auth_context is non-NULL!\n"); return; } - req->smb_conn->negotiate.server_credentials = talloc_steal(req->smb_conn, server_credentials); + req->smb_conn->negotiate.server_credentials = talloc_reparent(req, req->smb_conn, server_credentials); gensec_set_target_service(gensec_security, "cifs"); |