Date: Fri, 5 Feb 2010 00:46:24 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174338 for review Message-ID: <201002050046.o150kOOU035523@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174338 Change 174338 by rwatson@rwatson_vimage_client on 2010/02/05 00:46:03 - Do not print process descriptor pid twice - Handle vnode, fifo, pts and procdesc with default case for network protocol Submitted by: antoine Add new capability rights so that procstat can print them, update copyright. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#15 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007-2009 Robert N. M. Watson + * Copyright (c) 2007-2010 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -168,6 +168,7 @@ { CAP_MAC_GET, "mg" }, { CAP_MAC_SET, "ms" }, { CAP_ACCEPT, "at" }, + { CAP_CONNECT, "co" }, { CAP_BIND, "bd" }, { CAP_GETSOCKOPT, "gs" }, { CAP_SETSOCKOPT, "ss" }, @@ -182,6 +183,17 @@ { CAP_PDGETPID, "pg" }, { CAP_PDWAIT, "pw" }, { CAP_PDKILL, "pk" }, + { CAP_MAPEXEC, "me" }, + { CAP_TTYHOOK, "th" }, + { CAP_FCHDIR, "cd" }, + { CAP_FSCK, "fk" }, + { CAP_ATBASE, "ab" }, + { CAP_ABSOLUTEPATH, "ap" }, + { CAP_CREATE, "cr" }, + { CAP_DELETE, "de" }, + { CAP_MKDIR, "md" }, + { CAP_RMDIR, "rm" }, + { CAP_MKFIFO, "mf" }, }; static const u_int cap_desc_count = sizeof(cap_desc) / sizeof(cap_desc[0]); @@ -414,22 +426,12 @@ } switch (kif->kf_type) { - case KF_TYPE_VNODE: - case KF_TYPE_FIFO: - case KF_TYPE_PTS: - printf("%-3s ", "-"); - break; - case KF_TYPE_SOCKET: printf("%-3s ", protocol_to_string(kif->kf_sock_domain, kif->kf_sock_type, kif->kf_sock_protocol)); break; - case KF_TYPE_PROCDESC: - printf("%-3s %d", "-", kif->kf_pid); - break; - default: printf("%-3s ", "-"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002050046.o150kOOU035523>