The branch, v4-1-test has been updated
via 62513b7 docs: mention incompatibility between kernel oplocks and
streams_xattr
via a93d931 nmbd: Send waiting status to systemd.
via beffc40 lib: Add daemon_status() to util library.
from 538f62e selftest: Fix selftest where pid is used uninitialized.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit 62513b724878c562e2cf67adcf5bfb1b8cb7f861
Author: Björn Jacke <b...@sernet.de>
Date: Tue Sep 9 22:35:08 2014 +0200
docs: mention incompatibility between kernel oplocks and streams_xattr
See BUG https://bugzilla.samba.org/show_bug.cgi?id=7537 for details.
Signed-off-by: Bjoern Jacke <b...@sernet.de>
Autobuild-User(master): Björn Jacke <b...@sernet.de>
Autobuild-Date(master): Fri Sep 12 18:29:37 CEST 2014 on sn-devel-104
(cherry picked from commit 27b2ddcddea5c32a84016b5c6843eb37d2798adf)
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10814
Autobuild-User(v4-1-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-1-test): Fri Sep 26 23:11:03 CEST 2014 on sn-devel-104
commit a93d931ade4957127a644cb22d64bfbb24be0c61
Author: Andreas Schneider <a...@samba.org>
Date: Tue Sep 16 18:03:51 2014 +0200
nmbd: Send waiting status to systemd.
This tells the Administrator what's going on and we should log that IPv6
is not supported.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10816
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Sep 17 13:16:43 CEST 2014 on sn-devel-104
(cherry picked from commit 2df601bff0d949e66c79366b8248b9d950c0b430)
commit beffc40edd8cad3a992b95d374a576d02daa528a
Author: Andreas Schneider <a...@samba.org>
Date: Tue Sep 16 18:02:30 2014 +0200
lib: Add daemon_status() to util library.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10816
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
(cherry picked from commit 9f5f5fa8ebf845c53b7a92557d7aec56ed820320)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_streams_xattr.8.xml | 4 ++++
lib/util/become_daemon.c | 11 +++++++++++
lib/util/samba_util.h | 6 ++++++
source3/nmbd/nmbd_subnetdb.c | 7 +++++--
4 files changed, 26 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_streams_xattr.8.xml
b/docs-xml/manpages/vfs_streams_xattr.8.xml
index 215fead..c10ece8 100644
--- a/docs-xml/manpages/vfs_streams_xattr.8.xml
+++ b/docs-xml/manpages/vfs_streams_xattr.8.xml
@@ -43,6 +43,10 @@
the size of xattrs. So this module might work for applications like IE
that stores small zone information in streams but will fail for
applications that store serious amounts of data in ADSs.</para>
+
+ <para>CAUTION: Make sure to set "kernel oplocks = no" in smb.conf if
+ if you use this module because this combination is currently broken.
+ See Bug 7537 for details.</para>
</refsect1>
<refsect1>
diff --git a/lib/util/become_daemon.c b/lib/util/become_daemon.c
index 35c8b32..688bedd 100644
--- a/lib/util/become_daemon.c
+++ b/lib/util/become_daemon.c
@@ -135,3 +135,14 @@ _PUBLIC_ void daemon_ready(const char *daemon)
#endif
DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve
connections", daemon));
}
+
+_PUBLIC_ void daemon_status(const char *name, const char *msg)
+{
+ if (name == NULL) {
+ name = "Samba";
+ }
+#ifdef HAVE_SYSTEMD
+ sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
+#endif
+ DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg));
+}
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index e3fe6a6..f4216d8 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -853,6 +853,12 @@ _PUBLIC_ void exit_daemon(const char *msg, int error);
**/
_PUBLIC_ void daemon_ready(const char *daemon);
+/*
+ * Report the daemon status. For example if it is not ready to serve
connections
+ * and is waiting for some event to happen.
+ */
+_PUBLIC_ void daemon_status(const char *name, const char *msg);
+
/**
* @brief Get a password from the console.
*
diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 311a240..6c483af 100644
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -247,8 +247,11 @@ bool create_subnets(void)
/* Only count IPv4, non-loopback interfaces. */
if (iface_count_v4_nl() == 0) {
- DEBUG(0,("create_subnets: No local IPv4 non-loopback interfaces
!\n"));
- DEBUG(0,("create_subnets: Waiting for an interface to appear
...\n"));
+ daemon_status("nmbd",
+ "No local IPv4 non-loopback interfaces "
+ "available, waiting for interface ...");
+ DEBUG(0,("NOTE: NetBIOS name resolution is not supported for "
+ "Internet Protocol Version 6 (IPv6).\n"));
}
/* We only count IPv4, non-loopback interfaces here. */
--
Samba Shared Repository
