diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:03 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:13 -0800 |
| commit | 5f4159b25bcddc06babbd9b3aa6c3ff86770a610 (patch) | |
| tree | 2da21b51de2df041a892a07ab5559ab58d3c3e41 | |
| parent | f4414d63cdd4d276f66433c6868c9efe8567f28c (diff) | |
| download | samba-5f4159b25bcddc06babbd9b3aa6c3ff86770a610.tar.gz samba-5f4159b25bcddc06babbd9b3aa6c3ff86770a610.tar.xz samba-5f4159b25bcddc06babbd9b3aa6c3ff86770a610.zip | |
param: rename lp function and variable from "symlinks" to "follow_symlinks"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/filename.c | 2 | ||||
| -rw-r--r-- | source3/smbd/open.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 8729d75db7c..f31ea4fca03 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -105,7 +105,7 @@ FN_LOCAL_BOOL(level2_oplocks, level2_oplocks) FN_LOCAL_BOOL(kernel_share_modes, kernel_share_modes) FN_LOCAL_BOOL(onlyuser, onlyuser) FN_LOCAL_PARM_BOOL(mangled_names, mangled_names) -FN_LOCAL_BOOL(symlinks, symlinks) +FN_LOCAL_BOOL(follow_symlinks, follow_symlinks) FN_LOCAL_BOOL(syncalways, syncalways) FN_LOCAL_BOOL(strict_allocate, strict_allocate) FN_LOCAL_BOOL(delete_readonly, delete_readonly) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 4571c8b638f..b8b94d95816 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3742,7 +3742,7 @@ static struct parm_struct parm_table[] = { .label = "follow symlinks", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(symlinks), + .offset = LOCAL_VAR(follow_symlinks), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, 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) { |