diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | process.c | 14 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Tue Apr 3 18:34:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * process.c (setreuid, setregid): suppress warnings. + [ruby-core:43374][Bug #6169] + Sat Mar 31 12:11:21 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_x509cert.c: Fix doc typo. @@ -110,9 +110,11 @@ static VALUE rb_cProcessTms; #ifdef BROKEN_SETREUID #define setreuid ruby_setreuid +int setreuid(rb_uid_t ruid, rb_uid_t euid); #endif #ifdef BROKEN_SETREGID #define setregid ruby_setregid +int setregid(rb_gid_t rgid, rb_gid_t egid); #endif #if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__) @@ -4214,11 +4216,11 @@ static rb_uid_t SAVED_USER_ID = -1; int setreuid(rb_uid_t ruid, rb_uid_t euid) { - if (ruid != -1 && ruid != getuid()) { - if (euid == -1) euid = geteuid(); + if (ruid != (rb_uid_t)-1 && ruid != getuid()) { + if (euid == (rb_uid_t)-1) euid = geteuid(); if (setuid(ruid) < 0) return -1; } - if (euid != -1 && euid != geteuid()) { + if (euid != (rb_uid_t)-1 && euid != geteuid()) { if (seteuid(euid) < 0) return -1; } return 0; @@ -4926,11 +4928,11 @@ static rb_gid_t SAVED_GROUP_ID = -1; int setregid(rb_gid_t rgid, rb_gid_t egid) { - if (rgid != -1 && rgid != getgid()) { - if (egid == -1) egid = getegid(); + if (rgid != (rb_gid_t)-1 && rgid != getgid()) { + if (egid == (rb_gid_t)-1) egid = getegid(); if (setgid(rgid) < 0) return -1; } - if (egid != -1 && egid != getegid()) { + if (egid != (rb_gid_t)-1 && egid != getegid()) { if (setegid(egid) < 0) return -1; } return 0; @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 173 +#define RUBY_PATCHLEVEL 174 -#define RUBY_RELEASE_DATE "2012-04-01" +#define RUBY_RELEASE_DATE "2012-04-03" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" |