The branch, master has been updated
via 8b765ac smbd: fix build with FAM support
via a6f983a smbd: fix build with FAM support
from 9fb98e3 lib/socket: Fix improper use of default interface speed
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8b765ac01198cebc1806bce95637c667bfd9aa12
Author: Ralph Boehme <[email protected]>
Date: Fri Feb 12 17:25:09 2016 +0100
smbd: fix build with FAM support
Add missing define of HAVE_FAM when FAM is detected.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11733
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Sun Feb 14 13:50:56 CET 2016 on sn-devel-144
commit a6f983a17b1e3ecbf01896d49fbfe864bad1a8ab
Author: Ralph Boehme <[email protected]>
Date: Fri Feb 12 17:20:59 2016 +0100
smbd: fix build with FAM support
Rename _fam_watch() to fam_watch(). I don't see a reason why this should
be prefixed with an underscore. It's also inline with the corresponding
inotify function inotify_watch().
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11733
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/notify_fam.c | 2 +-
source3/smbd/proto.h | 2 +-
source3/wscript | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/notify_fam.c b/source3/smbd/notify_fam.c
index bf9050d..d8d6946 100644
--- a/source3/smbd/notify_fam.c
+++ b/source3/smbd/notify_fam.c
@@ -221,7 +221,7 @@ static int fam_watch_context_destructor(struct
fam_watch_context *ctx)
add a watch. The watch is removed when the caller calls
talloc_free() on *handle
*/
-int _fam_watch(TALLOC_CTX *mem_ctx,
+int fam_watch(TALLOC_CTX *mem_ctx,
struct sys_notify_context *ctx,
const char *path,
uint32_t *filter,
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 9b9c924..fe099ae 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -547,7 +547,7 @@ int inotify_watch(TALLOC_CTX *mem_ctx,
void *private_data,
void *handle_p);
-int _fam_watch(TALLOC_CTX *mem_ctx,
+int fam_watch(TALLOC_CTX *mem_ctx,
struct sys_notify_context *ctx,
const char *path,
uint32_t *filter,
diff --git a/source3/wscript b/source3/wscript
index d9e10c0..8fe1374 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -204,6 +204,7 @@ main() {
if samba_fam_libs is not None:
conf.DEFINE('SAMBA_FAM_LIBS', samba_fam_libs)
+ conf.DEFINE('HAVE_FAM', 1)
else:
if Options.options.with_fam == True:
conf.fatal('FAM support requested, but no suitable FAM library
found')
--
Samba Shared Repository
