diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 13:30:27 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 13:30:27 +0200 |
| commit | 373fa2b4b2caae977c41b2c10ea27e41308a05c3 (patch) | |
| tree | fe57ee39daa2cef6a7f3832c0c45ed8b8d1ac531 | |
| parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) | |
Rename DropPrivs() to DropPrivileges()
Git-Dch: ignore
| -rw-r--r-- | apt-pkg/acquire-method.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 2 | ||||
| -rw-r--r-- | cmdline/apt-dump-solver.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-internal-solver.cc | 2 |
5 files changed, 5 insertions, 5 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); diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc index 424764b3c..f765234c5 100644 --- a/cmdline/apt-dump-solver.cc +++ b/cmdline/apt-dump-solver.cc @@ -41,7 +41,7 @@ int main(int argc,const char *argv[]) /*{{{*/ return 0; } // we really don't need anything - DropPrivs(); + DropPrivileges(); FILE* input = fdopen(STDIN_FILENO, "r"); FILE* output = fopen("/tmp/dump.edsp", "w"); diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 0f2ec6283..92a4429e5 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -77,7 +77,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,0,0,0}}; // we really don't need anything - DropPrivs(); + DropPrivileges(); CommandLine CmdL(Args,_config); if (pkgInitConfig(*_config) == false || |