smbd: Fix a typo in a few places

[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 740218dcd4192864cb1b2985b496d22c1a46b07a..0089186be1a10381825d75fb5165f40dac47243a 100644 (file)
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -9,7 +9,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *  
  * This program is distributed in the hope that it will be useful,
@@ -18,64 +18,91 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
-static int fake_perms_stat(vfs_handle_struct *handle, connection_struct *conn, const char *fname, SMB_STRUCT_STAT *sbuf)
+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, conn, fname, sbuf);
-       if (ret == 0) {
-               extern struct current_user current_user;
-               
-               if (S_ISDIR(sbuf->st_mode)) {
-                       sbuf->st_mode = S_IFDIR | S_IRWXU;
-               } else {
-                       sbuf->st_mode = S_IRWXU;
-               }
-               sbuf->st_uid = current_user.uid;
-               sbuf->st_gid = current_user.gid;
+       ret = SMB_VFS_NEXT_STAT(handle, smb_fname);
+       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;
 }
 
-static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd, SMB_STRUCT_STAT *sbuf)
+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, fd, sbuf);
-       if (ret == 0) {
-               extern struct current_user current_user;
-               
-               if (S_ISDIR(sbuf->st_mode)) {
-                       sbuf->st_mode = S_IFDIR | S_IRWXU;
-               } else {
-                       sbuf->st_mode = S_IRWXU;
-               }
-               sbuf->st_uid = current_user.uid;
-               sbuf->st_gid = current_user.gid;
+       ret = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
+       if (ret != 0) {
+               return ret;
        }
-       return ret;
-}
 
-/* VFS operations structure */
+       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();
+       }
 
-static vfs_op_tuple fake_perms_ops[] = {       
-       {SMB_VFS_OP(fake_perms_stat),   SMB_VFS_OP_STAT,        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(fake_perms_fstat),  SMB_VFS_OP_FSTAT,       SMB_VFS_LAYER_TRANSPARENT},
+       return ret;
+}
 
-       {SMB_VFS_OP(NULL),              SMB_VFS_OP_NOOP,        SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_fake_perms_fns = {
+       .stat_fn = fake_perms_stat,
+       .fstat_fn = fake_perms_fstat
 };
 
-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", fake_perms_ops);
+       return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms",
+                               &vfs_fake_perms_fns);
 }