diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-08-15 09:51:55 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 12:51:03 -0500 |
| commit | 9dc8ff7c9081dbdfc69826f59e12f5e8f11ba675 (patch) | |
| tree | fb587441cb027a1300dceabb03acd2dfe7dccbc3 | |
| parent | f9e56732cd0cbe20a9addb77be317aa0c665dddc (diff) | |
| download | ATCD-9dc8ff7c9081dbdfc69826f59e12f5e8f11ba675.tar.gz | |
Merge pull request #1903 from likema/proc-gid
Fix incorrect `uid_t` to `gid_t` in `ACE_Process`
(cherry picked from commit 73d9dcd44d257cb427c8510bbec52b0df73a9190)
# Conflicts:
# ACE/ace/Process.h
# ACE/ace/Process.inl
| -rw-r--r-- | ACE/ace/Process.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/Process.h | 12 | ||||
| -rw-r--r-- | ACE/ace/Process.inl | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index ed29ffd5c5a..ea1c4f10c9c 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -407,8 +407,8 @@ ACE_Process::spawn (ACE_Process_Options &options) # endif /* ACE_LACKS_SETPGID */ # if !defined (ACE_LACKS_SETREGID) - if (options.getrgid () != (uid_t) -1 - || options.getegid () != (uid_t) -1) + if (options.getrgid () != (gid_t) -1 + || options.getegid () != (gid_t) -1) if (ACE_OS::setregid (options.getrgid (), options.getegid ()) == -1) { @@ -836,8 +836,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, stderr_ (ACE_INVALID_HANDLE), ruid_ ((uid_t) -1), euid_ ((uid_t) -1), - rgid_ ((uid_t) -1), - egid_ ((uid_t) -1), + rgid_ ((gid_t) -1), + egid_ ((gid_t) -1), #endif /* ACE_WIN32 */ handle_inheritance_ (true), set_handles_called_ (0), diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 1465103ef63..fc6b1af745d 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -347,12 +347,12 @@ public: int setreugid (const ACE_TCHAR* user); void setruid (uid_t id); void seteuid (uid_t id); - void setrgid (uid_t id); - void setegid (uid_t id); + void setrgid (gid_t id); + void setegid (gid_t id); uid_t getruid (void) const; uid_t geteuid (void) const; - uid_t getrgid (void) const; - uid_t getegid (void) const; + gid_t getrgid () const; + gid_t getegid () const; /** * Get the inherit_environment flag. @@ -418,8 +418,8 @@ protected: // These should be set to -1 to leave unchanged (default). uid_t ruid_; uid_t euid_; - uid_t rgid_; - uid_t egid_; + gid_t rgid_; + gid_t egid_; #endif /* ACE_WIN32 */ /// Default true. diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl index 66241f43661..3617c292d83 100644 --- a/ACE/ace/Process.inl +++ b/ACE/ace/Process.inl @@ -291,13 +291,13 @@ ACE_Process_Options::seteuid (uid_t id) } ACE_INLINE void -ACE_Process_Options::setrgid (uid_t id) +ACE_Process_Options::setrgid (gid_t id) { this->rgid_ = id; } ACE_INLINE void -ACE_Process_Options::setegid (uid_t id) +ACE_Process_Options::setegid (gid_t id) { this->egid_ = id; } @@ -314,13 +314,13 @@ ACE_Process_Options::geteuid (void) const return this->euid_; } -ACE_INLINE uid_t +ACE_INLINE gid_t ACE_Process_Options::getrgid (void) const { return this->rgid_; } -ACE_INLINE uid_t +ACE_INLINE gid_t ACE_Process_Options::getegid (void) const { return this->egid_; |