svn commit: r297139 - head/lib/libthr/thread

[Konstantin Belousov]

Author: kib
Date: Mon Mar 21 06:46:16 2016
New Revision: 297139
URL: https://svnweb.freebsd.org/changeset/base/297139

Log:
  From libthr, remove special and strange code to set up session and
  control terminal, activated when running with pid 1.  It is
  application duty to handle this, and unsuspecting init replacements
  which are linked with libthr would be broken by this.
  
  The pre-resolving of getpid() is restored, just in case.
  
  Reviewed by:	jilles
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/lib/libthr/thread/thr_init.c
  head/lib/libthr/thread/thr_rtld.c

Modified: head/lib/libthr/thread/thr_init.c
==============================================================================
--- head/lib/libthr/thread/thr_init.c	Mon Mar 21 06:40:54 2016	(r297138)
+++ head/lib/libthr/thread/thr_init.c	Mon Mar 21 06:46:16 2016	(r297139)
@@ -305,7 +305,7 @@ _thread_init_hack(void)
 void
 _libpthread_init(struct pthread *curthread)
 {
-	int fd, first, dlopened;
+	int first, dlopened;
 
 	/* Check if this function has already been called: */
 	if ((_thr_initial != NULL) && (curthread == NULL))
@@ -321,27 +321,6 @@ _libpthread_init(struct pthread *curthre
 	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
 	__thr_interpose_libc();
 
-	/*
-	 * Check for the special case of this process running as
-	 * or in place of init as pid = 1:
-	 */
-	if ((_thr_pid = getpid()) == 1) {
-		/*
-		 * Setup a new session for this process which is
-		 * assumed to be running as root.
-		 */
-		if (setsid() == -1)
-			PANIC("Can't set session ID");
-		if (revoke(_PATH_CONSOLE) != 0)
-			PANIC("Can't revoke console");
-		if ((fd = __sys_openat(AT_FDCWD, _PATH_CONSOLE, O_RDWR)) < 0)
-			PANIC("Can't open console");
-		if (setlogin("root") == -1)
-			PANIC("Can't set login to root");
-		if (_ioctl(fd, TIOCSCTTY, (char *) NULL) == -1)
-			PANIC("Can't set controlling terminal");
-	}
-
 	/* Initialize pthread private data. */
 	init_private();
 

Modified: head/lib/libthr/thread/thr_rtld.c
==============================================================================
--- head/lib/libthr/thread/thr_rtld.c	Mon Mar 21 06:40:54 2016	(r297138)
+++ head/lib/libthr/thread/thr_rtld.c	Mon Mar 21 06:46:16 2016	(r297139)
@@ -227,6 +227,7 @@ _thr_rtld_init(void)
 	_rtld_atfork_post(NULL);
 	_malloc_prefork();
 	_malloc_postfork();
+	getpid();
 	syscall(SYS_getpid);
 
 	/* mask signals, also force to resolve __sys_sigprocmask PLT */