oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Client: remove the AllowFile() overload with Error parameter

Browse Source 
Unused.
This commit is contained in:
Max Kellermann
2016-10-27 22:16:05 +02:00
parent 6961bd61ca
commit 31faafea9d
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Client.hxx
View File

@@ -182,8 +182,6 @@ public:
*/ */
void AllowFile(Path path_fs) const; void AllowFile(Path path_fs) const;
bool AllowFile(Path path_fs, Error &error) const;
/** /**
* Wrapper for Instance::GetDatabase(). * Wrapper for Instance::GetDatabase().
*/ */

35
src/client/ClientFile.cxx
View File

@@ -22,7 +22,6 @@
#include "protocol/Ack.hxx" #include "protocol/Ack.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "util/Error.hxx"
#include <unistd.h> #include <unistd.h>
@@ -50,37 +49,3 @@ Client::AllowFile(Path path_fs) const
throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied"); throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
#endif #endif
} }
bool
Client::AllowFile(Path path_fs, Error &error) const
{
#ifdef WIN32
(void)path_fs;
error.Set(ack_domain, ACK_ERROR_PERMISSION, "Access denied");
return false;
#else
if (uid >= 0 && (uid_t)uid == geteuid())
/* always allow access if user runs his own MPD
instance */
return true;
if (uid < 0) {
/* unauthenticated client */
error.Set(ack_domain, ACK_ERROR_PERMISSION, "Access denied");
return false;
}
FileInfo fi;
if (!GetFileInfo(path_fs, fi, error))
return false;
if (fi.GetUid() != (uid_t)uid && (fi.GetMode() & 0444) != 0444) {
/* client is not owner */
error.Set(ack_domain, ACK_ERROR_PERMISSION, "Access denied");
return false;
}
return true;
#endif
}