[前][次][番号順一覧][スレッド一覧]

ruby-changes:17695

From: nobu <ko1@a...>
Date: Sat, 6 Nov 2010 07:33:19 +0900 (JST)
Subject: [ruby-changes:17695] Ruby:r29705 (trunk): * process.c (p_uid_change_privilege, p_gid_change_privilege):

nobu	2010-11-06 07:33:14 +0900 (Sat, 06 Nov 2010)

  New Revision: 29705

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29705

  Log:
    * process.c (p_uid_change_privilege, p_gid_change_privilege):
      suppress warnings.

  Modified files:
    trunk/process.c

Index: process.c
===================================================================
--- process.c	(revision 29704)
+++ process.c	(revision 29705)
@@ -4227,10 +4227,12 @@
 	SAVED_USER_ID = uid;
 #elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
 	if (SAVED_USER_ID == uid) {
-	    if (setreuid((getuid() == uid)? -1: uid,
-			 (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
+	    if (setreuid((getuid() == uid)? (rb_uid_t)-1: uid,
+			 (geteuid() == uid)? (rb_uid_t)-1: uid) < 0)
+		rb_sys_fail(0);
 	} else if (getuid() != uid) {
-	    if (setreuid(uid, (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
+	    if (setreuid(uid, (geteuid() == uid)? (rb_uid_t)-1: uid) < 0)
+		rb_sys_fail(0);
 	    SAVED_USER_ID = uid;
 	} else if (/* getuid() == uid && */ geteuid() != uid) {
 	    if (setreuid(geteuid(), uid) < 0) rb_sys_fail(0);
@@ -4857,10 +4859,12 @@
 	SAVED_GROUP_ID = gid;
 #elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
 	if (SAVED_GROUP_ID == gid) {
-	    if (setregid((getgid() == gid)? -1: gid,
-			 (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
+	    if (setregid((getgid() == gid)? (rb_uid_t)-1: gid,
+			 (getegid() == gid)? (rb_uid_t)-1: gid) < 0)
+		rb_sys_fail(0);
 	} else if (getgid() != gid) {
-	    if (setregid(gid, (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
+	    if (setregid(gid, (getegid() == gid)? (rb_uid_t)-1: gid) < 0)
+		rb_sys_fail(0);
 	    SAVED_GROUP_ID = gid;
 	} else if (/* getgid() == gid && */ getegid() != gid) {
 	    if (setregid(getegid(), gid) < 0) rb_sys_fail(0);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]