From owner-p4-projects@FreeBSD.ORG  Mon Apr 15 23:18:09 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 95851A2C; Mon, 15 Apr 2013 23:18:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 56218A2A
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 23:18:09 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 46D351F95
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 23:18:09 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3FNI8eT070494
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 23:18:08 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3FNI8nn070491
 for perforce@freebsd.org; Mon, 15 Apr 2013 23:18:08 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 15 Apr 2013 23:18:08 GMT
Message-Id: <201304152318.r3FNI8nn070491@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 227753 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Apr 2013 23:18:09 -0000

http://p4web.freebsd.org/@@227753?ac=10

Change 227753 by brooks@brooks_zenith on 2013/04/15 23:17:28

	Use setusercontext() to more throughly set up the terminal
	context.  The useful effect of this change is that PATH is
	set to a useful value.
	
	Reported by:	rwatson

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#10 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#10 (text+ko) ====

@@ -43,7 +43,9 @@
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <libutil.h>
+#include <login_cap.h>
 #include <poll.h>
+#include <pwd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -193,6 +195,8 @@
 start_keyboard_shell(void)
 {
   int pmaster, pslave;
+  login_cap_t *lcap = NULL;
+  struct passwd *pwd = NULL;
 
   if (openpty(&pmaster, &pslave, NULL, NULL, NULL) == -1)
     err(1, "openpty");
@@ -208,6 +212,15 @@
       syslog(LOG_ALERT, "login_tty failed in child: %s", strerror(errno));
       err(1, "tty_login");
     }
+
+    if ((pwd = getpwuid(getuid())) == NULL)
+      err(1, "getpwuid: %s", getuid());
+    if ((lcap = login_getpwclass(pwd)) == NULL)
+      err(1, "login_getpwclass");
+    if (setusercontext(lcap, pwd, pwd->pw_uid,
+	LOGIN_SETALL & ~LOGIN_SETGROUP & ~LOGIN_SETLOGIN) != 0)
+      err(1, "setusercontext");
+
     execl("/bin/sh", "sh", NULL);
     syslog(LOG_ALERT, "exec of /bin/sh failed: %s", strerror(errno));
     err(1, "execl()");