summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-09-13 22:08:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:44 -0500
commiteacd3140573d1122a3785823e4003bfc6352c431 (patch)
treea1ee9d9e59da4c44e0484d895eb78a8c8e1f0de2 /source3/rpc_server
parentd0de93ca762e8b59f09c2179448188c9952f68fc (diff)
downloadsamba-eacd3140573d1122a3785823e4003bfc6352c431.tar.gz
samba-eacd3140573d1122a3785823e4003bfc6352c431.tar.bz2
samba-eacd3140573d1122a3785823e4003bfc6352c431.zip
r25138: More pstring elimination. Add a TALLOC_CTX parameter
to unix_convert(). Jeremy. (This used to be commit 39c211a702e91c34c1a5a689e1b0c4530ea8a1ac)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 4be519a9a3..5a3a78ef89 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -2048,6 +2048,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, struct srvsvc_NetGetFileSecur
BOOL became_user = False;
WERROR status = WERR_OK;
char *tmp_file = NULL;
+ TALLOC_CTX *ctx = talloc_tos();
ZERO_STRUCT(st);
@@ -2076,7 +2077,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, struct srvsvc_NetGetFileSecur
status = WERR_INVALID_PARAM;
goto error_exit;
}
- nt_status = unix_convert(conn, r->in.file, False, &tmp_file, NULL, &st);
+ nt_status = unix_convert(ctx, conn, r->in.file, False, &tmp_file, NULL, &st);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(3,("_srv_net_file_query_secdesc: bad pathname %s\n", r->in.file));
status = WERR_ACCESS_DENIED;
@@ -2156,6 +2157,7 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, struct srvsvc_NetSetFileSecur
BOOL became_user = False;
WERROR status = WERR_OK;
char *tmp_file = NULL;
+ TALLOC_CTX *ctx = talloc_tos();
ZERO_STRUCT(st);
@@ -2183,7 +2185,7 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, struct srvsvc_NetSetFileSecur
status = WERR_INVALID_PARAM;
goto error_exit;
}
- nt_status = unix_convert(conn, r->in.file, False, &tmp_file, NULL, &st);
+ nt_status = unix_convert(ctx, conn, r->in.file, False, &tmp_file, NULL, &st);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(3,("_srv_net_file_set_secdesc: bad pathname %s\n", r->in.file));
status = WERR_ACCESS_DENIED;