From 27ff78076fff97ff3c85740d57d304e9bd64af01 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Sat, 17 Oct 2020 10:58:12 +0300 Subject: [PATCH] smb.conf.5: add clarification how configuration changes reflected by Samba Users of Linux distributions know to read smb.conf(5) manual page but apparently not many of them read smbd(8) and winbindd(8) to understand how changes to smb.conf file are reflected in the running processes. Add a small section that makes it clear where to find relevant information. Also correct the information in smbd, nmbd, and winbindd manual pages. The interval at which smbd does check for smb.conf changes was increased from 60 seconds to 180 seconds in 1999 with commit 3db52feb1f3b. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14538 Signed-off-by: Alexander Bokovoy Reviewed-by: Isaac Boukris Autobuild-User(master): Alexander Bokovoy Autobuild-Date(master): Tue Oct 20 08:50:13 UTC 2020 on sn-devel-184 (cherry picked from commit e32846f0692df44b4ee929c5ed6ba1de88ec4bd2) --- docs-xml/manpages/nmbd.8.xml | 10 +++++++++- docs-xml/manpages/smb.conf.5.xml | 30 ++++++++++++++++++++++++++++++ docs-xml/manpages/smbd.8.xml | 13 ++++++++++--- docs-xml/manpages/winbindd.8.xml | 7 ++++++- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml index c145e820770..4ece42f3ca6 100644 --- a/docs-xml/manpages/nmbd.8.xml +++ b/docs-xml/manpages/nmbd.8.xml @@ -244,7 +244,15 @@ directory (or the var/locks directory configured under wherever Samba was configured to install itself). This will also cause nmbd to dump out its server database in - the log.nmb file. + the log.nmb file. Additionally, the signal will + cause reloading nmbd configuration. + + + Instead of sending a SIGHUP signal, a request to dump namelists + into the file and reload a configuration file may be sent using + smbcontrol + 1 program. + The debug log level of nmbd may be raised or lowered using smbcontrol diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index f72833c003f..c4387187ecc 100644 --- a/docs-xml/manpages/smb.conf.5.xml +++ b/docs-xml/manpages/smb.conf.5.xml @@ -27,6 +27,36 @@ + + HOW CONFIGURATION CHANGES ARE APPLIED + + + The Samba suite includes a number of different programs. Some of them operate in a client mode, others are + server daemons that provide various services to its clients. The smb.conf + file is processed in the following way: + + + + + The Samba suite's client applications read their configuration only once. Any changes made after start aren't + reflected in the context of already running client code. + + + + The Samba suite's server daemons reload their configuration when requested. However, already active connections + do not change their configuration. More detailed information can be found in + smbd8 and + winbindd8 manual pages. + + + + + To request Samba server daemons to refresh their configuration, please use + smbcontrol1 utility. + + + + FILE FORMAT diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml index deba2cad9e2..73d808c70b7 100644 --- a/docs-xml/manpages/smbd.8.xml +++ b/docs-xml/manpages/smbd.8.xml @@ -68,11 +68,18 @@ the copy of the server for that client terminates. The configuration file, and any files that it includes, - are automatically reloaded every minute, if they change. You - can force a reload by sending a SIGHUP to the server. Reloading + are automatically reloaded every three minutes, if they change. + One can force a reload by sending a SIGHUP to the server. Reloading the configuration file will not affect connections to any service that is already established. Either the user will have to - disconnect from the service, or smbd killed and restarted. + disconnect from the service, or smbd killed and restarted. + + + Instead of sending a SIGHUP signal, a request to reload configuration + file may be sent using smbcontrol + 1 program. + + diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml index 71fb248c204..99c00388c20 100644 --- a/docs-xml/manpages/winbindd.8.xml +++ b/docs-xml/manpages/winbindd.8.xml @@ -390,7 +390,12 @@ auth required /lib/security/pam_unix.so \ apply any parameter changes to the running version of winbindd. This signal also clears any cached user and group information. The list of other domains trusted - by winbindd is also reloaded. + by winbindd is also reloaded. + + Instead of sending a SIGHUP signal, a request to reload configuration + file may be sent using smbcontrol + 1 program. + -- 2.28.0