From owner-p4-projects@FreeBSD.ORG Mon Jul 4 11:24:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D25D16A420; Mon, 4 Jul 2005 11:24:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DA7D16A41C for ; Mon, 4 Jul 2005 11:24:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0467443D48 for ; Mon, 4 Jul 2005 11:24:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j64BO3jL011290 for ; Mon, 4 Jul 2005 11:24:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j64BO3Su011285 for perforce@freebsd.org; Mon, 4 Jul 2005 11:24:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 4 Jul 2005 11:24:03 GMT Message-Id: <200507041124.j64BO3Su011285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2005 11:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=79537 Change 79537 by rwatson@rwatson_paprika on 2005/07/04 11:23:55 Convert ALTQ suser() checks to cap_check() for CAP_NET_ADMIN. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_cbq.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_cdnr.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_hfsc.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_priq.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_red.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_rio.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -1062,11 +1062,7 @@ /* currently only command that an ordinary user can call */ break; default: -#if (__FreeBSD_version > 400000) - error = suser(p); -#else - error = suser(p->p_ucred, &p->p_acflag); -#endif + error = cap_check(p, CAP_NET_ADMIN); if (error) return (error); break; ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1262,11 +1262,7 @@ case CDNR_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) - if ((error = suser(p)) != 0) -#else - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) -#endif + if ((error = cap_check(p, CAP_NET_ADMIN)) != 0) return (error); break; } ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -1975,13 +1975,8 @@ case HFSC_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) - if ((error = suser(p)) != 0) + if ((error = cap_check(p, CAP_NET_ADMIN)) != 0) return (error); -#else - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) - return (error); -#endif break; } ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_priq.c#2 (text+ko) ==== @@ -772,13 +772,8 @@ case PRIQ_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) - if ((error = suser(p)) != 0) + if ((error = cap_check(p, CAP_NET_ADMIN)) != 0) return (error); -#else - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) - return (error); -#endif break; } ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_red.c#2 (text+ko) ==== @@ -781,11 +781,7 @@ case RED_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) - if ((error = suser(p)) != 0) -#else - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) -#endif + if ((error = cap_check(p, CAP_NET_ADMIN)) != 0) return (error); break; } ==== //depot/projects/trustedbsd/sebsd/sys/contrib/altq/altq/altq_rio.c#2 (text+ko) ==== @@ -531,13 +531,8 @@ case RIO_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) - if ((error = suser(p)) != 0) + if ((error = cap_check(p, CAP_NET_ADMIN)) != 0) return (error); -#else - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) - return (error); -#endif break; }