r23779: Change from v2 or later to v3 or later.

[ira/wip.git] / source3 / modules / vfs_fake_perms.c

diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 2e1267ef1b8842996287ba86cb0b75ba34dd838b..b9a48c88b49369d36f1ed8cd44f56508c6dd68c1 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,
@@ -24,24 +24,24 @@
 
 #include "includes.h"
 
+extern struct current_user current_user;
+
 #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, const char *fname, SMB_STRUCT_STAT *sbuf)
 {
        int ret = -1;
 
-       ret = VFS_NEXT_STAT(handle, conn, fname, sbuf);
+       ret = SMB_VFS_NEXT_STAT(handle, 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;
+               sbuf->st_uid = current_user.ut.uid;
+               sbuf->st_gid = current_user.ut.gid;
        }
 
        return ret;
@@ -51,17 +51,15 @@ static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd
 {
        int ret = -1;
 
-       ret = VFS_NEXT_FSTAT(handle, fsp, fd, sbuf);
+       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;
+               sbuf->st_uid = current_user.ut.uid;
+               sbuf->st_gid = current_user.ut.gid;
        }
        return ret;
 }
@@ -69,12 +67,13 @@ static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd
 /* VFS operations structure */
 
 static vfs_op_tuple fake_perms_ops[] = {       
-       {VFS_OP(fake_perms_stat),       SMB_VFS_OP_STAT,        SMB_VFS_LAYER_TRANSPARENT},
-       {VFS_OP(fake_perms_fstat),      SMB_VFS_OP_FSTAT,       SMB_VFS_LAYER_TRANSPARENT},
+       {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},
 
-       {NULL,                          SMB_VFS_OP_NOOP,        SMB_VFS_LAYER_NOOP}
+       {SMB_VFS_OP(NULL),              SMB_VFS_OP_NOOP,        SMB_VFS_LAYER_NOOP}
 };
 
+NTSTATUS vfs_fake_perms_init(void);
 NTSTATUS vfs_fake_perms_init(void)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms", fake_perms_ops);