vfs_default: allow disabling /proc/fds and RESOLVE_NO_SYMLINK at compile time

[samba.git] / source3 / modules / vfs_default.c

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 89eec1146d7415ba5067654569074089940a593e..218316867b805c2c22b2c6c2f15a4198cfe8c1dd 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -52,6 +52,9 @@ static int vfswrap_connect(vfs_handle_struct *handle, const char *service, const
        bool bval;
 
        handle->conn->have_proc_fds = sys_have_proc_fds();
+#ifdef DISABLE_PROC_FDS
+       handle->conn->have_proc_fds = false;
+#endif
 
        /*
         * assume the kernel will support openat2(),
@@ -70,6 +73,9 @@ static int vfswrap_connect(vfs_handle_struct *handle, const char *service, const
                handle->conn->open_how_resolve |=
                        VFS_OPEN_HOW_RESOLVE_NO_SYMLINKS;
        }
+#ifdef DISABLE_VFS_OPEN_HOW_RESOLVE_NO_SYMLINKS
+       handle->conn->open_how_resolve &= ~VFS_OPEN_HOW_RESOLVE_NO_SYMLINKS;
+#endif
 
        return 0;    /* Return >= 0 for success */
 }