svn commit: samba r20711 - in branches/SAMBA_3_0_24/source/smbd: .
jpeach at samba.org
jpeach at samba.org
Fri Jan 12 17:13:51 GMT 2007
Author: jpeach
Date: 2007-01-12 17:13:51 +0000 (Fri, 12 Jan 2007)
New Revision: 20711
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20711
Log:
Merge Volker's fix for bug 4326.
svn merge -r 20698:20699 branches/SAMBA_3_0
Modified:
branches/SAMBA_3_0_24/source/smbd/notify_fam.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/smbd/notify_fam.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/notify_fam.c 2007-01-12 17:02:55 UTC (rev 20710)
+++ branches/SAMBA_3_0_24/source/smbd/notify_fam.c 2007-01-12 17:13:51 UTC (rev 20711)
@@ -432,7 +432,8 @@
* request.
*/
- if (info->generation == global_fc_generation) {
+ if ((FAMCONNECTION_GETFD(&global_fc) != -1)
+ && (info->generation == global_fc_generation)) {
DEBUG(FAM_TRACE, ("removing FAM notification for request %d\n",
info->req.reqnum));
FAMCancelMonitor(&global_fc, &(info->req));
More information about the samba-cvs
mailing list