Changeset 223 for branches/samba-3.3.x/source/modules

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

Location:

branches/samba-3.3.x/source/modules

Files:

• gpfs.c (modified) (3 diffs)
• vfs_gpfs.c (modified) (1 diff)
• vfs_streams_depot.c (modified) (2 diffs)

branches/samba-3.3.x/source/modules/gpfs.c

@@ -27 +27 @@
 static bool gpfs_share_modes;
 static bool gpfs_leases;
+static bool gpfs_getrealfilename;
 
 static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
@@ -140 +141 @@
                                     int *buflen)
 {
-        if (gpfs_get_realfilename_path_fn == NULL) {
+        if ((!gpfs_getrealfilename)
+            || (gpfs_get_realfilename_path_fn == NULL)) {
                 errno = ENOSYS;
                 return -1;
@@ -209 +211 @@
         gpfs_share_modes = lp_parm_bool(-1, "gpfs", "sharemodes", True);
         gpfs_leases      = lp_parm_bool(-1, "gpfs", "leases", True);
+        gpfs_getrealfilename = lp_parm_bool(-1, "gpfs", "getrealfilename",
+                                            True);
 
         return;

branches/samba-3.3.x/source/modules/vfs_gpfs.c

@@ -96 +96 @@
 
         TALLOC_FREE(full_path);
+
+        if ((result == -1) && (errno == ENOSYS)) {
+                return SMB_VFS_NEXT_GET_REAL_FILENAME(
+                        handle, path, name, mem_ctx, found_name);
+        }
 
         if (result == -1) {

branches/samba-3.3.x/source/modules/vfs_streams_depot.c

@@ -79 +79 @@
         DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-        if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+        if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
                                   &buf, sizeof(buf)) != sizeof(buf)) {
                 DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
@@ -105 +105 @@
         DEBUG(10, ("marking file %s as valid\n", path));
 
-        ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+        ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
                                     &buf, sizeof(buf), 0);