summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-01-12 08:49:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:04 -0500
commit93433501021bf6df00df3135992ed021385cfce6 (patch)
tree7a660f8885bf0e9bf7be7adef06d280b283c931c
parentb86d6b75c02576eae7c19c9018273a176b1c376a (diff)
downloadsamba-93433501021bf6df00df3135992ed021385cfce6.tar.gz
samba-93433501021bf6df00df3135992ed021385cfce6.tar.bz2
samba-93433501021bf6df00df3135992ed021385cfce6.zip
r20699: 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 (This used to be commit a841b7659ba7b76b2da7993e1f4402aa0e11716f)
-rw-r--r--source3/smbd/notify_fam.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/notify_fam.c b/source3/smbd/notify_fam.c
index b7f9a36332..bfef4ac871 100644
--- a/source3/smbd/notify_fam.c
+++ b/source3/smbd/notify_fam.c
@@ -432,7 +432,8 @@ fam_remove_notify(void * data)
* 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));