[src/netbsd-1-6]: src/gnu/dist/cvs/src Pull up revision 1.14 (requested by jm...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8b371148069a
branches:  netbsd-1-6
changeset: 531223:8b371148069a
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Apr 01 07:03:48 2004 +0000

description:
Pull up revision 1.14 (requested by jmc in ticket #1646):
Correctly fallback into the normal path when SETXID_SUPPORT is defined
but the binary was the normal one.  Fixes PR#23471.

diffstat:

 gnu/dist/cvs/src/server.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r fbfee8d6673b -r 8b371148069a gnu/dist/cvs/src/server.c
--- a/gnu/dist/cvs/src/server.c Thu Apr 01 03:08:10 2004 +0000
+++ b/gnu/dist/cvs/src/server.c Thu Apr 01 07:03:48 2004 +0000
@@ -5218,9 +5218,8 @@
     if (getuid() != geteuid())
        rc = setuid (geteuid ());
     else
-#else
+#endif
        rc = setuid (pw->pw_uid);
-#endif
     if (rc < 0)
     {
        /* Note that this means that if run as a non-root user,