r21763: Add support for the UNIX_INFO2 infolevel.
authorJames Peach <jpeach@samba.org>
Thu, 8 Mar 2007 18:05:55 +0000 (18:05 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:18:29 +0000 (12:18 -0500)
source/configure.in
source/include/trans2.h
source/smbd/trans2.c

index 38449dae334643ae9da6b032fa9a3a8c66d864ed..3e407cf5dcf256a860848411bb4d5b44b5b92eb3 100644 (file)
@@ -2976,6 +2976,23 @@ if test x"$samba_cv_HAVE_STAT_ST_BLKSIZE" = x"yes"; then
     AC_DEFINE(HAVE_STAT_ST_BLKSIZE,1,[Whether the stat struct has a st_blksize property])
 fi
 
+AC_CACHE_CHECK([for st_flags in struct stat],
+       samba_cv_HAVE_STAT_ST_FLAGS,
+       [
+           AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>],
+           [struct stat st;  st.st_flags = 0;],
+           samba_cv_HAVE_STAT_ST_FLAGS=yes,
+           samba_cv_HAVE_STAT_ST_FLAGS=no,
+           samba_cv_HAVE_STAT_ST_FLAGS=cross)
+       ])
+
+if test x"$samba_cv_HAVE_STAT_ST_FLAGS" = x"yes"; then
+    AC_DEFINE(HAVE_STAT_ST_FLAGS, 1,
+               [Whether the stat struct has a st_flags member])
+fi
+
 case "$host_os" in
 *linux*)
 AC_CACHE_CHECK([for broken RedHat 7.2 system header files],samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS,[
index c6d98c7ed3d30e1040af2fda04f67ab42f93b56e..8d372dcde3ce9d1f52681d58e94f643a80f49082 100644 (file)
@@ -1,6 +1,8 @@
 /* 
    Unix SMB/CIFS implementation.
    SMB transaction2 handling
+
+   Copyright (C) James Peach 2007
    Copyright (C) Jeremy Allison 1994-2002.
 
    Extensively modified by Andrew Tridgell, 1995
@@ -352,6 +354,7 @@ Byte offset   Type     name                description
 
 #define SMB_QUERY_FILE_UNIX_BASIC      0x200   /* UNIX File Info*/
 #define SMB_SET_FILE_UNIX_BASIC        0x200
+#define SMB_SET_FILE_UNIX_INFO2        0x20B   /* UNIX File Info2 */
 
 #define SMB_MODE_NO_CHANGE                 0xFFFFFFFF     /* file mode value which */
                                               /* means "don't change it" */
@@ -435,6 +438,18 @@ Offset Size         Name
 #define UNIX_EXTRA_MASK                 0007000
 #define UNIX_ALL_MASK                   0007777
 
+/* Flags for chflags (CIFS_UNIX_EXTATTR_CAP capability) and
+ * SMB_QUERY_FILE_UNIX_INFO2.
+ */
+#define EXT_SECURE_DELETE               0x00000001
+#define EXT_ENABLE_UNDELETE             0x00000002
+#define EXT_SYNCHRONOUS                 0x00000004
+#define EXT_IMMUTABLE                  0x00000008
+#define EXT_OPEN_APPEND_ONLY            0x00000010
+#define EXT_DO_NOT_BACKUP               0x00000020
+#define EXT_NO_UPDATE_ATIME             0x00000040
+#define EXT_HIDDEN                     0x00000080
+
 #define SMB_QUERY_FILE_UNIX_LINK       0x201
 #define SMB_SET_FILE_UNIX_LINK         0x201
 #define SMB_SET_FILE_UNIX_HLINK        0x203
@@ -455,8 +470,33 @@ Offset Size         Name
 #define SMB_QUERY_FILE_UNIX_INFO2      0x20B   /* UNIX File Info2 */
 #define SMB_SET_FILE_UNIX_INFO2        0x20B
 
+/*
+SMB_QUERY_FILE_UNIX_INFO2 is SMB_QUERY_FILE_UNIX_BASIC with create
+time and file flags appended. The corresponding info level for
+findfirst/findnext is SMB_FIND_FILE_UNIX_INFO2.
+    Size    Offset  Value
+    ---------------------
+    0      LARGE_INTEGER EndOfFile  File size
+    8      LARGE_INTEGER Blocks     Number of blocks used on disk
+    16     LARGE_INTEGER ChangeTime Attribute change time
+    24     LARGE_INTEGER LastAccessTime           Last access time
+    32     LARGE_INTEGER LastModificationTime     Last modification time
+    40     LARGE_INTEGER Uid        Numeric user id for the owner
+    48     LARGE_INTEGER Gid        Numeric group id of owner
+    56     ULONG Type               Enumeration specifying the file type
+    60     LARGE_INTEGER devmajor   Major device number if type is device
+    68     LARGE_INTEGER devminor   Minor device number if type is device
+    76     LARGE_INTEGER uniqueid   This is a server-assigned unique id
+    84     LARGE_INTEGER permissions           Standard UNIX permissions
+    92     LARGE_INTEGER nlinks                        Number of hard links
+    100    LARGE_INTEGER CreationTime          Create/birth time
+    108    ULONG FileFlags          File flags enumeration
+    112    ULONG FileFlagsMask      Mask of valid flags
+*/
+
 /* Transact 2 Find First levels */
 #define SMB_FIND_FILE_UNIX             0x202
+#define SMB_FIND_FILE_UNIX_INFO2       0x20B /* UNIX File Info2 */
 
 /*
  Info level for TRANS2_QFSINFO - returns version of CIFS UNIX extensions, plus
index 00327ddf45343f8ce97e51b522307cfd837c7e89..441a798f2773a63e179de703ffda1e94c3a2da42 100644 (file)
@@ -35,6 +35,16 @@ extern struct current_user current_user;
 #define get_file_size(sbuf) ((sbuf).st_size)
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 
+static char *store_file_unix_basic(connection_struct *conn,
+                               char *pdata,
+                               files_struct *fsp,
+                               const SMB_STRUCT_STAT *psbuf);
+
+static char *store_file_unix_basic_info2(connection_struct *conn,
+                               char *pdata,
+                               files_struct *fsp,
+                               const SMB_STRUCT_STAT *psbuf);
+
 /********************************************************************
  Roundup a value to the nearest allocation roundup size boundary.
  Only do this for Windows clients.
@@ -57,7 +67,7 @@ SMB_BIG_UINT smb_roundup(connection_struct *conn, SMB_BIG_UINT val)
  account sparse files.
 ********************************************************************/
 
-SMB_BIG_UINT get_allocation_size(connection_struct *conn, files_struct *fsp, SMB_STRUCT_STAT *sbuf)
+SMB_BIG_UINT get_allocation_size(connection_struct *conn, files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
        SMB_BIG_UINT ret;
 
@@ -1579,51 +1589,21 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                /* CIFS UNIX Extension. */
 
                case SMB_FIND_FILE_UNIX:
-                       DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_UNIX\n"));
+               case SMB_FIND_FILE_UNIX_INFO2:
                        p+= 4;
                        SIVAL(p,0,reskey); p+= 4;    /* Used for continuing search. */
 
                        /* Begin of SMB_QUERY_FILE_UNIX_BASIC */
-                       SOFF_T(p,0,get_file_size(sbuf));             /* File size 64 Bit */
-                       p+= 8;
-
-                       SOFF_T(p,0,get_allocation_size(conn,NULL,&sbuf)); /* Number of bytes used on disk - 64 Bit */
-                       p+= 8;
-
-                       put_long_date_timespec(p,get_ctimespec(&sbuf));       /* Inode change Time 64 Bit */
-                       put_long_date_timespec(p+8,get_atimespec(&sbuf));     /* Last access time 64 Bit */
-                       put_long_date_timespec(p+16,get_mtimespec(&sbuf));    /* Last modification time 64 Bit */
-                       p+= 24;
 
-                       SIVAL(p,0,sbuf.st_uid);               /* user id for the owner */
-                       SIVAL(p,4,0);
-                       p+= 8;
-
-                       SIVAL(p,0,sbuf.st_gid);               /* group id of owner */
-                       SIVAL(p,4,0);
-                       p+= 8;
-
-                       SIVAL(p,0,unix_filetype(sbuf.st_mode));
-                       p+= 4;
-
-                       SIVAL(p,0,unix_dev_major(sbuf.st_rdev));   /* Major device number if type is device */
-                       SIVAL(p,4,0);
-                       p+= 8;
-
-                       SIVAL(p,0,unix_dev_minor(sbuf.st_rdev));   /* Minor device number if type is device */
-                       SIVAL(p,4,0);
-                       p+= 8;
-
-                       SINO_T_VAL(p,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
-                       p+= 8;
-
-                       SIVAL(p,0, unix_perms_to_wire(sbuf.st_mode));     /* Standard UNIX file permissions */
-                       SIVAL(p,4,0);
-                       p+= 8;
-
-                       SIVAL(p,0,sbuf.st_nlink);             /* number of hard links */
-                       SIVAL(p,4,0);
-                       p+= 8;
+                       if (info_level == SMB_FIND_FILE_UNIX) {
+                               DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_UNIX\n"));
+                               p = store_file_unix_basic(conn, p,
+                                                       NULL, &sbuf);
+                       } else {
+                               DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_UNIX_INFO2\n"));
+                               p = store_file_unix_basic_info2(conn, p,
+                                                       NULL, &sbuf);
+                       }
 
                        len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
                        p += len;
@@ -1733,6 +1713,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
                case SMB_FIND_ID_BOTH_DIRECTORY_INFO:
                        break;
                case SMB_FIND_FILE_UNIX:
+               case SMB_FIND_FILE_UNIX_INFO2:
                        if (!lp_unix_extensions()) {
                                return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
@@ -2040,6 +2021,7 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
                case SMB_FIND_ID_BOTH_DIRECTORY_INFO:
                        break;
                case SMB_FIND_FILE_UNIX:
+               case SMB_FIND_FILE_UNIX_INFO2:
                        if (!lp_unix_extensions()) {
                                return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
@@ -2533,6 +2515,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                                        CIFS_UNIX_POSIX_ACLS_CAP|
                                        CIFS_UNIX_POSIX_PATHNAMES_CAP|
                                        CIFS_UNIX_FCNTL_LOCKS_CAP|
+                                       CIFS_UNIX_EXTATTR_CAP|
                                        CIFS_UNIX_POSIX_PATH_OPERATIONS_CAP)));
                        break;
 
@@ -2982,7 +2965,7 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
 static char *store_file_unix_basic(connection_struct *conn,
                                char *pdata,
                                files_struct *fsp,
-                               SMB_STRUCT_STAT *psbuf)
+                               const SMB_STRUCT_STAT *psbuf)
 {
        DEBUG(10,("store_file_unix_basic: SMB_QUERY_FILE_UNIX_BASIC\n"));
        DEBUG(4,("store_file_unix_basic: st_mode=%o\n",(int)psbuf->st_mode));
@@ -3031,6 +3014,116 @@ static char *store_file_unix_basic(connection_struct *conn,
        return pdata;
 }
 
+/* Forward and reverse mappings from the UNIX_INFO2 file flags field and
+ * the chflags(2) (or equivalent) flags.
+ *
+ * XXX: this really should be behind the VFS interface. To do this, we would
+ * need to alter SMB_STRUCT_STAT so that it included a flags and a mask field.
+ * Each VFS module could then implement it's own mapping as appropriate for the
+ * platform. We would then pass the SMB flags into SMB_VFS_CHFLAGS.
+ */
+static const struct {unsigned stat_fflag; unsigned smb_fflag;}
+       info2_flags_map[] =
+{
+#ifdef UF_NODUMP
+    { UF_NODUMP, EXT_DO_NOT_BACKUP },
+#endif
+
+#ifdef UF_IMMUTABLE
+    { UF_IMMUTABLE, EXT_IMMUTABLE },
+#endif
+
+#ifdef UF_APPEND
+    { UF_APPEND, EXT_OPEN_APPEND_ONLY },
+#endif
+
+#ifdef UF_HIDDEN
+    { UF_HIDDEN, EXT_HIDDEN }
+#endif
+
+};
+
+static void map_info2_flags_from_sbuf(const SMB_STRUCT_STAT *psbuf,
+                               uint32 *smb_fflags, uint32 *smb_fmask)
+{
+#ifdef HAVE_STAT_ST_FLAGS
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(info2_flags_map); ++i) {
+           *smb_fmask |= info2_flags_map[i].smb_fflag;
+           if (psbuf->st_flags & info2_flags_map[i].stat_fflag) {
+                   *smb_fflags |= info2_flags_map[i].smb_fflag;
+           }
+       }
+#endif /* HAVE_STAT_ST_FLAGS */
+}
+
+static BOOL map_info2_flags_to_sbuf(const SMB_STRUCT_STAT *psbuf,
+                               const uint32 smb_fflags,
+                               const uint32 smb_fmask,
+                               int *stat_fflags)
+{
+#ifdef HAVE_STAT_ST_FLAGS
+       uint32 max_fmask;
+       int i;
+
+       *stat_fflags = psbuf->st_flags;
+
+       /* For each flags requested in smb_fmask, check the state of the
+        * corresponding flag in smb_fflags and set or clear the matching
+        * stat flag.
+        */
+
+       for (i = 0; i < ARRAY_SIZE(info2_flags_map); ++i) {
+           max_fmask |= info2_flags_map[i].smb_fflag;
+           if (smb_fmask & info2_flags_map[i].smb_fflag) {
+                   if (smb_fflags & info2_flags_map[i].smb_fflag) {
+                           *stat_fflags |= info2_flags_map[i].stat_fflag;
+                   } else {
+                           *stat_fflags &= ~info2_flags_map[i].stat_fflag;
+                   }
+           }
+       }
+
+       /* If smb_fmask is asking to set any bits that are not supported by
+        * our flag mappings, we should fail.
+        */
+       if ((smb_fmask & max_fmask) != smb_fmask) {
+               return False;
+       }
+
+       return True;
+#else
+       return False;
+#endif /* HAVE_STAT_ST_FLAGS */
+}
+
+
+/* Just like SMB_QUERY_FILE_UNIX_BASIC, but with the addition
+ * of file flags and birth (create) time.
+ */
+static char *store_file_unix_basic_info2(connection_struct *conn,
+                               char *pdata,
+                               files_struct *fsp,
+                               const SMB_STRUCT_STAT *psbuf)
+{
+       uint32 file_flags = 0;
+       uint32 flags_mask = 0;
+
+       pdata = store_file_unix_basic(conn, pdata, fsp, psbuf);
+
+       /* Create (birth) time 64 bit */
+       put_long_date_timespec(pdata, get_create_timespec(psbuf, False));
+       pdata += 8;
+
+       map_info2_flags_from_sbuf(psbuf, &file_flags, &flags_mask);
+       SIVAL(pdata, 0, file_flags); /* flags */
+       SIVAL(pdata, 4, flags_mask); /* mask */
+       pdata += 8;
+
+       return pdata;
+}
+
 /****************************************************************************
  Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
  file name or file id).
@@ -3081,6 +3174,10 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
 
                DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
 
+               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+               }
+
                if(fsp && (fsp->fake_file_handle)) {
                        /*
                         * This is actually for the QUOTA_FAKE_FILE --metze
@@ -3137,6 +3234,10 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
 
                DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
+               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+               }
+
                srvstr_get_path(inbuf, fname, &params[6], sizeof(fname), total_params - 6, STR_TERMINATE, &status);
                if (!NT_STATUS_IS_OK(status)) {
                        return ERROR_NT(status);
@@ -3650,6 +3751,22 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        break;
 
+               case SMB_QUERY_FILE_UNIX_INFO2:
+
+                       pdata = store_file_unix_basic_info2(conn, pdata, fsp, &sbuf);
+                       data_size = PTR_DIFF(pdata,(*ppdata));
+
+                       {
+                               int i;
+                               DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
+
+                               for (i=0; i<100; i++)
+                                       DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
+                               DEBUG(4,("\n"));
+                       }
+
+                       break;
+
                case SMB_QUERY_FILE_UNIX_LINK:
                        {
                                pstring buffer;
@@ -5027,6 +5144,67 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                                ts);
 }
 
+/****************************************************************************
+ Deal with SMB_SET_FILE_UNIX_INFO2.
+****************************************************************************/
+
+static NTSTATUS smb_set_file_unix_info2(connection_struct *conn,
+                                       const char *pdata,
+                                       int total_data,
+                                       files_struct *fsp,
+                                       const char *fname,
+                                       SMB_STRUCT_STAT *psbuf)
+{
+       NTSTATUS status;
+       uint32 smb_fflags;
+       uint32 smb_fmask;
+
+       if (total_data < 116) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* Start by setting all the fields that are common between UNIX_BASIC
+        * and UNIX_INFO2.
+        */
+       status = smb_set_file_unix_basic(conn, pdata, total_data,
+                               fsp, fname, psbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       smb_fflags = IVAL(pdata, 108);
+       smb_fmask = IVAL(pdata, 112);
+
+       /* NB: We should only attempt to alter the file flags if the client
+        * sends a non-zero mask.
+        */
+       if (smb_fmask != 0) {
+               int stat_fflags = 0;
+
+               if (!map_info2_flags_to_sbuf(psbuf, smb_fflags, smb_fmask,
+                           &stat_fflags)) {
+                       /* Client asked to alter a flag we don't understand. */
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               if (fsp && fsp->fh->fd != -1) {
+                       /* XXX: we should be  using SMB_VFS_FCHFLAGS here. */
+                       return NT_STATUS_NOT_SUPPORTED;
+               } else {
+                       if (SMB_VFS_CHFLAGS(conn, fname, stat_fflags) != 0) {
+                               return map_nt_error_from_unix(errno);
+                       }
+               }
+       }
+
+       /* XXX: need to add support for changing the create_time here. You
+        * can do this for paths on Darwin with setattrlist(2). The right way
+        * to hook this up is probably by extending the VFS utimes interface.
+        */
+
+       return NT_STATUS_OK;
+}
+
 /****************************************************************************
  Create a directory with POSIX semantics.
 ****************************************************************************/
@@ -5094,11 +5272,16 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
        SSVAL(pdata,0,NO_OPLOCK_RETURN);
        SSVAL(pdata,2,0);
 
-       if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
+       switch (info_level_return) {
+       case SMB_QUERY_FILE_UNIX_BASIC:
                SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_BASIC);
                SSVAL(pdata,6,0); /* Padding. */
                store_file_unix_basic(conn, pdata + 8, fsp, psbuf);
-       } else {
+       case SMB_QUERY_FILE_UNIX_INFO2:
+               SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_INFO2);
+               SSVAL(pdata,6,0); /* Padding. */
+               store_file_unix_basic_info2(conn, pdata + 8, fsp, psbuf);
+       default:
                SSVAL(pdata,4,SMB_NO_INFO_LEVEL_RETURNED);
                SSVAL(pdata,6,0); /* Padding. */
        }
@@ -5265,11 +5448,16 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
        }
 
        SSVAL(pdata,2,fsp->fnum);
-       if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
+       switch (info_level_return) {
+       case SMB_QUERY_FILE_UNIX_BASIC:
                SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_BASIC);
                SSVAL(pdata,6,0); /* padding. */
                store_file_unix_basic(conn, pdata + 8, fsp, psbuf);
-       } else {
+       case SMB_QUERY_FILE_UNIX_INFO2:
+               SSVAL(pdata,4,SMB_QUERY_FILE_UNIX_INFO2);
+               SSVAL(pdata,6,0); /* padding. */
+               store_file_unix_basic_info2(conn, pdata + 8, fsp, psbuf);
+       default:
                SSVAL(pdata,4,SMB_NO_INFO_LEVEL_RETURNED);
                SSVAL(pdata,6,0); /* padding. */
        }
@@ -5607,6 +5795,17 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
                        break;
                }
 
+               case SMB_SET_FILE_UNIX_INFO2:
+               {
+                       status = smb_set_file_unix_info2(conn,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname,
+                                                       &sbuf);
+                       break;
+               }
+
                case SMB_SET_FILE_UNIX_LINK:
                {
                        if (tran_call != TRANSACT2_SETPATHINFO) {