From 5f7ee360567a6b4e1a6f43ff01da057d2998fef8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 25 Sep 1998 23:40:49 +0000
Subject: Makefile.in: Fixed bug with continuation line causing proto to fail. 
             Added $(PROGS) $(SPROGS) as targets for make clean. acconfig.h:
 Added HAVE_IRIX_SPECIFIC_CAPABILITIES. configure.in: Added sys/capability.h
 header check.               Added function checks for srandom random srand
 rand.               Added HAVE_IRIX_SPECIFIC_CAPABILITIES test. includes.h:
 Added #include <sys/capability.h>. ntdomain.h: Moved struct acct_info into
 here from smb.h smb.h: Added KERNEL_OPLOCK_CAPABILITY define.        Moved
 enum action_type into rpcclient.h        Moved struct cli_state into client.h
        Moved struct nt_client_info, struct tar_client_info, struct
 client_info              into rpcclient.h lib/genrand.c: Changed to use
 sys_random() & friends. lib/smbrun.c: Lose capabilities after fork.
 lib/system.c: Added set_process_capability(),
 set_inherited_process_capability()               sys_random(), sys_srandom().
 lib/util.c: Added Ander's EFBIG lock check to fcntl_lock for 64 bit access to
 an             32 bit mounted NFS filesystem. nmbd/nmbd.c: Changed to use
 sys_random() & friends. nmbd/nmbd_browsesync.c: Changed to use sys_random() &
 friends. passdb/ldap.c: Missed one pdb_encode_acct_ctrl call.
 passdb/passdb.c: Changed to Ander's code for ' ' characters.
 passdb/smbpass.c: Added Ander's code to reset ACB_PWNOTREQ.
 script/mkproto.awk: Added 'long' to prototypes. smbd/chgpasswd.c: Lose
 capabilities after fork. smbd/open.c: Do the mmap *after* the kernel oplock.
 smbd/oplock.c: Removed stub code from kernel oplock path.               
 Added set_process_capability(), set_inherited_process_capability() calls.
 smbd/reply.c: Initialize count = 0, offset = 0. smbd/server.c: Added
 set_process_capability(), set_inherited_process_capability() calls.
 tests/summary.c: Ensure we have RANDOM or RAND. utils/smbpasswd.c: Added
 Ander's code to reset ACB_PWNOTREQ. utils/torture.c: Changed to use
 sys_random() & friends.

Jeremy.
(This used to be commit e8be306f23963ac00b1a383ebe0cc1421529fb02)
---
 source3/smbd/oplock.c | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

(limited to 'source3/smbd/oplock.c')

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index b418e7cd54..27d802c151 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -240,39 +240,9 @@ BOOL set_file_oplock(files_struct *fsp)
 {
 #if defined(HAVE_KERNEL_OPLOCKS)
   if(lp_kernel_oplocks()) {
-#if 0 /* for now. */
-    extern struct current_user current_user;
-#endif
-    int saved_errno;
-    int fcntl_ret;
 
-#if 0 /* for now. */
-    /*
-     * Go back to being root.
-     */
-
-    unbecome_user();
-#endif
-
-    fcntl_ret = fcntl(fsp->fd_ptr->fd, F_OPLKREG, oplock_pipe_write);
-    saved_errno = errno;
-
-#if 0 /* for now. */
-    /*
-     * Go back to being the correct user.
-     */
-    if(!become_user(fsp->conn, current_user.vuid))
-    {
-      DEBUG( 0, ( "set_file_oplock: unable to re-become user!" ) );
-      DEBUGADD( 0, ( "Shutting down server\n" ) );
-      close_sockets();
-      close(oplock_sock);
-      exit_server("unable to re-become user");
-    }
-#endif
-
-    if(fcntl_ret < 0) {
-      if(saved_errno != EAGAIN) {
+    if(fcntl(fsp->fd_ptr->fd, F_OPLKREG, oplock_pipe_write) < 0 ) {
+      if(errno != EAGAIN) {
         DEBUG(0,("set_file_oplock: Unable to get kernel oplock on file %s, dev = %x, \
 inode = %.0f. Error was %s\n", 
               fsp->fsp_name, (unsigned int)fsp->fd_ptr->dev, (double)fsp->fd_ptr->inode,
@@ -284,6 +254,10 @@ inode = %.0f. Another process had the file open.\n",
       }
       return False;
     }
+
+    DEBUG(10,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f\n",
+          fsp->fsp_name, (unsigned int)fsp->fd_ptr->dev, (double)fsp->fd_ptr->inode));
+
   }
 #endif /* HAVE_KERNEL_OPLOCKS */
 
@@ -305,7 +279,8 @@ inode = %.0f. Another process had the file open.\n",
 static void release_file_oplock(files_struct *fsp)
 {
 #if defined(HAVE_KERNEL_OPLOCKS)
-  if(fsp->granted_oplock && lp_kernel_oplocks())
+
+  if(lp_kernel_oplocks())
   {
     if( DEBUGLVL( 10 ))
     {
@@ -320,7 +295,7 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->fd_ptr->dev,
     }
 
     /*
-     * Remove the kernel oplock on this file.
+     * Remote the kernel oplock on this file.
      */
 
     if(fcntl(fsp->fd_ptr->fd, F_OPLKACK, OP_REVOKE) < 0)
@@ -1057,6 +1032,9 @@ void check_kernel_oplocks(void)
     int pfd[2];
     pstring tmpname;
 
+    set_process_capability(KERNEL_OPLOCK_CAPABILITY,True);
+    set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY,True);
+
     slprintf( tmpname, sizeof(tmpname)-1, "/tmp/ot.%d.XXXXXX", (unsigned int)getpid());
     mktemp(tmpname);
 
-- 
cgit