summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/filename.c2
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/smbd/trans2.c2
-rw-r--r--source3/smbd/vfs.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 99526a3ac2a..bae73394efb 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -233,7 +233,7 @@ static struct loadparm_service sDefault =
.onlyuser = false,
.mangled_names = true,
.bWidelinks = false,
- .symlinks = true,
+ .follow_symlinks = true,
.syncalways = false,
.strict_allocate = false,
.strict_sync = false,
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 56c36e02ec9..e6327966fbd 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1043,7 +1043,7 @@ NTSTATUS check_name(connection_struct *conn, const char *name)
return status;
}
- if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
+ if (!lp_widelinks(SNUM(conn)) || !lp_follow_symlinks(SNUM(conn))) {
status = check_reduced_name(conn,name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,("check_name: name %s failed with %s\n",name,
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index cce8be29fcc..ecc84b910fe 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -360,7 +360,7 @@ NTSTATUS fd_open(struct connection_struct *conn,
* client should be doing this.
*/
- if (fsp->posix_open || !lp_symlinks(SNUM(conn))) {
+ if (fsp->posix_open || !lp_follow_symlinks(SNUM(conn))) {
flags |= O_NOFOLLOW;
}
#endif
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b903badc753..288ea9ae5b6 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6142,7 +6142,7 @@ static NTSTATUS smb_set_file_unix_link(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
- if (!lp_symlinks(SNUM(conn))) {
+ if (!lp_follow_symlinks(SNUM(conn))) {
return NT_STATUS_ACCESS_DENIED;
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 44690c2ba22..bc9157a8871 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1205,7 +1205,7 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
}
allow_widelinks = lp_widelinks(SNUM(conn));
- allow_symlinks = lp_symlinks(SNUM(conn));
+ allow_symlinks = lp_follow_symlinks(SNUM(conn));
/* Common widelinks and symlinks checks. */
if (!allow_widelinks || !allow_symlinks) {