summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-07-09 09:43:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:53 -0500
commitead70dc92e16a79cd7767dbc9f727bc530925abd (patch)
tree6e4aeccb73371349a42c40ec57de32c1e2167394
parentd4f1b08c935cc5c2c7509c50334d3b3f6cc3b371 (diff)
downloadsamba-ead70dc92e16a79cd7767dbc9f727bc530925abd.tar.gz
samba-ead70dc92e16a79cd7767dbc9f727bc530925abd.tar.bz2
samba-ead70dc92e16a79cd7767dbc9f727bc530925abd.zip
r23761: Rename reduce_name to check_reduced_name
The function name reduce_name is misleading, making the user believe it changes an argument. (This used to be commit 68234f0bc6fb4d6d99ae94ff067db118c60804aa)
-rw-r--r--source3/smbd/filename.c4
-rw-r--r--source3/smbd/nttrans.c2
-rw-r--r--source3/smbd/trans2.c2
-rw-r--r--source3/smbd/vfs.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index c26eba2ded..de15d923b8 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -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;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 5760cb75a4..f4508d07f1 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -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;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 15394cd863..005983f133 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -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;
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 2fd448061e..b854c36a7b 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -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;