about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-09-09T15·55+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-09-09T15·55+0000
commit5396304c73190c6898981caf653fc1b28be71f70 (patch)
tree3c028375474b943d91e505f5b853fc8abdaa8a02 /src
parente043fc7d0b68bedaabe236c2f2080a33bb967ee5 (diff)
* Use setre[ug]id() instead of setres[ug]id(), since the former is
  more common than the latter (which exists only on Linux and
  FreeBSD).  We don't really care about dropping the saved IDs since
  there apparently is no way to quiry them in any case, so it can't
  influence the build (unlike the effective IDs which are checked by
  Perl for instance).

Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/libmain/shared.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5637382172a2..b7eb905f9273 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \
 SETUID_PROGS = nix-store nix-instantiate nix-env
 install-exec-hook:
 if SETUID_HACK
-if HAVE_SETRESUID
+if HAVE_SETREUID
 	cd $(DESTDIR)$(bindir) && chown @NIX_USER@ $(SETUID_PROGS) \
 	  && chgrp @NIX_GROUP@ $(SETUID_PROGS) && chmod ug+s $(SETUID_PROGS)
 else
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index a5c45d853b5c..d0ea3aab8628 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -169,9 +169,9 @@ static void initAndRun(int argc, char * * argv)
 }
 
 
-#if HAVE_SETRESUID
-#define _setuid(uid) setresuid(uid, uid, uid)
-#define _setgid(gid) setresgid(gid, gid, gid)
+#if HAVE_SETREUID
+#define _setuid(uid) setreuid(uid, uid)
+#define _setgid(gid) setregid(gid, gid)
 #else
 /* Only works properly when run by root. */
 #define _setuid(uid) setuid(uid)
@@ -208,7 +208,7 @@ void switchToNixUser()
     /* !!! Apparently it is unspecified whether getgroups() includes
        the effective gid.  In that case the following test is always
        true *if* the program is installed setgid (which we do when we
-       have setresuid()).  On Linux this doesn't appear to be the
+       have setreuid()).  On Linux this doesn't appear to be the
        case, but we should switch to the real gid before doing this
        test, and then switch back to the saved gid. */