1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-04-25 10:17:15 +00:00
parent ef9408d8dd
commit 2f60d08519
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Apr 25 19:16:30 2014 Tanaka Akira <akr@fsij.org>
* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.
Fri Apr 25 14:55:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 25 14:55:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_func___builtin_unreachable): try with an * configure.in (rb_cv_func___builtin_unreachable): try with an

8
lib/webrick/utils.rb
View File

@ -10,11 +10,7 @@
require 'socket' require 'socket'
require 'fcntl' require 'fcntl'
begin require 'etc'
require 'etc'
rescue LoadError
nil
end
module WEBrick module WEBrick
module Utils module Utils
@ -41,7 +37,7 @@ module WEBrick
## ##
# Changes the process's uid and gid to the ones of +user+ # Changes the process's uid and gid to the ones of +user+
def su(user) def su(user)
if defined?(Etc) && (pw = Etc.getpwnam(user)) if pw = Etc.getpwnam(user)
Process::initgroups(user, pw.gid) Process::initgroups(user, pw.gid)
Process::Sys::setgid(pw.gid) Process::Sys::setgid(pw.gid)
Process::Sys::setuid(pw.uid) Process::Sys::setuid(pw.uid)