[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1664-g31a2347

[Volker Lendecke]

The branch, master has been updated
       via  31a2347a0af9a6f36c3f02d25327146659ee343f (commit)
       via  91aea36bbf0aad99cfe9062eb61cb3335a8342a1 (commit)
       via  ad91ef7f968b289f449fdeb2eb4b1cdbfa682b4d (commit)
       via  ebb79e27dcea6e0b8215b878c9d42bcc9dd960e7 (commit)
      from  5065cf70f8bf41193d6d33413f2285f62bba0502 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 31a2347a0af9a6f36c3f02d25327146659ee343f
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 16 18:20:02 2009 +0200

    Fix static linking of vfs_notify_fam

commit 91aea36bbf0aad99cfe9062eb61cb3335a8342a1
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 16 16:05:37 2009 +0200

    Fix a typo

commit ad91ef7f968b289f449fdeb2eb4b1cdbfa682b4d
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 16 15:42:53 2009 +0200

    s3-events: If immediate requests are pending, the timeout is 0

commit ebb79e27dcea6e0b8215b878c9d42bcc9dd960e7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 16 19:03:37 2009 +0200

    Fix the merged build -- thanks jelmer for the hint!

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in           |    2 +-
 source3/configure.in          |    5 +++++
 source3/lib/events.c          |    9 +++++++++
 source3/samba4.m4             |    2 --
 source3/winbindd/idmap_util.c |    2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f5e1f9e..31ef29a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1425,7 +1425,7 @@ bin/.dummy:
 
 bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @BUILD_POPT@
 	@echo Linking $@
-	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
+	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
 		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
diff --git a/source3/configure.in b/source3/configure.in
index 8adf24e..acbefe6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6181,6 +6181,11 @@ MODULE_idmap_nss=STATIC
 
 MODULE_nss_info_template=STATIC
 
+if test x"$MODULE_vfs_notify_fam" = xSTATIC ; then
+	SMBD_FAM_LIBS="$SMB_FAM_LIBS"
+	AC_SUBST(SMBD_FAM_LIBS)
+fi
+
 AC_ARG_WITH(static-modules,
 [AS_HELP_STRING([--with-static-modules=MODULES], [Comma-separated list of names of modules to statically link in])],
 [ if test $withval; then
diff --git a/source3/lib/events.c b/source3/lib/events.c
index 90d86c6..6fc3a97 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -70,6 +70,11 @@ bool event_add_to_select_args(struct tevent_context *ev,
 		}
 	}
 
+	if (ev->immediate_events != NULL) {
+		*timeout = timeval_zero();
+		return true;
+	}
+
 	if (ev->timer_events == NULL) {
 		return ret;
 	}
@@ -140,6 +145,10 @@ struct timeval *get_timed_events_timeout(struct tevent_context *ev,
 	if (ev->timer_events == NULL) {
 		return NULL;
 	}
+	if (ev->immediate_events != NULL) {
+		*to_ret = timeval_zero();
+		return to_ret;
+	}
 
 	now = timeval_current();
 	*to_ret = timeval_until(&now, &ev->timer_events->next_event);
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 568283c..9e86f3f 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -90,8 +90,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
 	[],[m4_include(../lib/tevent/samba.m4)]
 )
 
-SMB_INCLUDE_MK(../lib/tevent/python.mk) 
-
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
 	[
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
index 7d261a6..37b7ecb 100644
--- a/source3/winbindd/idmap_util.c
+++ b/source3/winbindd/idmap_util.c
@@ -94,7 +94,7 @@ NTSTATUS idmap_gid_to_sid(const char *domname, DOM_SID *sid, gid_t gid)
 	struct id_map map;
 	bool expired;
 
-	DEBUG(10,("idmap_gid_to_si: gid = [%lu], domain = '%s'\n",
+	DEBUG(10,("idmap_gid_to_sid: gid = [%lu], domain = '%s'\n",
 		  (unsigned long)gid, domname?domname:"NULL"));
 
 	if (winbindd_use_idmap_cache()


-- 
Samba Shared Repository