Changeset 736 for branches/samba-3.5.x/source3/modules

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

Location:

branches/samba-3.5.x/source3/modules

Files:

• vfs_default.c (modified) (1 diff)
• vfs_gpfs.c (modified) (1 diff)

branches/samba-3.5.x/source3/modules/vfs_default.c

@@ -1134 +1134 @@
 
 #ifdef HAVE_KERNEL_OPLOCKS_LINUX
-        /* first set the signal handler */
-        if(linux_set_lease_sighandler(fsp->fh->fd) == -1) {
-                return -1;
-        }
-
         result = linux_setlease(fsp->fh->fd, leasetype);
 #else

branches/samba-3.5.x/source3/modules/vfs_gpfs.c

@@ -587 +587 @@
 
         result = gpfs2smb_acl(pacl);
-        if (result == NULL) {
-                goto done;
+        if (result != NULL) {
+                errno = 0;
         }