[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Sun Jan 14 21:10:02 UTC 2018
The branch, master has been updated
via 0580a23 s4:torture: Improve error message in whoami test
via 8d90f2a s3:test: Always validate the join after changing the secret
via e131ce4 waf: Remove build system info (uname -a)
via c69938e systemd: Fix kill path
via a653b62 systemd: Add documentation to Unit files
via df68af9 systemd: syslog.target is obsolete
from 0abe16a torture: Add test for channel sequence number handling
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0580a23d64be346e4526056c695249de4241cfa6
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jan 12 13:45:33 2018 +0100
s4:torture: Improve error message in whoami test
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Sun Jan 14 22:09:24 CET 2018 on sn-devel-144
commit 8d90f2a03e58f34f36d345d31c5ca6090d37ff54
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jan 11 11:00:43 2018 +0100
s3:test: Always validate the join after changing the secret
Signed-off-by: Andreas Schneider <asn at samba.org>
Signed-off-by: Ralph Boehme <slow at samba.org>
Pair-Programmed-With: Ralph Boehme <slow at samba.org>
commit e131ce4ddc074dc146c81edb99a203d1dd2883b8
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jan 11 21:18:46 2018 +0100
waf: Remove build system info (uname -a)
Preventing reproducible builds while adding minor benefit.
More information at <https://reproducible-builds.org/>.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13213
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlet <abartlet at samba.org>
commit c69938ef5cb9ee49565fae834a25541f6a5da0a8
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu May 12 22:16:24 2016 +0200
systemd: Fix kill path
Bug-Debian: https://bugs.debian.org/828730
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12402
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit a653b62ad71b65c280ee4ba6bfbb560ac3b1f90e
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu May 12 22:16:24 2016 +0200
systemd: Add documentation to Unit files
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12402
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit df68af9fa5900b5f7b22a972666fd213fef17106
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jan 11 10:07:17 2018 +0100
systemd: syslog.target is obsolete
After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed.
Ref: https://lintian.debian.org/tags/systemd-service-file-refers-to-obsolete-target.html
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12402
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wscript | 4 ----
ctdb/config/ctdb.service | 1 +
packaging/systemd/nmb.service.in | 5 +++--
packaging/systemd/samba.service.in | 5 +++--
packaging/systemd/smb.service.in | 5 +++--
packaging/systemd/winbind.service.in | 5 +++--
source3/script/tests/test_net_cred_change.sh | 7 ++++---
source4/smbd/server.c | 3 ---
source4/torture/unix/whoami.c | 9 +++++++--
9 files changed, 24 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 430d164..3b36b57 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -313,10 +313,6 @@ def configure(conf):
conf.env.GIT_LOCAL_CHANGES = Options.options.GIT_LOCAL_CHANGES
- conf.CHECK_COMMAND(['uname', '-a'],
- msg='Checking build system',
- define='BUILD_SYSTEM',
- on_target=False)
conf.CHECK_UNAME()
# see if we can compile and run a simple C program
diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
index 63cdfa9..189f2f4 100644
--- a/ctdb/config/ctdb.service
+++ b/ctdb/config/ctdb.service
@@ -1,5 +1,6 @@
[Unit]
Description=CTDB
+Documentation=man:ctdbd(1) man:ctdb(7)
After=network-online.target time-sync.target
[Service]
diff --git a/packaging/systemd/nmb.service.in b/packaging/systemd/nmb.service.in
index b0ba92f..a308123 100644
--- a/packaging/systemd/nmb.service.in
+++ b/packaging/systemd/nmb.service.in
@@ -1,7 +1,8 @@
[Unit]
Description=Samba NMB Daemon
+Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
Wants=network-online.target
-After=syslog.target network.target network-online.target
+After=network.target network-online.target
[Service]
Type=notify
@@ -9,7 +10,7 @@ NotifyAccess=all
PIDFile=@PIDDIR@/nmbd.pid
EnvironmentFile=- at SYSCONFDIR@/sysconfig/samba
ExecStart=@SBINDIR@/nmbd --foreground --no-process-group $NMBDOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
LimitCORE=infinity
@systemd_nmb_extra@
diff --git a/packaging/systemd/samba.service.in b/packaging/systemd/samba.service.in
index c418150..f8ea527 100644
--- a/packaging/systemd/samba.service.in
+++ b/packaging/systemd/samba.service.in
@@ -1,7 +1,8 @@
[Unit]
Description=Samba AD Daemon
+Documentation=man:samba(8) man:samba(7) man:smb.conf(5)
Wants=network-online.target
-After=syslog.target network.target network-online.target
+After=network.target network-online.target
[Service]
Type=notify
@@ -10,7 +11,7 @@ PIDFile=@PIDDIR@/samba.pid
LimitNOFILE=16384
EnvironmentFile=- at SYSCONFDIR@/sysconfig/samba
ExecStart=@SBINDIR@/samba --foreground --no-process-group $SAMBAOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
@systemd_samba_extra@
[Install]
diff --git a/packaging/systemd/smb.service.in b/packaging/systemd/smb.service.in
index f829bcb..dcaf7ef 100644
--- a/packaging/systemd/smb.service.in
+++ b/packaging/systemd/smb.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Samba SMB Daemon
-After=syslog.target network.target nmb.service winbind.service
+Documentation=man:smbd(8) man:samba(7) man:smb.conf(5)
+After=network.target nmb.service winbind.service
[Service]
Type=notify
@@ -9,7 +10,7 @@ PIDFile=@PIDDIR@/smbd.pid
LimitNOFILE=16384
EnvironmentFile=- at SYSCONFDIR@/sysconfig/samba
ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
LimitCORE=infinity
@systemd_smb_extra@
diff --git a/packaging/systemd/winbind.service.in b/packaging/systemd/winbind.service.in
index 5ac5adc..c28d94c 100644
--- a/packaging/systemd/winbind.service.in
+++ b/packaging/systemd/winbind.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Samba Winbind Daemon
-After=syslog.target network.target nmb.service
+Documentation=man:winbindd(8) man:samba(7) man:smb.conf(5)
+After=network.target nmb.service
[Service]
Type=notify
@@ -8,7 +9,7 @@ NotifyAccess=all
PIDFile=@PIDDIR@/winbindd.pid
EnvironmentFile=- at SYSCONFDIR@/sysconfig/samba
ExecStart=@SBINDIR@/winbindd --foreground --no-process-group "$WINBINDOPTIONS"
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
LimitCORE=infinity
@systemd_winbind_extra@
diff --git a/source3/script/tests/test_net_cred_change.sh b/source3/script/tests/test_net_cred_change.sh
index de56be5..794b054 100755
--- a/source3/script/tests/test_net_cred_change.sh
+++ b/source3/script/tests/test_net_cred_change.sh
@@ -9,8 +9,9 @@ fi
incdir=`dirname $0`/../../../testprogs/blackbox
. $incdir/subunit.sh
-testit "first change" $VALGRIND $BINDIR/wbinfo -c || failed=`expr $failed + 1`
-testit "first join" $VALGRIND $BINDIR/net rpc testjoin $@ || failed=`expr $failed + 1`
-testit "second change" $VALGRIND $BINDIR/wbinfo -c || failed=`expr $failed + 1`
+testit "1: change machine secret" $VALGRIND $BINDIR/wbinfo --change-secret || failed=`expr $failed + 1`
+testit "1: validate secret" $VALGRIND $BINDIR/net rpc testjoin $@ || failed=`expr $failed + 1`
+testit "2: change machine secret" $VALGRIND $BINDIR/wbinfo --change-secret || failed=`expr $failed + 1`
+testit "2: validate secret" $VALGRIND $BINDIR/net rpc testjoin $@ || failed=`expr $failed + 1`
testok $0 $failed
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index adee388..431fbad 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -323,9 +323,6 @@ static void show_build(void)
printf("Samba version: %s\n", SAMBA_VERSION_STRING);
printf("Build environment:\n");
-#ifdef BUILD_SYSTEM
- printf(" Build host: %s\n", BUILD_SYSTEM);
-#endif
printf("Paths:\n");
for (i=0; config_options[i].name; i++) {
diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index bb70e47..efd9efa 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -91,8 +91,13 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
lpcfg_gensec_settings(tctx, tctx->lp_ctx));
if (!NT_STATUS_IS_OK(status)) {
- printf("failed to connect to //%s/%s: %s\n",
- host, share, nt_errstr(status));
+ torture_comment(tctx,
+ "FATAL: Failed to connect to //%s/%s "
+ "with %s - %s\n",
+ host,
+ share,
+ cli_credentials_get_username(creds),
+ nt_errstr(status));
return NULL;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list