Author: trasz
Date: Mon Aug 3 08:04:31 2015
New Revision: 286222
URL: https://svnweb.freebsd.org/changeset/base/286222
Log:
MFC r282086:
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
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/sys/kern/kern_proc.c
stable/10/usr.sbin/ctld/login.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_proc.c
==============================================================================
--- stable/10/sys/kern/kern_proc.c Mon Aug 3 07:29:57 2015
(r286221)
+++ stable/10/sys/kern/kern_proc.c Mon Aug 3 08:04:31 2015
(r286222)
@@ -2782,7 +2782,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: stable/10/usr.sbin/ctld/login.c
==============================================================================
--- stable/10/usr.sbin/ctld/login.c Mon Aug 3 07:29:57 2015
(r286221)
+++ stable/10/usr.sbin/ctld/login.c Mon Aug 3 08:04:31 2015
(r286222)
@@ -789,9 +789,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
