From 9a14f58e24328dd309056f947e1f1687cb28273a Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Sat, 24 Oct 2015 19:47:44 +0000
Subject: [PATCH] Move removal of "getpw" pledge after all setusercontext()
 calls, for yp sake. Noticed by matthieu@

---
 usr.bin/su/su.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index eb21b96dc60..2be54c32e7a 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: su.c,v 1.68 2015/10/23 03:44:59 deraadt Exp $	*/
+/*	$OpenBSD: su.c,v 1.69 2015/10/24 19:47:44 miod Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -215,9 +215,6 @@ main(int argc, char **argv)
 		fprintf(stderr, "Login incorrect\n");
 	}
 
-	if (pledge("stdio rpath exec id", NULL) == -1)
-		err(1, "pledge");
-
 	if (!altshell) {
 		if (asme) {
 			/* if asme and non-std target shell, must be root */
@@ -286,6 +283,9 @@ main(int argc, char **argv)
 			auth_err(as, 1, "unable to set environment");
 	}
 
+	if (pledge("stdio rpath exec id", NULL) == -1)
+		err(1, "pledge");
+
 	np = *argv ? argv : argv - 1;
 	if (iscsh == YES) {
 		if (fastlogin)
-- 
2.20.1