summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2022-05-23 17:23:41 +0100
committerJule Anger <janger@samba.org>2022-05-30 09:10:47 +0000
commite3de2bdb8590684dfffa9974f1b45a571845e72b (patch)
treef8a1c78b8e4b50c7a00bce5e516dbb99ae92ec30
parent239e0759db3d3b52ff78b326b779635900b7551e (diff)
downloadsamba-e3de2bdb8590684dfffa9974f1b45a571845e72b.tar.gz
s3/client: Restore '-E' handling
Sometimes we really do need to redirect output to stderr e.g. when using the tar command to output the archive to stdout we don't want debug or cmdline status messages straying into stdout. was removed with commit: e4474ac0a540c56548b4d15e38f2e234455e19b6 remove known fail for the test BUG: https://bugzilla.samba.org/show_bug.cgi?id=15075 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Noel Power <npower@samba.org> Autobuild-Date(master): Tue May 24 10:29:27 UTC 2022 on sn-devel-184 (cherry picked from commit 56e179817123b40c3646476563d345d8f97efff9) Autobuild-User(v4-16-test): Jule Anger <janger@samba.org> Autobuild-Date(v4-16-test): Mon May 30 09:10:47 UTC 2022 on sn-devel-184
-rw-r--r--selftest/knownfail.d/smbclient-smb31
-rw-r--r--source3/client/client.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/selftest/knownfail.d/smbclient-smb3 b/selftest/knownfail.d/smbclient-smb3
index 4d884db5025..119e93e479a 100644
--- a/selftest/knownfail.d/smbclient-smb3
+++ b/selftest/knownfail.d/smbclient-smb3
@@ -1,5 +1,4 @@
^samba3.blackbox.smbclient_s3.SMB3.*.creating.a.bad.symlink.and.deleting.it
-^samba3.blackbox.smbclient_s3.*.smbclient output goes to stderr when -E is passed
^samba3.blackbox.acl_xattr.SMB3.nt_affects_posix
^samba3.blackbox.acl_xattr.SMB3.nt_affects_chown
^samba3.blackbox.acl_xattr.SMB3.nt_affects_chgrp
diff --git a/source3/client/client.c b/source3/client/client.c
index 690f9deaec9..8ec4589a1cd 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -6552,6 +6552,11 @@ int main(int argc,char *argv[])
print_sockaddr(dest_ss_str, sizeof(dest_ss_str), &dest_ss);
}
break;
+ case 'E':
+ setup_logging("smbclient", DEBUG_STDERR );
+ display_set_stderr();
+ break;
+
case 'L':
query_host = talloc_strdup(frame, poptGetOptArg(pc));
if (!query_host) {