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

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-12 08:49:09 +0000 (Fri, 12 Jan 2007)
New Revision: 20699

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

Log:
This is an attempt to fix bug 4326.

James, can you please confirm this and merge it to 3_0_24? For me it fixes the
segfault.

Thanks,

Volker

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


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/notify_fam.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/notify_fam.c	2007-01-12 05:47:00 UTC (rev 20698)
+++ branches/SAMBA_3_0/source/smbd/notify_fam.c	2007-01-12 08:49:09 UTC (rev 20699)
@@ -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));