summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--platform.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 002c8814..3f415d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@
- (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into
platform.c
- (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c.
+ - (dtucker) [platform.c] Only call setpgrp on BSDI if running as root to
+ retain previous behavior.
20101025
- (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/platform.c b/platform.c
index 20b47834..570f130a 100644
--- a/platform.c
+++ b/platform.c
@@ -1,4 +1,4 @@
-/* $Id: platform.c,v 1.7 2010/11/05 01:45:18 dtucker Exp $ */
+/* $Id: platform.c,v 1.8 2010/11/05 01:50:41 dtucker Exp $ */
/*
* Copyright (c) 2006 Darren Tucker. All rights reserved.
@@ -76,7 +76,8 @@ platform_setusercontext(struct passwd *pw)
#endif
#if defined(HAVE_LOGIN_CAP) && defined (__bsdi__)
- setpgid(0, 0);
+ if (getuid() == 0 || geteuid() == 0)
+ setpgid(0, 0);
# endif
}