Remove lp_safe_widelinks() -> convert to just lp_widelinks. Suggestion from Volker.

Create widelinks_warning(int snum) to cover the message needed in make_connection.

Jeremy.

3 files changed, 7 insertions, 6 deletions

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 73a3c36062..ab79dfd926 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -854,7 +854,7 @@ NTSTATUS check_name(connection_struct *conn, const char *name)
 		}
 	}
 
-	if (!lp_safe_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
+	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
 		NTSTATUS 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/service.c b/source3/smbd/service.c
index 45df7c14fe..7dddff5259 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -857,10 +857,11 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 					       conn);
 	}
 
-/* ROOT Activities: */	
-	/* explicitly check with lp_widelinks() instead of using
-	 * lp_safe_widelinks() here so that we can correctly warn
+/* ROOT Activities: */
+	/* explicitly check widelinks here so that we can correctly warn
 	 * in the logs. */
+	widelinks_warning(snum);
+
 	if (lp_unix_extensions() && lp_widelinks(snum)) {
 		DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
 			"These parameters are incompatible. "
@@ -973,7 +974,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	 * below this directory. We must do this after the VFS init as we
 	 * depend on the realpath() pointer in the vfs table. JRA.
 	 */
-	if (!lp_safe_widelinks(snum)) {
+	if (!lp_widelinks(snum)) {
 		if (!canonicalize_connect_path(conn)) {
 			DEBUG(0, ("canonicalize_connect_path failed "
 			"for service %s, path %s\n",
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index b575800335..94bdb1f495 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -928,7 +928,7 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 	}
 
 	/* Check for widelinks allowed. */
-	if (!lp_safe_widelinks(SNUM(conn))) {
+	if (!lp_widelinks(SNUM(conn))) {
 		    const char *conn_rootdir;
 
 		    conn_rootdir = SMB_VFS_CONNECTPATH(conn, fname);