Merge branch 'debian/experimental' into feature/srv-records

[apt.git] / apt-pkg / contrib / fileutl.h

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 9dd29eb9ea6fbb7b8c671ceeddc2d435d0a010da..97cb05c56ffed3ffc0ddd3b99b059e4d7d2c7490 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -195,10 +195,21 @@ pid_t ExecFork(std::set<int> keep_fds);
 void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds);
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds);
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 

-

 // check if the given file starts with a PGP cleartext signature
 bool StartsWithGPGClearTextSignature(std::string const &FileName);
 
 // check if the given file starts with a PGP cleartext signature
 bool StartsWithGPGClearTextSignature(std::string const &FileName);
 

+/** change file attributes to requested known good values
+ *
+ * The method skips the user:group setting if not root.
+ *
+ * @param requester is printed as functionname in error cases
+ * @param file is the file to be modified
+ * @param user is the (new) owner of the file, e.g. _apt
+ * @param group is the (new) group owning the file, e.g. root
+ * @param mode is the access mode of the file, e.g. 0644
+ */
+bool ChangeOwnerAndPermissionOfFile(char const * const requester, char const * const file, char const * const user, char const * const group, mode_t const mode);
+

 /**
  * \brief Drop privileges
  *
 /**
  * \brief Drop privileges
  *


@@ -210,7 +221,7 @@ bool StartsWithGPGClearTextSignature(std::string const &FileName);
  *
  * \return true on success, false on failure with _error set
  */
  *
  * \return true on success, false on failure with _error set
  */

-bool DropPrivs();
+bool DropPrivileges();

 
 // File string manipulators
 std::string flNotDir(std::string File);
 
 // File string manipulators
 std::string flNotDir(std::string File);