[PATCHES] regarding new logging

Michael Adam obnox at samba.org
Thu Mar 26 07:09:01 MDT 2015


Hi,

attached two patches regarding the new logging code:

1. fix a wording in the man page.
2. use 'logging = file' in selftest envs.
   (this removes warning messages)

Cheers - Michael

-------------- next part --------------
From 5a67adcea5f819b40727cd1f409b4124563194b7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 26 Mar 2015 13:45:50 +0100
Subject: [PATCH 1/2] docs: fix duplicate word in explanation of parameter
 'logging'.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/logging/logging.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/logging/logging.xml b/docs-xml/smbdotconf/logging/logging.xml
index 41b6c08..a82496b 100644
--- a/docs-xml/smbdotconf/logging/logging.xml
+++ b/docs-xml/smbdotconf/logging/logging.xml
@@ -5,7 +5,7 @@
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
-  <para>This parameter configures logging backends backends. Multiple
+  <para>This parameter configures logging backends. Multiple
     backends can be specified at the same time, with different log
     levels for each backend. The parameter is a list of backends,
     where each backend is specified as backend[:option][@loglevel].</para>
-- 
2.1.0


From 5948d9081ff544702e19f50887c36022db11d935 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 26 Mar 2015 13:47:28 +0100
Subject: [PATCH 2/2] selftest: use the new 'logging' setting in selftest
 setups.

Note: the deprecated use of 'syslog = no' was wrong anyways.
'syslog = 0' would have been the correct thing..

Signed-off-by: Michael Adam <obnox at samba.org>
---
 selftest/target/Samba3.pm | 2 +-
 selftest/target/Samba4.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 097d90a..3f2d247 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1154,7 +1154,7 @@ sub provision($$$$$$$$)
 	kernel change notify = no
 	smb2 leases = yes
 
-	syslog = no
+	logging = file
 	printing = bsd
 	printcap name = /dev/null
 
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 26d3614..6685503 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1699,7 +1699,7 @@ sub provision_ad_dc($$)
 	kernel oplocks = no
 	kernel change notify = no
 
-	syslog = no
+	logging = file
 	printing = bsd
 	printcap name = /dev/null
 
-- 
2.1.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150326/628fa6ce/attachment.pgp>


More information about the samba-technical mailing list