From: Amit Kumar <amitkuma@redhat.com>
Date: Wed, 22 Apr 2020 11:53:42 +0000 (-0500)
Subject: lib:util: Fix smbclient -l basename dir
X-Git-Tag: samba-4.10.16~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f441f026b66f8a742976f476843e35b37ebff632;p=thirdparty%2Fsamba.git

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)

Autobuild-User(v4-10-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-10-test): Thu May 14 12:11:49 UTC 2020 on sn-devel-144
---

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 38df787c658..bddea59ad77 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1132,9 +1132,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