The branch, master has been updated
via 0ad6a243b25 lib:util: Log mkdir error on correct debug levels
via f9173c18a6a selftest: Convert Samba3::provision() to named
parameters
via 26da6f562bb selftest: Factor out create_file_chmod()
from b2c13d9a162 krb5-wrap: deal with different krb5_trace_info struct
flavors (earlier MIT krb5 releases)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0ad6a243b259d284064c0c5abcc7d430d55be7e1
Author: Andreas Schneider
Date: Mon Jan 27 14:58:10 2020 +0100
lib:util: Log mkdir error on correct debug levels
For smbd we want an error and for smbclient we only want it in NOTICE
debug level.
The default log level of smbclient is log level 1 so we need notice to
not spam the user.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14253
Signed-off-by: Andreas Schneider
Reviewed-by: Guenther Deschner
Autobuild-User(master): Günther Deschner
Autobuild-Date(master): Mon Jan 27 15:55:24 UTC 2020 on sn-devel-184
commit f9173c18a6acee12b0a0c20bf12af8d53947f8eb
Author: Volker Lendecke
Date: Fri Jan 24 10:45:52 2020 +0100
selftest: Convert Samba3::provision() to named parameters
9 positional parameters is a bit too much for easy overview
Signed-off-by: Volker Lendecke
Reviewed-by: Guenther Deschner
commit 26da6f562bba3ceea1fe5889e969bcef59346f4e
Author: Volker Lendecke
Date: Thu Jan 23 16:07:59 2020 +0100
selftest: Factor out create_file_chmod()
24 lines less perl :-)
Signed-off-by: Volker Lendecke
Reviewed-by: Guenther Deschner
---
Summary of changes:
lib/util/util.c | 7 +-
selftest/target/Samba3.pm | 215 --
2 files changed, 115 insertions(+), 107 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util.c b/lib/util/util.c
index 3bdeded5c1b..0d9ffe5cb7b 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -353,9 +353,12 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname,
old_umask = umask(0);
ret = mkdir(dname, dir_perms);
if (ret == -1 && errno != EEXIST) {
- DBG_WARNING("mkdir failed on directory %s: %s\n",
+ int dbg_level = geteuid() == 0 ? DBGLVL_ERR : DBGLVL_NOTICE;
+
+ DBG_PREFIX(dbg_level,
+ ("mkdir failed on directory %s: %s\n",
dname,
- strerror(errno));
+ strerror(errno)));
umask(old_umask);
return false;
}
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index cdbbbdcef3d..991963b6074 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -219,10 +219,12 @@ sub setup_nt4_dc
check parent directory delete on close = yes
";
- my $vars = $self->provision($path, "SAMBA-TEST",
- "LOCALNT4DC2",
- "localntdc2pass",
- $nt4_dc_options);
+ my $vars = $self->provision(
+ prefix => $path,
+ domain => "SAMBA-TEST",
+ server => "LOCALNT4DC2",
+ password => "localntdc2pass",
+ extra_options => $nt4_dc_options);
$vars or return undef;
@@ -268,10 +270,12 @@ sub setup_nt4_dc_schannel
server max protocol = SMB2_02
";
- my $vars = $self->provision($path, "NT4SCHANNEL",
- "LOCALNT4DC9",
- "localntdc9pass",
- $pdc_options);
+ my $vars = $self->provision(
+ prefix => $path,
+ domain => "NT4SCHANNEL",
+ server => "LOCALNT4DC9",
+ password => "localntdc9pass",
+ extra_options => $pdc_options);
$vars or return undef;
@@ -306,10 +310,12 @@ sub setup_nt4_member
dbwrap_tdb_mutexes:* = yes
${require_mutexes}
";
- my $ret = $self->provision($prefix, $nt4_dc_vars->{DOMAIN},
- "LOCALNT4MEMBER3",
- "localnt4member3pass",
- $member_options);
+ my $ret = $self->provision(
+ prefix => $prefix,
+ domain => $nt4_dc_vars->{DOMAIN},
+ server => "LOCALNT4MEMBER3",
+ password => "localnt4member3pass",
+ extra_options => $member_options);
$ret or return undef;
@@ -429,12 +435,14 @@ sub setup_ad_member
";
- my $ret = $self->provision($prefix, $dcvars->{DOMAIN},
- "LOCALADMEMBER",
- "loCalMemberPass",
-
