diff --git a/configure.in b/configure.in

index e4b684e..5836bb7 100644

--- a/configure.in

+++ b/configure.in

@@ -42,6 +42,12 @@ if test -z "$ENV_CFLAGS"; then

 	CFLAGS=""

 fi

+dnl If the user set no CFLAGS, then don't assume the autotools defaults of

+dnl "-g -O2". We set default CFLAGS later based on the --disable-debug flag.

+if test -z "$ENV_CFLAGS"; then

+	CFLAGS=""

+fi

+

 dnl for the spec file

 RELDATE=`date +'%a %b %e %Y'`

 AC_SUBST(RELDATE)

@@ -279,6 +285,43 @@ if test x$kqueue = xtrue; then

 	backends="${backends}, kqueue"

 fi

+case "$os" in

+    solaris*)

+	AM_CONDITIONAL(ON_SOLARIS, true)

+	AC_COMPILE_IFELSE([

+		#include <port.h>

+		#ifndef PORT_SOURCE_FILE

+		#error "Please upgrade to Nevada 72 or above to suppoert FEN"

+		#endif

+		int main() { return 0; }

+		],[have_fen=1],)

+	if test x$have_fen = x1 ; then

+            AC_ARG_ENABLE(fen,

+		AC_HELP_STRING([--disable-fen], [Disable the FEN backend]),

+                       [fen="${enableval}"], [fen=true])

+

+		if test x$fen = xyes; then

+                       fen=true

+		elif test x$fen = xno; then

+                       fen=false

+		elif test x$fen != xtrue; then

+                       AC_MSG_ERROR(bad value ${enableval} for --disable-fen)

+		fi

+	fi

+	break;

+	;;

+    *)

+	fen=false

+	break;

+	;;

+esac

+

+AM_CONDITIONAL(ENABLE_FEN, test x$fen = xtrue)

+if test x$fen = xtrue; then

+	AC_DEFINE(ENABLE_FEN,1,[Use Solaris FEN as backend])

+	backends="${backends}, FEN"

+fi

+

 dnl pthread support for reentrance of the client library.

 AC_ARG_WITH(threads,

 [  --with-threads          add multithread support(on)])

@@ -387,6 +430,14 @@ if test x$dbus_have_struct_cmsgcred = xyes; then

     AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure])

 fi

+dnl Check for getpeerucred support - Solaris

+

+AC_CHECK_HEADER(ucred.h,

+    AC_CHECK_LIB(c, getpeerucred,[

+        AC_DEFINE([HAVE_GETPEERUCRED],[],[Define if has getpeerucred])

+        AC_DEFINE([HAVE_UCRED_H],[],[Define if <ucred.h> exists])]))

+

+

 #### Abstract sockets

 AC_MSG_CHECKING(abstract socket namespace)

@@ -531,6 +582,16 @@ AC_SUBST(PYTHON_VERSION)

 AC_SUBST(PYTHON_INCLUDES)

 AC_SUBST(PYTHON_SITE_PACKAGES)

+dnl Check for -lsocket -lnsl

+

+AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))

+AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))

+

+dnl Check for <sys/mnttab.h>

+

+AC_CHECK_HEADER(sys/mnttab.h,

+	AC_DEFINE([HAVE_SYS_MNTTAB_H], [], [Define if <sys/mnttab.h> is there]))

+

 dnl After all config-related tweaking of CFLAGS, set it to its "build" value

 AC_MSG_CHECKING(for more compiler warnings)

diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am

index 35aa740..4f725a2 100644

--- a/libgamin/Makefile.am

+++ b/libgamin/Makefile.am

@@ -39,13 +39,24 @@ CLEANFILES=gam_error.c gam_event.c

 libgamin_1_la_LIBADD =

+if ON_SOLARIS

+libgamin_1_la_LDFLAGS = -Wl,-M$(srcdir)/gamin_sym.version \

+                        -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@

+else

 libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \

                         -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@

+endif

 libfam_la_SOURCES = $(libgamin_1_la_SOURCES)

 libfam_la_LIBADD = $(libgamin_1_la_LIBADD)

-libfam_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version	\

+

+if ON_SOLARIS

+libfam_la_LDFLAGS = -Wl,-M$(srcdir)/gamin_sym.version	\

                     -version-info @FAM_VERSION_INFO@ @THREAD_LIBS@

+else

+libfam_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version   \

+                    -version-info @FAM_VERSION_INFO@ @THREAD_LIBS@

+endif

 #

 # Compile a program locally to check

diff --git a/libgamin/gam_api.c b/libgamin/gam_api.c

index 4e87e63..3630213 100644

--- a/libgamin/gam_api.c

+++ b/libgamin/gam_api.c

@@ -14,6 +14,12 @@

 #include <sys/socket.h>

 #include <sys/un.h>

 #include <sys/uio.h>

+#if defined(sun)

+#include <string.h>

+#endif

+#if defined(HAVE_UCRED_H)

+#include <ucred.h>

+#endif defined(HAVE_UCRED_H)

 #include "fam.h"

 #include "gam_protocol.h"

 #include "gam_data.h"

@@ -660,6 +666,10 @@ gamin_check_cred(GAMDataPtr conn, int fd)

     } cmsg;

 #endif

+#if defined(HAVE_GETPEERUCRED)

+    ucred_t *creds;

+#endif

+

     s_uid = getuid();

 #if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)

@@ -726,11 +736,25 @@ retry:

                       fd, cr_len, (int) sizeof(cr));

             goto failed;

         }

+#elif defined(HAVE_GETPEERUCRED)

+        if ((creds = (ucred_t *)malloc(ucred_size()))==(ucred_t *)NULL){

+            GAM_DEBUG(DEBUG_INFO,"Malloc failed for ucreds");

+            goto failed;

+        }

+

+        if (getpeerucred(fd, &creds)!=0){

+            GAM_DEBUG(DEBUG_INFO,"getpeerucred call failed");

+            goto failed;

+        }

+        c_uid = ucred_getruid(creds);

+        c_gid = ucred_getrgid(creds);

+        c_pid = ucred_getpid(creds);

+        ucred_free(creds);

 #elif defined(HAVE_CMSGCRED)

         c_pid = cmsg.cred.cmcred_pid;

         c_uid = cmsg.cred.cmcred_euid;

         c_gid = cmsg.cred.cmcred_groups[0];

-#else /* !SO_PEERCRED && !HAVE_CMSGCRED */

+#else /* !SO_PEERCRED && !HAVE_CMSGCRED && !HAVE_GETPEERUCRED */

         GAM_DEBUG(DEBUG_INFO,

                   "Socket credentials not supported on this OS\n");

         goto failed;

diff --git a/libgamin/gamin_sym.version b/libgamin/gamin_sym.version

index dba5f20..5c6d661 100644

--- a/libgamin/gamin_sym.version

+++ b/libgamin/gamin_sym.version

@@ -2,8 +2,6 @@

    global:

        FAMCancelMonitor;

        FAMClose;

-       FAMDebugLevel;

-       FAMDebug;

        FamErrlist;

        FAMErrno;

        FAMMonitorCollection;

diff --git a/server/Makefile.am b/server/Makefile.am

index 37aed8b..7964d17 100644

--- a/server/Makefile.am

+++ b/server/Makefile.am

@@ -10,7 +10,7 @@ INCLUDES =						\

 	-DG_DISABLE_DEPRECATED				

 if GAMIN_DEBUG

-INCLUDES += -DGAM_DEBUG_ENABLED

+INCLUDES += -DGAM_DEBUG_ENABLED -g

 endif

@@ -68,6 +68,18 @@ if ENABLE_KQUEUE

 gam_server_SOURCES += gam_kqueue.c gam_kqueue.h

 endif

+if ENABLE_FEN

+gam_server_SOURCES += gam_fen.c gam_fen.h		\

+	fen-dump.c		\

+	fen-dump.h		\

+	fen-kernel.c 		\

+	fen-kernel.h 		\

+	fen-helper.c 		\

+	fen-helper.h		\

+	fen-node.c		\

+	fen-node.h

+endif

+

 if ENABLE_HURD_MACH_NOTIFY

 gam_server_SOURCES += gam_hurd_mach_notify.c gam_hurd_mach_notify.h

diff --git a/server/fen-dump.c b/server/fen-dump.c

new file mode 100644

index 0000000..98d20eb

--- /dev/null

+++ b/server/fen-dump.c

@@ -0,0 +1,77 @@

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

+/* vim:set expandtab ts=4 shiftwidth=4: */

+/* 

+ * Copyright (c) 2008, 2010 Oracle and/or its affiliates, Inc. All rights

+ * reserved.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2 of the License, or (at your option) any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General

+ * Public License along with this library; if not, write to the

+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,

+ * Boston, MA 02111-1307, USA.

+ *

+ * Authors: Lin Ma <[email protected]>

+ */

+

+#include "config.h"

+#include <glib.h>

+#include <glib/gprintf.h>

+#include "fen-node.h"

+#include "fen-dump.h"

+

+G_LOCK_EXTERN (fen_lock);

+

+/*-------------------- node ------------------*/

+static void

+dump_node (node_t* node, gpointer data)

+{

+    g_printf ("n:0x%p ds:0x%p s:0x%p %s\n", node, node->dir_subs, node->subs, NODE_NAME(node));

+}

+

+static void

+dump_tree (node_t* node)

+{

+    if (G_TRYLOCK (fen_lock)) {

+        node_traverse(NULL, dump_node, NULL);

+        G_UNLOCK (fen_lock);

+    }

+}

+

+/* ------------------ fdata port hash --------------------*/

+void

+dump_hash_cb (gpointer key,

+  gpointer value,

+  gpointer user_data)

+{

+    g_printf ("k:0x%p v:0x%p >\n", key, value);

+}

+

+gboolean

+dump_hash (GHashTable* hash, gpointer user_data)

+{

+    if (G_TRYLOCK (fen_lock)) {

+        if (g_hash_table_size (hash) > 0) {

+            g_hash_table_foreach (hash, dump_hash_cb, user_data);

+        }

+        G_UNLOCK (fen_lock);

+    }

+    return TRUE;

+}

+

+/* ------------------ event --------------------*/

+void

+dump_event (node_event_t* ev, gpointer user_data)

+{

+    node_t* node = ev->user_data;

+    g_printf ("ne:0x%p e:%p n:0x%p ds:0x%p s:0x%p s\n", ev, ev->e, node, node->dir_subs, node->subs, NODE_NAME(node));

+}

+

diff --git a/server/fen-dump.h b/server/fen-dump.h

new file mode 100644

index 0000000..ffac822

--- /dev/null

+++ b/server/fen-dump.h

@@ -0,0 +1,29 @@

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

+/* vim:set expandtab ts=4 shiftwidth=4: */

+/* 

+ * Copyright (c) 2008, 2010 Oracle and/or its affiliates, Inc. All rights

+ * reserved.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2 of the License, or (at your option) any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General

+ * Public License along with this library; if not, write to the

+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,

+ * Boston, MA 02111-1307, USA.

+ *

+ * Authors: Lin Ma <[email protected]>

+ */

+

+#ifndef _FEN_DUMP_H_

+#define _FEN_DUMP_H_

+

+

+#endif /* _FEN_DUMP_H_ */

diff --git a/server/fen-helper.c b/server/fen-helper.c

new file mode 100644

index 0000000..e68e7c3

--- /dev/null

+++ b/server/fen-helper.c

@@ -0,0 +1,197 @@

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

+/* vim:set expandtab ts=4 shiftwidth=4: */

+/* 

+ * Copyright (c) 2008, 2010 Oracle and/or its affiliates, Inc. All rights

+ * reserved.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2 of the License, or (at your option) any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General

+ * Public License along with this library; if not, write to the

+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,

+ * Boston, MA 02111-1307, USA.

+ *

+ * Authors: Lin Ma <[email protected]>

+ */

+

+#include "config.h"

+#include <glib.h>

+#include "fen-helper.h"

+#include "fen-kernel.h"

+#ifdef GIO_COMPILATION

+#include "gfilemonitor.h"

+#else

+#include "gam_event.h"

+#include "gam_server.h"

+#include "gam_protocol.h"

+#endif

+

+#ifdef GIO_COMPILATION

+#define FH_W if (fh_debug_enabled) g_debug

+static gboolean fh_debug_enabled = FALSE;

+#else

+#include "gam_error.h"

+#define FH_W(...) GAM_DEBUG(DEBUG_INFO, __VA_ARGS__)

+#endif

+

+G_LOCK_EXTERN (fen_lock);

+

+/* misc */

+static void

+scan_children_init(node_t *f, gpointer sub)

+{

+    gboolean emit;

+    gint event;

+

+    FH_W ("%s %s [0x%p]\n", __func__, NODE_NAME(f), f);

+

+#ifdef GIO_COMPILATION

+    emit = FALSE;

+    event = G_FILE_MONITOR_EVENT_CREATED;

+#else

+    emit = TRUE;

+    event = GAMIN_EVENT_EXISTS;

+#endif

+

+    if (!NODE_HAS_FLAG(f, NODE_FLAG_SNAPSHOT_UPDATED)) {

+        /* TODO snapshot should also compare to the sub created timestamp. */

+        /* GIO initially doesn't emit created/existed events. */

+        node_create_children_snapshot(f, event, emit);

+    } else {

+        GHashTableIter iter;

+        gpointer value;

+

+        g_hash_table_iter_init (&iter, f->children);

+        while (g_hash_table_iter_next (&iter, NULL, &value)) {

+            node_t *child = (node_t *)value;

+

+#ifdef GIO_COMPILATION

+            /* GIO initially doesn't emit created/existed events. */

+            /* g_file_monitor_emit_event(G_FILE_MONITOR(sub), child->gfile, NULL, event); */

+#else

+            gam_server_emit_one_event(NODE_NAME(child), gam_subscription_is_dir(sub), event, sub, 1);

+#endif

+        }

+    }

+}

+

+/**

+ * fen_add

+ * 

+ * Won't hold a ref, we have a timout callback to clean unused node_t.

+ * If there is no value for a key, add it and return it; else return the old

+ * one.

+ */

+void

+fen_add (const gchar *filename, gpointer sub, gboolean is_mondir)

+{

+	node_t* f;

+

+    g_assert (filename);

+    g_assert (sub);

+

+    G_LOCK (fen_lock);

+	f = node_find(NULL, filename, TRUE);

+    FH_W ("%s 0x%p sub[0x%p] %s\n", __func__, f, sub, filename);

+    g_assert (f);

+

+    /* Update timestamp, the events in global queue will compare itself to this

+     * timestamp to decide if be emitted. TODO, timestamp should be per sub.

+     */

+    if (!NODE_IS_ACTIVE(f)) {

+        g_get_current_time(&f->atv);

+    }

+

+    if (is_mondir) {

+        f->dir_subs = g_list_prepend(f->dir_subs, sub);

+    } else {

+        f->subs = g_list_prepend(f->subs, sub);

+    }

+    

+    if (NODE_HAS_STATE(f, NODE_STATE_ASSOCIATED) ||