ruby-changes:23171
From: nobu <ko1@a...>
Date: Tue, 3 Apr 2012 18:36:03 +0900 (JST)
Subject: [ruby-changes:23171] nobu:r35222 (ruby_1_9_3): merge revision(s) 35221:
nobu 2012-04-03 18:34:43 +0900 (Tue, 03 Apr 2012) New Revision: 35222 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35222 Log: merge revision(s) 35221: * process.c (setreuid, setregid): suppress warnings. [ruby-core:43374][Bug #6169] Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/process.c branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 35221) +++ ruby_1_9_3/ChangeLog (revision 35222) @@ -1,3 +1,8 @@ +Tue Apr 3 18:34:33 2012 Nobuyoshi Nakada <nobu@r...> + + * process.c (setreuid, setregid): suppress warnings. + [ruby-core:43374][Bug #6169] + Sat Mar 31 12:11:21 2012 Martin Bosslet <Martin.Bosslet@g...> * ext/openssl/ossl_x509cert.c: Fix doc typo. Index: ruby_1_9_3/process.c =================================================================== --- ruby_1_9_3/process.c (revision 35221) +++ ruby_1_9_3/process.c (revision 35222) @@ -110,9 +110,11 @@ #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 @@ 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 @@ 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; Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 35221) +++ ruby_1_9_3/version.h (revision 35222) @@ -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" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/