From 43df6d2e98006862fbc0c502ee96958a4deb5a4d Mon Sep 17 00:00:00 2001 From: Gong Heng Date: Wed, 10 Jul 2024 13:36:08 +0800 Subject: [PATCH] fix: [smb] Not show smb default domain. Get the smb default domain from smb.conf, and show it. Log: fix issue Bug: https://pms.uniontech.com/bug-view-263539.html --- src/dfm-mount/private/dnetworkmounter.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dfm-mount/private/dnetworkmounter.cpp b/src/dfm-mount/private/dnetworkmounter.cpp index c857f979..d74a4282 100644 --- a/src/dfm-mount/private/dnetworkmounter.cpp +++ b/src/dfm-mount/private/dnetworkmounter.cpp @@ -37,6 +37,7 @@ static constexpr char kLoginDomain[] { "domain" }; static constexpr char kLoginPasswd[] { "passwd" }; static constexpr char kLoginTimeout[] { "timeout" }; static constexpr char kMountFsType[] { "fsType" }; +static constexpr char kSmbConfigPath[] { "/etc/samba/smb.conf" }; static constexpr char kDaemonMountRetKeyMpt[] { "mountPoint" }; static constexpr char kDaemonMountRetKeyErrno[] { "errno" }; @@ -220,9 +221,11 @@ void DNetworkMounter::mountByDaemon(const QString &address, GetMountPassInfo get DeviceOperateCallbackWithMessage mountResult, int secs) { auto requestLoginInfo = [address, getPassInfo] { - if (getPassInfo) + if (getPassInfo) { + QSettings setting(kSmbConfigPath, QSettings::IniFormat); return getPassInfo(QObject::tr("need authorization to access %1").arg(address), - Utils::currentUser(), "WORKGROUP"); + Utils::currentUser(), setting.value("global/workgroup", "WORKGROUP").toString()); + } return MountPassInfo(); }; auto checkThread = [] {