Changeset 736 for branches/samba-3.5.x/source3/smbd/oplock_linux.c

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

File:

• branches/samba-3.5.x/source3/smbd/oplock_linux.c (modified) (1 diff)

branches/samba-3.5.x/source3/smbd/oplock_linux.c

@@ -75 +75 @@
         int ret;
 
+        /* First set the signal handler. */
+        if (linux_set_lease_sighandler(fd) == -1) {
+                return -1;
+        }
         ret = fcntl(fd, F_SETLEASE, leasetype);
         if (ret == -1 && errno == EACCES) {
                 set_effective_capability(LEASE_CAPABILITY);
+                /*
+                 * Bug 8974 - work around Linux kernel bug
+                 * https://bugzilla.kernel.org/show_bug.cgi?id=43336.
+                 * "fcntl(F_SETLEASE) resets signal number when
+                 *  called multiple times"
+                 */
+                if (linux_set_lease_sighandler(fd) == -1) {
+                        return -1;
+                }
                 ret = fcntl(fd, F_SETLEASE, leasetype);
         }