Author: lmuelle Date: 2006-02-20 16:11:02 +0000 (Mon, 20 Feb 2006) New Revision: 918
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=918 Log: Remove bug3349.patch -> fixed with 21a. Reactivate fetch-patches as we have a solution to provide more than one patch set with different series files. See the previous checkin. Removed: trunk/patches/bug3349.patch Modified: trunk/patches/index.html Changeset: Deleted: trunk/patches/bug3349.patch =================================================================== --- trunk/patches/bug3349.patch 2006-02-20 16:01:39 UTC (rev 917) +++ trunk/patches/bug3349.patch 2006-02-20 16:11:02 UTC (rev 918) @@ -1,89 +0,0 @@ -## -## V1 of patch to address oplock logic error when -## sending break requests to other smbd processes -## -diff -uBbrN --exclude-from=diff.excludes samba-3.0.21-orig/source/smbd/close.c samba-3.0.21/source/smbd/close.c ---- samba-3.0.21-orig/source/smbd/close.c 2005-11-09 12:28:54.000000000 -0600 -+++ samba-3.0.21/source/smbd/close.c 2005-12-29 22:05:14.000000000 -0600 -@@ -130,8 +130,10 @@ - */ - schedule_deferred_open_smb_message(e->op_mid); - } else { -+ become_root(); - message_send_pid(e->pid, MSG_SMB_OPEN_RETRY, - e, sizeof(*e), True); -+ unbecome_root(); - } - } - } -diff -uBbrN --exclude-from=diff.excludes samba-3.0.21-orig/source/smbd/open.c samba-3.0.21/source/smbd/open.c ---- samba-3.0.21-orig/source/smbd/open.c 2005-11-09 12:28:54.000000000 -0600 -+++ samba-3.0.21/source/smbd/open.c 2005-12-29 22:05:14.000000000 -0600 -@@ -682,11 +682,15 @@ - } - - if (delay_it) { -+ BOOL ret; - DEBUG(10, ("Sending break request to PID %s\n", - procid_str_static(&exclusive->pid))); - exclusive->op_mid = get_current_mid(); -- if (!message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST, -- exclusive, sizeof(*exclusive), True)) { -+ become_root(); -+ ret = message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST, -+ exclusive, sizeof(*exclusive), True); -+ unbecome_root(); -+ if (!ret) { - DEBUG(3, ("Could not send oplock break message\n")); - } - file_free(fsp); -diff -uBbrN --exclude-from=diff.excludes samba-3.0.21-orig/source/smbd/oplock.c samba-3.0.21/source/smbd/oplock.c ---- samba-3.0.21-orig/source/smbd/oplock.c 2005-10-17 21:44:56.000000000 -0500 -+++ samba-3.0.21/source/smbd/oplock.c 2005-12-29 22:05:14.000000000 -0600 -@@ -398,8 +398,10 @@ - * get to process this message, we have closed the file. Reply - * with 'ok, oplock broken' */ - DEBUG(3, ("Did not find fsp\n")); -+ become_root(); - message_send_pid(src, MSG_SMB_BREAK_RESPONSE, - msg, sizeof(*msg), True); -+ unbecome_root(); - return; - } - -@@ -418,8 +420,10 @@ - DEBUG(3, ("Already downgraded oplock on %.0f/%.0f: %s\n", - (double)fsp->dev, (double)fsp->inode, - fsp->fsp_name)); -+ become_root(); - message_send_pid(src, MSG_SMB_BREAK_RESPONSE, - msg, sizeof(*msg), True); -+ unbecome_root(); - return; - } - -@@ -545,11 +549,13 @@ - { - int i; - -+ become_root(); - for (i=0; i<fsp->num_pending_break_messages; i++) { - struct share_mode_entry *msg = &fsp->pending_break_messages[i]; - message_send_pid(msg->pid, MSG_SMB_BREAK_RESPONSE, - msg, sizeof(*msg), True); - } -+ unbecome_root(); - - SAFE_FREE(fsp->pending_break_messages); - fsp->num_pending_break_messages = 0; -@@ -686,8 +692,10 @@ - abort(); - } - -+ become_root(); - message_send_pid(share_entry->pid, MSG_SMB_ASYNC_LEVEL2_BREAK, - share_entry, sizeof(*share_entry), True); -+ unbecome_root(); - } - - remove_all_share_oplocks(lck, fsp); Modified: trunk/patches/index.html =================================================================== --- trunk/patches/index.html 2006-02-20 16:01:39 UTC (rev 917) +++ trunk/patches/index.html 2006-02-20 16:11:02 UTC (rev 918) @@ -17,7 +17,6 @@ $ cd source </pre> -<!-- <p>Or use the <a href="http://savannah.nongnu.org/projects/quilt";>quilt</a> tool to apply all patches to a known series.</p> @@ -28,7 +27,6 @@ $ quilt push -a $ cd source </pre> ---> <p>....build Samba as normal....</p> @@ -37,23 +35,25 @@ source/ directory. In all cases, it is best to do a clean build after applying any patches.</p> +<p>No patches available at the moment.</p> <!-- Each release gets its own table. --> +<!-- <table class="real"> <thead> - <tr><th colspan="2"><b>Samba 3.0.21</b></th></tr> + <tr><th colspan="2"><b>Samba 3.0.21c</b></th></tr> </thead> <tbody> <tr> <td><em>Patch</em></td><td><em>Description</em></td> </tr> <tr> - <td><a href="/samba/patches/bug3349.patch">BUG 3349</a></td> - <td>Fix for possible client hangs when multiple users access a - share concurrently and oplocks are enabled.</td> + <td><a href="/samba/patches/<filename>">BUG ID</a></td> + <td>Fix for ...</td> </tr> </tbody> </table> +--> <p> </p>
