diff options
| author | Jeremy Allison <jra@samba.org> | 2009-06-18 15:07:14 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-06-18 15:07:14 -0700 |
| commit | d2da9dee686881106678d50a96713f0632dcdf10 (patch) | |
| tree | 9b46c0c510a995414e07d2cda99c40123f88e5f6 /source3/rpc_server | |
| parent | 34267482d53cb559cc40c4ec2bee929c21b7886b (diff) | |
| download | samba-d2da9dee686881106678d50a96713f0632dcdf10.tar.gz samba-d2da9dee686881106678d50a96713f0632dcdf10.tar.bz2 samba-d2da9dee686881106678d50a96713f0632dcdf10.zip | |
Add some const to the stat struct in the dosmode calls.
Fix a couple more unix_convert uses to filename_convert.
Fix bug in acl_group_override() where an uninitialized
struct could be used. Move unix_convert with wildcard
use in SMBsearch reply to boilerplate code.
Jeremy.
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 1b07fc213e..070f7fd0ca 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -2067,23 +2067,17 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, goto error_exit; } - nt_status = resolve_dfspath(talloc_tos(), + nt_status = filename_convert(talloc_tos(), conn, false, r->in.file, + &smb_fname, &fname); if (!NT_STATUS_IS_OK(nt_status)) { werr = ntstatus_to_werror(nt_status); goto error_exit; } - nt_status = unix_convert(talloc_tos(), conn, fname, &smb_fname, - 0); - if (!NT_STATUS_IS_OK(nt_status)) { - werr = ntstatus_to_werror(nt_status); - goto error_exit; - } - nt_status = SMB_VFS_CREATE_FILE( conn, /* conn */ NULL, /* req */ @@ -2203,21 +2197,16 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, goto error_exit; } - nt_status = resolve_dfspath(talloc_tos(), + nt_status = filename_convert(talloc_tos(), conn, false, r->in.file, + &smb_fname, &fname); if (!NT_STATUS_IS_OK(nt_status)) { werr = ntstatus_to_werror(nt_status); goto error_exit; } - nt_status = unix_convert(talloc_tos(), conn, fname, &smb_fname, - 0); - if (!NT_STATUS_IS_OK(nt_status)) { - werr = ntstatus_to_werror(nt_status); - goto error_exit; - } nt_status = SMB_VFS_CREATE_FILE( conn, /* conn */ |