summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-07 13:30:27 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-07 13:30:27 +0200
commit373fa2b4b2caae977c41b2c10ea27e41308a05c3 (patch)
treefe57ee39daa2cef6a7f3832c0c45ed8b8d1ac531 /apt-pkg
parent00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff)
Rename DropPrivs() to DropPrivileges()
Git-Dch: ignore
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-method.cc2
-rw-r--r--apt-pkg/contrib/fileutl.cc2
-rw-r--r--apt-pkg/contrib/fileutl.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 82f2fb3ce..d116994e6 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -124,7 +124,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
/* */
void pkgAcqMethod::DropPrivsOrDie()
{
- if (!DropPrivs()) {
+ if (!DropPrivileges()) {
Fail(false);
exit(112); /* call the european emergency number */
}
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index df409fa36..1e1fb5957 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2171,7 +2171,7 @@ bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)
return true;
}
-bool DropPrivs()
+bool DropPrivileges()
{
// uid will be 0 in the end, but gid might be different anyway
uid_t old_uid = getuid();
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 9dd29eb9e..a64d6cb98 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -210,7 +210,7 @@ bool StartsWithGPGClearTextSignature(std::string const &FileName);
*
* \return true on success, false on failure with _error set
*/
-bool DropPrivs();
+bool DropPrivileges();
// File string manipulators
std::string flNotDir(std::string File);