Date: Mon, 27 Apr 2015 11:18:17 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282086 - in head: sys/kern usr.sbin/ctld Message-ID: <201504271118.t3RBIHTB092788@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Mon Apr 27 11:18:16 2015 New Revision: 282086 URL: https://svnweb.freebsd.org/changeset/base/282086 Log: Make setproctitle(3) work in Capsicum capability mode. This makes ctld(8) child processes to indicate initiator address and name in their titles, similar to what iscsid(8) child processes do. PR: 181352 Differential Revision: https://reviews.freebsd.org/D2363 Reviewed by: rwatson@, mjg@ MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_proc.c head/usr.sbin/ctld/login.c Modified: head/sys/kern/kern_proc.c ============================================================================== --- head/sys/kern/kern_proc.c Mon Apr 27 11:13:19 2015 (r282085) +++ head/sys/kern/kern_proc.c Mon Apr 27 11:18:16 2015 (r282086) @@ -2822,7 +2822,7 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC sysctl_kern_proc, "Return process table, no threads"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, - CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, + CTLFLAG_RW | CTLFLAG_CAPWR | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_args, "Process argument list"); static SYSCTL_NODE(_kern_proc, KERN_PROC_ENV, env, CTLFLAG_RD | CTLFLAG_MPSAFE, Modified: head/usr.sbin/ctld/login.c ============================================================================== --- head/usr.sbin/ctld/login.c Mon Apr 27 11:13:19 2015 (r282085) +++ head/usr.sbin/ctld/login.c Mon Apr 27 11:18:16 2015 (r282086) @@ -800,9 +800,6 @@ login(struct connection *conn) } conn->conn_initiator_name = checked_strdup(initiator_name); log_set_peer_name(conn->conn_initiator_name); - /* - * XXX: This doesn't work (does nothing) because of Capsicum. - */ setproctitle("%s (%s)", conn->conn_initiator_addr, conn->conn_initiator_name); redirected = login_portal_redirect(conn, request);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504271118.t3RBIHTB092788>