sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r23761: Rename reduce_name to check_reduced_name

Browse Source 
The function name reduce_name is misleading, making the user believe it
changes an argument.
(This used to be commit 68234f0bc6)
This commit is contained in:
Volker Lendecke 2007-07-09 09:43:41 +00:00 committed by Gerald (Jerry) Carter
parent d4f1b08c93
commit ead70dc92e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/filename.c
View File

@ -512,7 +512,7 @@ NTSTATUS unix_convert(connection_struct *conn,
}
/****************************************************************************
Check a filename - possibly caling reducename.
Check a filename - possibly calling check_reduced_name.
This is called by every routine before it allows an operation on a filename.
It does any final confirmation necessary to ensure that the filename is
a valid one for the user to access.
@ -529,7 +529,7 @@ NTSTATUS check_name(connection_struct *conn, const pstring name)
}
if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
NTSTATUS status = reduce_name(conn,name);
NTSTATUS status = check_reduced_name(conn,name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,("check_name: name %s failed with %s\n",name, nt_errstr(status)));
return status;

2
source3/smbd/nttrans.c
View File

@ -1777,7 +1777,7 @@ static NTSTATUS copy_internals(connection_struct *conn,
}
/* Ensure this is within the share. */
status = reduce_name(conn, oldname);
status = check_reduced_name(conn, oldname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}

2
source3/smbd/trans2.c
View File

@ -4177,7 +4177,7 @@ NTSTATUS hardlink_internals(connection_struct *conn, pstring oldname, pstring ne
}
/* Ensure this is within the share. */
status = reduce_name(conn, oldname);
status = check_reduced_name(conn, oldname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}

2
source3/smbd/vfs.c
View File

@ -802,7 +802,7 @@ char *vfs_GetWd(connection_struct *conn, char *path)
it is below dir in the heirachy. This uses realpath.
********************************************************************/
NTSTATUS reduce_name(connection_struct *conn, const pstring fname)
NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
{
#ifdef REALPATH_TAKES_NULL
BOOL free_resolved_name = True;