aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2016-04-01 18:18:24 +0200
committerMartijn Kaijser <martijn@xbmc.org>2016-04-01 18:18:24 +0200
commitec95a12cae22bd0dfbdae1230696f90896fd1da9 (patch)
treed744df80076d22e987d49c3bd70ce6275b8c5bc0
parentac1be48f1d47e58e49ee223eb01a65da4c9937fa (diff)
parentda52eaf6066587aedf937b561d49dcce083fbf17 (diff)
Merge pull request #9514 from arnova/redact_fileitem
changed: Redact username/pass inCFileItemList::RemoveDiscCache()
-rw-r--r--xbmc/FileItem.cpp2
-rw-r--r--xbmc/filesystem/SFTPFile.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 2279bccf27..95bab07dc9 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -2701,7 +2701,7 @@ void CFileItemList::RemoveDiscCache(int windowID) const
std::string cacheFile(GetDiscFileCache(windowID));
if (CFile::Exists(cacheFile))
{
- CLog::Log(LOGDEBUG,"Clearing cached fileitems [%s]",GetPath().c_str());
+ CLog::Log(LOGDEBUG,"Clearing cached fileitems [%s]", CURL::GetRedacted(GetPath()).c_str());
CFile::Delete(cacheFile);
}
}
diff --git a/xbmc/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp
index 2438dbde8e..18e7558c6d 100644
--- a/xbmc/filesystem/SFTPFile.cpp
+++ b/xbmc/filesystem/SFTPFile.cpp
@@ -101,7 +101,7 @@ static const char * SFTPErrorText(int sftp_error)
CSFTPSession::CSFTPSession(const std::string &host, unsigned int port, const std::string &username, const std::string &password)
{
- CLog::Log(LOGINFO, "SFTPSession: Creating new session on host '%s:%d' with user '%s'", host.c_str(), port, username.c_str());
+ CLog::Log(LOGINFO, "SFTPSession: Creating new session on host '%s:%d'", host.c_str(), port);
CSingleLock lock(m_critSect);
if (!Connect(host, port, username, password))
Disconnect();