From 66c2a8a9d6340854b606135d914aa22ab274d674 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 16 Mar 2007 11:53:15 +0000 Subject: * merge -c 12071 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/etc/etc.c | 2 +- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b11892bc..69d82db0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 16 18:28:06 2007 Akinori MUSHA + + * ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid() + always returning the (real) group entry of the running process; + reported by: UEDA Hiroyuki + in [ruby-dev:30586]. + Fri Mar 16 16:33:58 2007 Akinori MUSHA * ext/thread/thread.c (unlock_mutex_inner): Make sure that the diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 447d833bc..486963378 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -337,7 +337,7 @@ etc_getgrgid(obj, id) struct group *grp; rb_secure(4); - gid = getgid(); + gid = PW_VAL2GID(id); grp = getgrgid(gid); if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid); return setup_group(grp); diff --git a/version.h b/version.h index 7613e060f..432a0e061 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-03-16" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070316 -#define RUBY_PATCHLEVEL 2 +#define RUBY_PATCHLEVEL 3 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit