diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-11 22:38:42 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-11 22:38:42 -0800 |
| commit | 05fb367a014305f385a6db6653bd327861291563 (patch) | |
| tree | 0c0613cccf22ed0cc92498ee0371b95db01f5c8c /source3/smbd/nttrans.c | |
| parent | 1d1b996f3879b87418bdde2fd1691ae2cca42cd4 (diff) | |
| parent | 45db92cc72eb2472425c17e72ff9254d35d8047c (diff) | |
| download | samba-05fb367a014305f385a6db6653bd327861291563.tar.gz samba-05fb367a014305f385a6db6653bd327861291563.tar.bz2 samba-05fb367a014305f385a6db6653bd327861291563.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 08645826817d42c9d4b42ea0fd5e633d7fd08d35)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index ae64c06215..e8df732ea2 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1604,7 +1604,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, SEC_DESC *psd = NULL; size_t sd_size; uint32 security_info_wanted; - TALLOC_CTX *frame; files_struct *fsp = NULL; NTSTATUS status; DATA_BLOB blob; @@ -1631,8 +1630,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, return; } - frame = talloc_stackframe(); - /* * Get the permissions to return. */ @@ -1651,7 +1648,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, } if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(frame); reply_nterror(req, status); return; } @@ -1665,7 +1661,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, if (max_data_count < sd_size) { send_nt_replies(conn, req, NT_STATUS_BUFFER_TOO_SMALL, params, 4, *ppdata, 0); - TALLOC_FREE(frame); return; } @@ -1675,7 +1670,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, data = nttrans_realloc(ppdata, sd_size); if(data == NULL) { - TALLOC_FREE(frame); reply_doserror(req, ERRDOS, ERRnomem); return; } @@ -1684,7 +1678,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, &blob.data, &blob.length); if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(frame); reply_nterror(req, status); return; } @@ -1694,7 +1687,6 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, send_nt_replies(conn, req, NT_STATUS_OK, params, 4, data, (int)sd_size); - TALLOC_FREE(frame); return; } |