]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
lib:util: Fix smbclient -l basename dir
authorAmit Kumar <amitkuma@redhat.com>
Wed, 22 Apr 2020 11:53:42 +0000 (06:53 -0500)
committerKarolin Seeger <kseeger@samba.org>
Thu, 14 May 2020 12:11:48 +0000 (12:11 +0000)
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

lib/util/debug.c
selftest/knownfail.d/smbclog [deleted file]

index 38df787c658c4b8b57d8a490c1a333ae771857d4..bddea59ad777300d09bbec584eb560a1ebd75952 100644 (file)
@@ -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 (file)
index bfe1bfe..0000000
+++ /dev/null
@@ -1 +0,0 @@
- ^samba3.blackbox.smbclient_log_basename