diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-07-21 10:28:28 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-07-21 12:04:59 -0700 |
| commit | 00e267008defe18475115a4300addf3cbcabff5a (patch) | |
| tree | 777f655f26c8266fc96ecd518c5572626db918c6 /source3/smbd/filename.c | |
| parent | 4860fc4951a7dbd80d8938f4dba49c42a12b4d00 (diff) | |
| download | samba-00e267008defe18475115a4300addf3cbcabff5a.tar.gz samba-00e267008defe18475115a4300addf3cbcabff5a.tar.bz2 samba-00e267008defe18475115a4300addf3cbcabff5a.zip | |
s3: Remove the now unused fname parameter from filename_convert()
Diffstat (limited to 'source3/smbd/filename.c')
| -rw-r--r-- | source3/smbd/filename.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index c05f0e659f..541b0cd3cb 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -1018,8 +1018,7 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx, connection_struct *conn, bool dfs_path, const char *name_in, - struct smb_filename **pp_smb_fname, - char **pp_name) + struct smb_filename **pp_smb_fname) { NTSTATUS status; char *fname = NULL; @@ -1046,22 +1045,15 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx, return status; } - status = get_full_smb_filename(ctx, *pp_smb_fname, &fname); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - status = check_name(conn, fname); + status = check_name(conn, (*pp_smb_fname)->base_name); if (!NT_STATUS_IS_OK(status)) { DEBUG(3,("filename_convert: check_name failed " "for name %s with %s\n", - fname, + smb_fname_str_dbg(*pp_smb_fname), nt_errstr(status) )); + TALLOC_FREE(*pp_smb_fname); return status; } - if (pp_name != NULL) { - *pp_name = fname; - } return status; } |