summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Kumar <amitkuma@redhat.com>2020-04-22 06:53:42 -0500
committerKarolin Seeger <kseeger@samba.org>2020-05-14 07:25:44 +0000
commitf6468de046e93dc45d4bcc76dc27daef75a0152d (patch)
treed7bf37e32ae151930343930ba55d3c5057a8980a
parent6bc407b28600596b3270b4671c12199177dc5f2b (diff)
downloadsamba-f6468de046e93dc45d4bcc76dc27daef75a0152d.tar.gz
lib:util: Fix smbclient -l basename dir
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14345 Pair-Programmed-With: Andreas Schneider <asn@samba.org> Signed-off-by: Andreas Schneider <asn@samba.org> Signed-off-by: Amit Kumar <amitkuma@redhat.com> Reviewed-by: Alexander Bokovoy <ab@samba.org> (cherry picked from commit c83ce5f4f99aef94530411ec82cc03e9935b352d)
-rw-r--r--lib/util/debug.c8
-rw-r--r--selftest/knownfail.d/smbclog1
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 6f081d45110..d990a6bf2b0 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1140,9 +1140,15 @@ bool reopen_logs_internal(void)
dbgc_config[DBGC_ALL].fd = 2;
return true;
- case DEBUG_FILE:
+ case DEBUG_FILE: {
+ struct debug_backend *b = debug_find_backend("file");
+
+ if (b != NULL) {
+ b->log_level = dbgc_config[DBGC_ALL].loglevel;
+ }
break;
}
+ }
oldumask = umask( 022 );
diff --git a/selftest/knownfail.d/smbclog b/selftest/knownfail.d/smbclog
deleted file mode 100644
index bfe1bfeda7c..00000000000
--- a/selftest/knownfail.d/smbclog
+++ /dev/null
@@ -1 +0,0 @@
- ^samba3.blackbox.smbclient_log_basename