selftest/Samba4: make use of get_cmd_env_vars() to setup all relevant env variables

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

diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 4cda7ea1601dbb9d63266ff6522d62db4a4cc3d6..0089186be1a10381825d75fb5165f40dac47243a 100644 (file)
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -32,17 +32,32 @@
 static int fake_perms_stat(vfs_handle_struct *handle,
                           struct smb_filename *smb_fname)
 {
-       int ret = -1;
+       int ret;
 
        ret = SMB_VFS_NEXT_STAT(handle, smb_fname);
-       if (ret == 0) {
-               if (S_ISDIR(smb_fname->st.st_ex_mode)) {
-                       smb_fname->st.st_ex_mode = S_IFDIR | S_IRWXU;
-               } else {
-                       smb_fname->st.st_ex_mode = S_IRWXU;
-               }
-               smb_fname->st.st_ex_uid = handle->conn->session_info->unix_token->uid;
-               smb_fname->st.st_ex_gid = handle->conn->session_info->unix_token->gid;
+       if (ret != 0) {
+               return ret;
+       }
+
+       if (S_ISDIR(smb_fname->st.st_ex_mode)) {
+               smb_fname->st.st_ex_mode = S_IFDIR | S_IRWXU;
+       } else {
+               smb_fname->st.st_ex_mode = S_IRWXU;
+       }
+
+       if (handle->conn->session_info != NULL) {
+               struct security_unix_token *utok;
+
+               utok = handle->conn->session_info->unix_token;
+               smb_fname->st.st_ex_uid = utok->uid;
+               smb_fname->st.st_ex_gid = utok->gid;
+       } else {
+               /*
+                * We have an artificial connection for dfs for example. It
+                * sucks, but the current uid/gid is the best we have.
+                */
+               smb_fname->st.st_ex_uid = geteuid();
+               smb_fname->st.st_ex_gid = getegid();
        }
 
        return ret;
@@ -50,18 +65,33 @@ static int fake_perms_stat(vfs_handle_struct *handle,
 
 static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf)
 {
-       int ret = -1;
+       int ret;
 
        ret = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
-       if (ret == 0) {
-               if (S_ISDIR(sbuf->st_ex_mode)) {
-                       sbuf->st_ex_mode = S_IFDIR | S_IRWXU;
-               } else {
-                       sbuf->st_ex_mode = S_IRWXU;
-               }
-               sbuf->st_ex_uid = handle->conn->session_info->unix_token->uid;
-               sbuf->st_ex_gid = handle->conn->session_info->unix_token->gid;
+       if (ret != 0) {
+               return ret;
        }
+
+       if (S_ISDIR(sbuf->st_ex_mode)) {
+               sbuf->st_ex_mode = S_IFDIR | S_IRWXU;
+       } else {
+               sbuf->st_ex_mode = S_IRWXU;
+       }
+       if (handle->conn->session_info != NULL) {
+               struct security_unix_token *utok;
+
+               utok = handle->conn->session_info->unix_token;
+               sbuf->st_ex_uid = utok->uid;
+               sbuf->st_ex_gid = utok->gid;
+       } else {
+               /*
+                * We have an artificial connection for dfs for example. It
+                * sucks, but the current uid/gid is the best we have.
+                */
+               sbuf->st_ex_uid = geteuid();
+               sbuf->st_ex_gid = getegid();
+       }
+
        return ret;
 }
 
@@ -70,8 +100,8 @@ static struct vfs_fn_pointers vfs_fake_perms_fns = {
        .fstat_fn = fake_perms_fstat
 };
 
-NTSTATUS vfs_fake_perms_init(void);
-NTSTATUS vfs_fake_perms_init(void)
+static_decl_vfs;
+NTSTATUS vfs_fake_perms_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms",
                                &vfs_fake_perms_fns);