diff options
| author | Jeremy Allison <jra@samba.org> | 2007-01-12 23:47:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:04 -0500 |
| commit | db0ad252a0622dfac17d44ca646168df4c1c22e5 (patch) | |
| tree | 36128572dc6d4319ec9f7ab4622aa620d165b3b9 /source3/rpc_server/srv_srvsvc_nt.c | |
| parent | 700c3ab1c94fcd0ff422afa0e0e3faf419b3c5af (diff) | |
| download | samba-db0ad252a0622dfac17d44ca646168df4c1c22e5.tar.gz samba-db0ad252a0622dfac17d44ca646168df4c1c22e5.tar.bz2 samba-db0ad252a0622dfac17d44ca646168df4c1c22e5.zip | |
r20718: Sync up the filename path parsing changes from SAMBA_3_0_24.
The only difference between the two trees now w.r.t file
serving are the changes to smbd/open.c in this branch I need
to review.
Jeremy.
(This used to be commit f4474edf6a0c71001dbd01429ef70bafad6abd74)
Diffstat (limited to 'source3/rpc_server/srv_srvsvc_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index abfa794518..646a414cda 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -2036,7 +2036,6 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, const char *server_unc, const DATA_BLOB null_pw; files_struct *fsp = NULL; SMB_STRUCT_STAT st; - BOOL bad_path; NTSTATUS nt_status; connection_struct *conn = NULL; BOOL became_user = False; @@ -2067,8 +2066,8 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, const char *server_unc, const became_user = True; pstrcpy(tmp_file, file); - unix_convert(tmp_file, conn, NULL, &bad_path, &st); - if (bad_path) { + nt_status = unix_convert(conn, tmp_file, False, NULL, &st); + if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(3,("_srv_net_file_query_secdesc: bad pathname %s\n", file)); status = WERR_ACCESS_DENIED; goto error_exit; @@ -2141,7 +2140,6 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, const char *server_unc, const DATA_BLOB null_pw; files_struct *fsp = NULL; SMB_STRUCT_STAT st; - BOOL bad_path; NTSTATUS nt_status; connection_struct *conn = NULL; BOOL became_user = False; @@ -2171,8 +2169,8 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, const char *server_unc, const became_user = True; pstrcpy(tmp_file, file); - unix_convert(tmp_file, conn, NULL, &bad_path, &st); - if (bad_path) { + nt_status = unix_convert(conn, tmp_file, False, NULL, &st); + if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(3,("_srv_net_file_set_secdesc: bad pathname %s\n", file)); status = WERR_ACCESS_DENIED; goto error_exit; |