From 401116766b805732165cf4cb70705a451d452b08 Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 4 May 2012 21:57:38 +0000 Subject: [PATCH] generalise the skipping sete{u,g}id() case for Coherent, not just BeOS --- Build.sh | 7 +++++-- misc.c | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Build.sh b/Build.sh index d3d0636..2c27855 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.559 2012/05/04 21:42:50 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.560 2012/05/04 21:57:36 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 @@ -494,6 +494,8 @@ BeOS) esac # BeOS has no real tty either add_cppflags -DMKSH_UNEMPLOYED + # BeOS doesn't have different UIDs and GIDs + add_cppflags -DMKSH__NO_SETEUGID ;; BSD/OS) : ${HAVE_SETLOCALE_CTYPE=0} @@ -501,6 +503,7 @@ BSD/OS) Coherent) oswarn="; it has major issues" check_categories="$check_categories nosymlink" + add_cppflags -DMKSH__NO_SETEUGID ;; CYGWIN*) : ${HAVE_SETLOCALE_CTYPE=0} @@ -1405,7 +1408,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.559 2012/05/04 21:42:50 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.560 2012/05/04 21:57:36 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (0); } EOF case $cm in diff --git a/misc.c b/misc.c index 9bb1ac3..965ed14 100644 --- a/misc.c +++ b/misc.c @@ -30,7 +30,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.189 2012/05/04 20:49:06 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.190 2012/05/04 21:57:38 tg Exp $"); /* type bits for unsigned char */ unsigned char chtypes[UCHAR_MAX + 1]; @@ -254,13 +254,11 @@ change_flag(enum sh_flag f, int what, unsigned int newval) #else /* seteuid, setegid, setgid don't EAGAIN on Linux */ ksheuid = kshuid = getuid(); -#ifndef __BEOS__ - /* BeOS doesn't have different UIDs */ +#ifndef MKSH__NO_SETEUGID seteuid(ksheuid); #endif DO_SETUID(setuid, (ksheuid)); -#ifndef __BEOS__ - /* BeOS doesn't have different GIDs */ +#ifndef MKSH__NO_SETEUGID setegid(kshegid); #endif setgid(kshegid);