[Midnightbsd-cvs] src [10833] trunk/usr.sbin/chroot/chroot.c: sync iwth freebsd.

[laffer1 at midnightbsd.org]

Revision: 10833
          http://svnweb.midnightbsd.org/src/?rev=10833
Author:   laffer1
Date:     2018-06-10 16:36:01 -0400 (Sun, 10 Jun 2018)
Log Message:
-----------
sync iwth freebsd.

Modified Paths:
--------------
    trunk/usr.sbin/chroot/Makefile
    trunk/usr.sbin/chroot/chroot.8
    trunk/usr.sbin/chroot/chroot.c

Property Changed:
----------------
    trunk/usr.sbin/chroot/chroot.8

Modified: trunk/usr.sbin/chroot/Makefile
===================================================================
--- trunk/usr.sbin/chroot/Makefile	2018-06-10 20:33:56 UTC (rev 10832)
+++ trunk/usr.sbin/chroot/Makefile	2018-06-10 20:36:01 UTC (rev 10833)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/chroot/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=	chroot
 MAN=	chroot.8

Modified: trunk/usr.sbin/chroot/chroot.8
===================================================================
--- trunk/usr.sbin/chroot/chroot.8	2018-06-10 20:33:56 UTC (rev 10832)
+++ trunk/usr.sbin/chroot/chroot.8	2018-06-10 20:36:01 UTC (rev 10833)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.8	8.1 (Berkeley) 6/9/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/chroot/chroot.8 241330 2012-10-07 19:53:04Z joel $
 .\"
 .Dd June 7, 2003
 .Dt CHROOT 8
@@ -60,7 +61,7 @@
 the user,
 group and group list of the process are set to
 these values after the
-.Xr chroot 8
+.Nm
 has taken place.
 .Sh ENVIRONMENT
 The following environment variable is referenced by


Property changes on: trunk/usr.sbin/chroot/chroot.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/chroot/chroot.c
===================================================================
--- trunk/usr.sbin/chroot/chroot.c	2018-06-10 20:33:56 UTC (rev 10832)
+++ trunk/usr.sbin/chroot/chroot.c	2018-06-10 20:36:01 UTC (rev 10833)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +40,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/chroot/chroot.c 227223 2011-11-06 16:40:17Z ed $");
 
 #include <sys/types.h>
 
@@ -56,16 +57,12 @@
 
 static void usage(void);
 
-char	*user;		/* user to switch to before running program */
-char	*group;		/* group to switch to ... */
-char	*grouplist;	/* group list to switch to ... */
-
 int
 main(int argc, char *argv[])
 {
 	struct group	*gp;
 	struct passwd	*pw;
-	char		*endp, *p;
+	char		*endp, *p, *user, *group, *grouplist;
 	const char	*shell;
 	gid_t		gid, *gidlist;
 	uid_t		uid;
@@ -74,6 +71,7 @@
 
 	gid = 0;
 	uid = 0;
+	user = group = grouplist = NULL;
 	while ((ch = getopt(argc, argv, "G:g:u:")) != -1) {
 		switch(ch) {
 		case 'u':