svn commit: samba r6252 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-04-08 19:21:41 +0000 (Fri, 08 Apr 2005)
New Revision: 6252

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6252

Log:
Re-order position of become_root() to allow directory to be
read first.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/oplock.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/oplock.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/oplock.c	2005-04-08 19:21:35 UTC (rev 6251)
+++ branches/SAMBA_3_0/source/smbd/oplock.c	2005-04-08 19:21:41 UTC (rev 6252)
@@ -805,7 +805,6 @@
 	saved_user_conn = current_user.conn;
 	saved_vuid = current_user.vuid;
 	saved_fsp_conn = fsp->conn;
-	change_to_root_user();
 	/*
 	 * Initialize saved_dir to something sensible: vfs_GetWd may not work well
 	 * for root: the directory may be NFS-mounted and exported with root_squash
@@ -816,6 +815,10 @@
 	/* Save the chain fnum. */
 	file_chain_save();
 
+	pstrcpy(file_name, fsp->fsp_name);
+
+	change_to_root_user();
+
 	/*
 	 * From Charles Hoch <hoch at exemplary.com>. If the break processing
 	 * code closes the file (as it often does), then the fsp pointer here
@@ -823,8 +826,6 @@
 	 * around the loop.
 	 */
 
-	pstrcpy(file_name, fsp->fsp_name);
-
 	while((fsp = initial_break_processing(dev, inode, file_id)) &&
 			OPEN_FSP(fsp) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
 		if(receive_smb(smbd_server_fd(),inbuf, timeout) == False) {