From owner-p4-projects@FreeBSD.ORG Sun Jan 23 13:59:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B2CC16A4D0; Sun, 23 Jan 2005 13:59:41 +0000 (GMT) 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 281EB16A4CE for ; Sun, 23 Jan 2005 13:59:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F132543D1D for ; Sun, 23 Jan 2005 13:59:40 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0NDxeSF055099 for ; Sun, 23 Jan 2005 13:59:40 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0NDxevN055096 for perforce@freebsd.org; Sun, 23 Jan 2005 13:59:40 GMT (envelope-from wsalamon@computer.org) Date: Sun, 23 Jan 2005 13:59:40 GMT Message-Id: <200501231359.j0NDxevN055096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jan 2005 13:59:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=69518 Change 69518 by wsalamon@rickenbacker on 2005/01/23 13:58:42 In audit_sysclose(), drop the reference to the file. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#17 (text+ko) ==== @@ -2260,7 +2260,7 @@ return; audit_arg_vnpath((struct vnode *)fp->f_data, ARG_VNODE1); - + fdrop(fp, td); } #else /* !AUDIT */ From owner-p4-projects@FreeBSD.ORG Mon Jan 24 12:38:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4D1316A4D0; Mon, 24 Jan 2005 12:38:25 +0000 (GMT) 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 9690116A4CE for ; Mon, 24 Jan 2005 12:38:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8094F43D2F for ; Mon, 24 Jan 2005 12:38:25 +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 j0OCcPPR036399 for ; Mon, 24 Jan 2005 12:38:25 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 j0OCcPLB036396 for perforce@freebsd.org; Mon, 24 Jan 2005 12:38:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 12:38:25 GMT Message-Id: <200501241238.j0OCcPLB036396@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 Subject: PERFORCE change 69585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 12:38:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=69585 Change 69585 by rwatson@rwatson_tislabs on 2005/01/24 12:37:58 Necessary defaults/rc.conf entries so that the boot rc scripts don't complain about a lack of a default for the audit daemon. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#4 (text+ko) ==== @@ -418,6 +418,8 @@ ### Miscellaneous administrative options ################### ############################################################## +auditd_enable="NO" # Run the audit daemon. +auditd_flags="" # Whcih options to pass to the audit daemon. cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). cron_dst="YES" # Handle DST transitions intelligently (YES/NO) From owner-p4-projects@FreeBSD.ORG Mon Jan 24 12:47:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C263516A4D0; Mon, 24 Jan 2005 12:47:38 +0000 (GMT) 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 9BB2C16A4CE for ; Mon, 24 Jan 2005 12:47:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87A8943D46 for ; Mon, 24 Jan 2005 12:47:38 +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 j0OClcSc043424 for ; Mon, 24 Jan 2005 12:47:38 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 j0OClc7m043421 for perforce@freebsd.org; Mon, 24 Jan 2005 12:47:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 12:47:38 GMT Message-Id: <200501241247.j0OClc7m043421@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 Subject: PERFORCE change 69589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 12:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=69589 Change 69589 by rwatson@rwatson_tislabs on 2005/01/24 12:46:46 More accurately spell paths to configuration file dependencies for auditd. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#4 (text+ko) ==== @@ -16,8 +16,9 @@ command="/usr/sbin/${name}" rcvar="auditd_enable" command_args="${auditd_flags}" -required_files="/etc/audit_class /etc/audit_control /etc/audit_event - /etc/audit_user /etc/audit_warn /etc/auditd_control" +required_files="/etc/security/audit_class /etc/security/audit_control + /etc/security/audit_event /etc/security/audit_user + /etc/security/audit_warn /etc/security/auditd_control" auditd_stop() { From owner-p4-projects@FreeBSD.ORG Mon Jan 24 12:48:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2A3F16A4D0; Mon, 24 Jan 2005 12:48:40 +0000 (GMT) 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 9DC6E16A4CE for ; Mon, 24 Jan 2005 12:48:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8904743D53 for ; Mon, 24 Jan 2005 12:48:40 +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 j0OCmeLN043459 for ; Mon, 24 Jan 2005 12:48:40 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 j0OCmexU043456 for perforce@freebsd.org; Mon, 24 Jan 2005 12:48:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 12:48:40 GMT Message-Id: <200501241248.j0OCmexU043456@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 Subject: PERFORCE change 69591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 12:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=69591 Change 69591 by rwatson@rwatson_tislabs on 2005/01/24 12:47:41 Speeling. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#5 (text+ko) ==== @@ -419,7 +419,7 @@ ############################################################## auditd_enable="NO" # Run the audit daemon. -auditd_flags="" # Whcih options to pass to the audit daemon. +auditd_flags="" # Which options to pass to the audit daemon. cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). cron_dst="YES" # Handle DST transitions intelligently (YES/NO) From owner-p4-projects@FreeBSD.ORG Mon Jan 24 13:01:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AA9016A4D0; Mon, 24 Jan 2005 13:01:57 +0000 (GMT) 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 2793616A4CE for ; Mon, 24 Jan 2005 13:01:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F23E443D31 for ; Mon, 24 Jan 2005 13:01:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0OD1uZY043935 for ; Mon, 24 Jan 2005 13:01:56 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0OD1uhN043932 for perforce@freebsd.org; Mon, 24 Jan 2005 13:01:56 GMT (envelope-from wsalamon@computer.org) Date: Mon, 24 Jan 2005 13:01:56 GMT Message-Id: <200501241301.j0OD1uhN043932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 13:01:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=69592 Change 69592 by wsalamon@rickenbacker on 2005/01/24 13:01:17 Remove the name of the FIFO that is no longer used. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#5 (text+ko) ==== @@ -18,7 +18,7 @@ command_args="${auditd_flags}" required_files="/etc/security/audit_class /etc/security/audit_control /etc/security/audit_event /etc/security/audit_user - /etc/security/audit_warn /etc/security/auditd_control" + /etc/security/audit_warn" auditd_stop() { From owner-p4-projects@FreeBSD.ORG Mon Jan 24 16:22:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 958CA16A4D0; Mon, 24 Jan 2005 16:22:07 +0000 (GMT) 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 710F416A4CF for ; Mon, 24 Jan 2005 16:22:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E0CA43D46 for ; Mon, 24 Jan 2005 16:22:07 +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 j0OGM7j4054275 for ; Mon, 24 Jan 2005 16:22:07 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 j0OGM6L9054272 for perforce@freebsd.org; Mon, 24 Jan 2005 16:22:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 16:22:06 GMT Message-Id: <200501241622.j0OGM6L9054272@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 Subject: PERFORCE change 69610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 16:22:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=69610 Change 69610 by rwatson@rwatson_tislabs on 2005/01/24 16:21:14 Add a Makefile for praudit(1). Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 24 16:22:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EAEF16A4DF; Mon, 24 Jan 2005 16:22:08 +0000 (GMT) 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 B2B8716A4DE for ; Mon, 24 Jan 2005 16:22:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8539F43D46 for ; Mon, 24 Jan 2005 16:22:07 +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 j0OGM7El054281 for ; Mon, 24 Jan 2005 16:22:07 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 j0OGM7i3054278 for perforce@freebsd.org; Mon, 24 Jan 2005 16:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 16:22:07 GMT Message-Id: <200501241622.j0OGM7i3054278@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 Subject: PERFORCE change 69611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 16:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=69611 Change 69611 by rwatson@rwatson_tislabs on 2005/01/24 16:22:03 Add a Makefile for auditreduce(1). Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditreduce/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 24 20:15:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63B116A4CE; Mon, 24 Jan 2005 20:15:56 +0000 (GMT) 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 A22AD16A4CF for ; Mon, 24 Jan 2005 20:15:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F4F943D45 for ; Mon, 24 Jan 2005 20:15:56 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0OKFtVc071907 for ; Mon, 24 Jan 2005 20:15:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0OKFrZN071904 for perforce@freebsd.org; Mon, 24 Jan 2005 20:15:53 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Jan 2005 20:15:53 GMT Message-Id: <200501242015.j0OKFrZN071904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 69625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 20:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=69625 Change 69625 by sam@sam_ebb on 2005/01/24 20:15:24 IFC @ 69624 Affected files ... .. //depot/projects/wifi/Makefile.inc1#11 integrate .. //depot/projects/wifi/bin/rcp/rcp.1#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/wifi/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/wifi/contrib/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/wifi/etc/namedb/named.conf#3 integrate .. //depot/projects/wifi/etc/rc.d/gbde#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2#5 integrate .. //depot/projects/wifi/lib/libalias/libalias.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/wifi/lib/libarchive/libarchive.3#4 integrate .. //depot/projects/wifi/lib/libbluetooth/bluetooth.3#4 integrate .. //depot/projects/wifi/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/wifi/lib/libc/alpha/gen/ldexp.c#2 delete .. //depot/projects/wifi/lib/libc/arm/gen/ldexp.c#2 delete .. //depot/projects/wifi/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/wifi/lib/libc/gen/check_utility_compat.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/exec.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/wifi/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/popen.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/rand48.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/readpassphrase.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/shm_open.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/time.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/utime.3#3 integrate .. //depot/projects/wifi/lib/libc/ia64/gen/ldexp.c#2 delete .. //depot/projects/wifi/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/wifi/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/wifi/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/wifi/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/net/ethers.3#2 integrate .. //depot/projects/wifi/lib/libc/net/eui64.3#2 integrate .. //depot/projects/wifi/lib/libc/net/gai_strerror.3#1 branch .. //depot/projects/wifi/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/wifi/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/getifmaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/wifi/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/wifi/lib/libc/net/hesiod.3#2 integrate .. //depot/projects/wifi/lib/libc/net/inet6_opt_init.3#2 integrate .. //depot/projects/wifi/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/wifi/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/wifi/lib/libc/net/inet6_rthdr_space.3#2 integrate .. //depot/projects/wifi/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/wifi/lib/libc/net/resolver.3#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.3#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#4 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/ldexp.c#2 delete .. //depot/projects/wifi/lib/libc/regex/regex.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/getrpcent.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc.5#2 integrate .. //depot/projects/wifi/lib/libc/sparc64/gen/ldexp.c#2 delete .. //depot/projects/wifi/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/wifi/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/wifi/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/getopt_long.3#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/hcreate.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/lsearch.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/wifi/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/wifi/lib/libc/string/strtok.3#2 integrate .. //depot/projects/wifi/lib/libc/sys/brk.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mlock.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mount.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/poll.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/rfork.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/rtprio.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/select.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/send.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/stat.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/sync.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/wait.2#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/wifi/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/wifi/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_geterr.3#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_getfiles.3#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_getprocs.3#3 integrate .. //depot/projects/wifi/lib/libkvm/kvm_open.3#2 integrate .. //depot/projects/wifi/lib/libmd/mdX.3#2 integrate .. //depot/projects/wifi/lib/libmd/ripemd.3#2 integrate .. //depot/projects/wifi/lib/libmd/sha.3#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_lastlog/pam_lastlog.8#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/wifi/lib/libsdp/sdp.3#2 integrate .. //depot/projects/wifi/lib/libstand/libstand.3#3 integrate .. //depot/projects/wifi/lib/libufs/ufs_disk_close.3#2 integrate .. //depot/projects/wifi/lib/libusbhid/usbhid.3#2 integrate .. //depot/projects/wifi/lib/libutil/_secure_path.3#2 integrate .. //depot/projects/wifi/lib/libutil/auth.3#2 integrate .. //depot/projects/wifi/lib/libutil/auth.conf.5#2 integrate .. //depot/projects/wifi/lib/libutil/property.3#2 integrate .. //depot/projects/wifi/lib/libvgl/vgl.3#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#4 integrate .. //depot/projects/wifi/lib/msun/arm/fenv.h#3 integrate .. //depot/projects/wifi/lib/msun/ia64/s_fma.S#1 branch .. //depot/projects/wifi/lib/msun/ia64/s_fmaf.S#1 branch .. //depot/projects/wifi/lib/msun/man/fma.3#1 branch .. //depot/projects/wifi/lib/msun/man/ieee.3#2 integrate .. //depot/projects/wifi/lib/msun/man/math.3#4 integrate .. //depot/projects/wifi/lib/msun/src/math.h#4 integrate .. //depot/projects/wifi/lib/msun/src/s_fma.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_fmaf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/wifi/release/scripts/print-cdrom-packages.sh#2 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#8 integrate .. //depot/projects/wifi/sbin/dump/dump.8#3 integrate .. //depot/projects/wifi/sbin/dump/main.c#2 integrate .. //depot/projects/wifi/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/wifi/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/wifi/sbin/newfs/newfs.8#2 integrate .. //depot/projects/wifi/sbin/newfs/newfs.c#3 integrate .. //depot/projects/wifi/sbin/newfs/newfs.h#2 integrate .. //depot/projects/wifi/sbin/newfs_msdos/Makefile#3 integrate .. //depot/projects/wifi/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#8 integrate .. //depot/projects/wifi/share/examples/scsi_target/scsi_target.8#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/wifi/share/man/man3/stdarg.3#2 integrate .. //depot/projects/wifi/share/man/man4/adv.4#2 integrate .. //depot/projects/wifi/share/man/man4/adw.4#2 integrate .. //depot/projects/wifi/share/man/man4/aha.4#2 integrate .. //depot/projects/wifi/share/man/man4/ahc.4#2 integrate .. //depot/projects/wifi/share/man/man4/ahd.4#2 integrate .. //depot/projects/wifi/share/man/man4/bktr.4#5 integrate .. //depot/projects/wifi/share/man/man4/blackhole.4#2 integrate .. //depot/projects/wifi/share/man/man4/bpf.4#3 integrate .. //depot/projects/wifi/share/man/man4/bridge.4#2 integrate .. //depot/projects/wifi/share/man/man4/bt.4#2 integrate .. //depot/projects/wifi/share/man/man4/ccd.4#2 integrate .. //depot/projects/wifi/share/man/man4/cd.4#2 integrate .. //depot/projects/wifi/share/man/man4/ch.4#2 integrate .. //depot/projects/wifi/share/man/man4/dcons.4#2 integrate .. //depot/projects/wifi/share/man/man4/divert.4#4 integrate .. //depot/projects/wifi/share/man/man4/dpt.4#2 integrate .. //depot/projects/wifi/share/man/man4/ed.4#2 integrate .. //depot/projects/wifi/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/wifi/share/man/man4/fatm.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwe.4#3 integrate .. //depot/projects/wifi/share/man/man4/fwip.4#3 integrate .. //depot/projects/wifi/share/man/man4/gdb.4#4 integrate .. //depot/projects/wifi/share/man/man4/hatm.4#2 integrate .. //depot/projects/wifi/share/man/man4/hifn.4#2 integrate .. //depot/projects/wifi/share/man/man4/hptmv.4#3 integrate .. //depot/projects/wifi/share/man/man4/icmp6.4#2 integrate .. //depot/projects/wifi/share/man/man4/ifmib.4#2 integrate .. //depot/projects/wifi/share/man/man4/inet.4#3 integrate .. //depot/projects/wifi/share/man/man4/ip.4#2 integrate .. //depot/projects/wifi/share/man/man4/ip6.4#2 integrate .. //depot/projects/wifi/share/man/man4/isp.4#2 integrate .. //depot/projects/wifi/share/man/man4/joy.4#2 integrate .. //depot/projects/wifi/share/man/man4/kld.4#2 integrate .. //depot/projects/wifi/share/man/man4/led.4#2 integrate .. //depot/projects/wifi/share/man/man4/lpt.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_none.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.alpha/osf1.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/aic.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/apm.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ar.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/el.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ex.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/fe.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/lnc.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/longrun.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/mcd.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/scd.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/spkr.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/sr.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/streams.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/svr4.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/wifi/share/man/man4/mem.4#4 integrate .. //depot/projects/wifi/share/man/man4/meteor.4#2 integrate .. //depot/projects/wifi/share/man/man4/mlx.4#2 integrate .. //depot/projects/wifi/share/man/man4/mly.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_atmpif.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_bt3c.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_btsocket.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_cisco.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_ether.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_frame_relay.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_h4.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_hci.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_l2cap.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_l2tp.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_mppc.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/wifi/share/man/man4/ng_one2many.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_rfc1490.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_socket.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_source.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_sscop.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_ubt.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_uni.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_vjc.4#2 integrate .. //depot/projects/wifi/share/man/man4/nsp.4#2 integrate .. //depot/projects/wifi/share/man/man4/pcm.4#2 integrate .. //depot/projects/wifi/share/man/man4/pcvt.4#2 integrate .. //depot/projects/wifi/share/man/man4/ppc.4#2 integrate .. //depot/projects/wifi/share/man/man4/psm.4#3 integrate .. //depot/projects/wifi/share/man/man4/sa.4#2 integrate .. //depot/projects/wifi/share/man/man4/sbsh.4#2 integrate .. //depot/projects/wifi/share/man/man4/smb.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_csa.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_gusc.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_ich.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_maestro.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/wifi/share/man/man4/snp.4#2 integrate .. //depot/projects/wifi/share/man/man4/spic.4#2 integrate .. //depot/projects/wifi/share/man/man4/splash.4#2 integrate .. //depot/projects/wifi/share/man/man4/sym.4#2 integrate .. //depot/projects/wifi/share/man/man4/syscons.4#2 integrate .. //depot/projects/wifi/share/man/man4/targ.4#2 integrate .. //depot/projects/wifi/share/man/man4/tdfx.4#3 integrate .. //depot/projects/wifi/share/man/man4/twe.4#2 integrate .. //depot/projects/wifi/share/man/man4/tx.4#2 integrate .. //depot/projects/wifi/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/wifi/share/man/man4/ucycom.4#2 integrate .. //depot/projects/wifi/share/man/man4/uvisor.4#2 integrate .. //depot/projects/wifi/share/man/man4/vinum.4#2 integrate .. //depot/projects/wifi/share/man/man4/vpo.4#3 integrate .. //depot/projects/wifi/share/man/man4/wi.4#3 integrate .. //depot/projects/wifi/share/man/man4/worm.4#2 integrate .. //depot/projects/wifi/share/man/man5/dir.5#2 integrate .. //depot/projects/wifi/share/man/man5/ethers.5#3 integrate .. //depot/projects/wifi/share/man/man5/group.5#2 integrate .. //depot/projects/wifi/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/wifi/share/man/man5/intro.5#2 integrate .. //depot/projects/wifi/share/man/man5/libmap.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/linprocfs.5#2 integrate .. //depot/projects/wifi/share/man/man5/mailer.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#7 integrate .. //depot/projects/wifi/share/man/man5/networks.5#2 integrate .. //depot/projects/wifi/share/man/man5/passwd.5#2 integrate .. //depot/projects/wifi/share/man/man5/protocols.5#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/wifi/share/man/man5/remote.5#3 integrate .. //depot/projects/wifi/share/man/man5/services.5#2 integrate .. //depot/projects/wifi/share/man/man5/stab.5#2 integrate .. //depot/projects/wifi/share/man/man6/intro.6#2 integrate .. //depot/projects/wifi/share/man/man7/hier.7#5 integrate .. //depot/projects/wifi/share/man/man7/ports.7#4 integrate .. //depot/projects/wifi/share/man/man7/security.7#3 integrate .. //depot/projects/wifi/share/man/man8/adding_user.8#2 integrate .. //depot/projects/wifi/share/man/man8/diskless.8#2 integrate .. //depot/projects/wifi/share/man/man8/rc.8#2 integrate .. //depot/projects/wifi/share/man/man8/sticky.8#3 integrate .. //depot/projects/wifi/share/man/man8/yp.8#2 integrate .. //depot/projects/wifi/share/man/man9/BUS_ADD_CHILD.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUS_PRINT_CHILD.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_SET.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/wifi/share/man/man9/accf_data.9#2 integrate .. //depot/projects/wifi/share/man/man9/accf_http.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_print_child.9#2 integrate .. //depot/projects/wifi/share/man/man9/contigmalloc.9#2 integrate .. //depot/projects/wifi/share/man/man9/g_access.9#2 integrate .. //depot/projects/wifi/share/man/man9/g_attach.9#2 integrate .. //depot/projects/wifi/share/man/man9/g_event.9#2 integrate .. //depot/projects/wifi/share/man/man9/hashinit.9#2 integrate .. //depot/projects/wifi/share/man/man9/mac.9#2 integrate .. //depot/projects/wifi/share/man/man9/malloc.9#2 integrate .. //depot/projects/wifi/share/man/man9/microseq.9#2 integrate .. //depot/projects/wifi/share/man/man9/pci.9#2 integrate .. //depot/projects/wifi/share/man/man9/pfil.9#3 integrate .. //depot/projects/wifi/share/man/man9/pmap_page_exists_quick.9#2 integrate .. //depot/projects/wifi/share/man/man9/printf.9#3 integrate .. //depot/projects/wifi/share/man/man9/rtentry.9#3 integrate .. //depot/projects/wifi/share/man/man9/time.9#3 integrate .. //depot/projects/wifi/share/man/man9/timeout.9#3 integrate .. //depot/projects/wifi/share/man/man9/uio.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_clean.9#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/wifi/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/param.h#4 integrate .. //depot/projects/wifi/sys/amd64/include/smp.h#3 integrate .. //depot/projects/wifi/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/wifi/sys/amd64/isa/elcr.c#2 integrate .. //depot/projects/wifi/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/locore.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#9 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/uart_cpu_i80321.c#4 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.h#4 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/wifi/sys/compat/ndis/hal_var.h#3 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/wifi/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_hal.c#4 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#3 integrate .. //depot/projects/wifi/sys/conf/NOTES#11 integrate .. //depot/projects/wifi/sys/conf/files#15 integrate .. //depot/projects/wifi/sys/conf/files.pc98#5 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/wifi/sys/conf/options#8 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/wifi/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/wifi/sys/dev/aha/ahareg.h#3 integrate .. //depot/projects/wifi/sys/dev/amr/amr.c#5 integrate .. //depot/projects/wifi/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/wifi/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#73 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.h#4 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/fdc/fdcvar.h#3 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/wifi/sys/dev/hifn/hifn7751reg.h#3 integrate .. //depot/projects/wifi/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/wifi/sys/dev/isp/isp.c#3 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/wifi/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/wifi/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/wifi/sys/dev/md/md.c#7 integrate .. //depot/projects/wifi/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis.h#3 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/wifi/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#3 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/wifi/sys/geom/geom_mbr.c#5 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/wifi/sys/isa/isa_common.c#3 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_module.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_prot.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_time.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#5 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#7 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#7 integrate .. //depot/projects/wifi/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/wifi/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/wifi/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#10 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/modules/Makefile#11 integrate .. //depot/projects/wifi/sys/net/if_vlan.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#15 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#43 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#35 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#48 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#22 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#36 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#24 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#25 integrate .. //depot/projects/wifi/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/wifi/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#5 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#6 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/wifi/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/wifi/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/wifi/sys/security/mac_lomac/mac_lomac.h#2 integrate .. //depot/projects/wifi/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/wifi/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/wifi/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/sys_machdep.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/wifi/sys/sys/bus.h#4 integrate .. //depot/projects/wifi/sys/sys/device_port.h#2 integrate .. //depot/projects/wifi/sys/sys/ktr.h#4 integrate .. //depot/projects/wifi/sys/sys/mount.h#7 integrate .. //depot/projects/wifi/sys/sys/namei.h#3 integrate .. //depot/projects/wifi/sys/sys/socketvar.h#2 integrate .. //depot/projects/wifi/sys/sys/syscall.h#6 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#6 integrate .. //depot/projects/wifi/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#6 integrate .. //depot/projects/wifi/sys/sys/time.h#3 integrate .. //depot/projects/wifi/sys/sys/vnode.h#13 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/wifi/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/wifi/sys/vm/memguard.c#1 branch .. //depot/projects/wifi/sys/vm/memguard.h#1 branch .. //depot/projects/wifi/sys/vm/vm_fault.c#5 integrate .. //depot/projects/wifi/sys/vm/vm_glue.c#7 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#7 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/wifi/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/pipe/pipe-overcommit1.c#1 branch .. //depot/projects/wifi/tools/regression/pipe/pipe-overcommit2.c#1 branch .. //depot/projects/wifi/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/pirtool/Makefile#4 integrate .. //depot/projects/wifi/tools/tools/pirtool/pirtable.h#2 integrate .. //depot/projects/wifi/tools/tools/pirtool/pirtool.c#2 integrate .. //depot/projects/wifi/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/wifi/usr.bin/locale/locale.1#3 integrate .. //depot/projects/wifi/usr.bin/mklocale/mklocale.1#3 integrate .. //depot/projects/wifi/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/wifi/usr.bin/rlogin/rlogin.1#3 integrate .. //depot/projects/wifi/usr.bin/rlogin/rlogin.c#2 integrate .. //depot/projects/wifi/usr.bin/rsh/rsh.1#2 integrate .. //depot/projects/wifi/usr.bin/rsh/rsh.c#2 integrate .. //depot/projects/wifi/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/wifi/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnd/isdnd.rc.5#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/man/i4bisppp.4#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/man/i4btel.4#3 integrate .. //depot/projects/wifi/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/wifi/usr.sbin/lpr/lpc/lpc.8#3 integrate .. //depot/projects/wifi/usr.sbin/ndp/ndp.8#3 integrate .. //depot/projects/wifi/usr.sbin/newsyslog/newsyslog.8#3 integrate .. //depot/projects/wifi/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/wifi/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#7 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.472 2004/12/29 19:39:06 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.473 2005/01/20 10:49:02 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -780,7 +780,7 @@ .endif .if !defined(NO_RESCUE) && \ - ${BOOTSTRAPPING} < 502128 + ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen .endif ==== //depot/projects/wifi/bin/rcp/rcp.1#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.19 2005/01/10 08:39:24 imp Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.20 2005/01/21 09:31:38 ru Exp $ .\" -.Dd May 31, 1993 +.Dd October 16, 2002 .Dt RCP 1 .Os .Sh NAME @@ -37,12 +37,10 @@ .Nd remote file copy .Sh SYNOPSIS .Nm -.Op Fl 46Kpx -.Op Fl k Ar realm +.Op Fl 46p .Ar file1 file2 .Nm -.Op Fl 46Kprx -.Op Fl k Ar realm +.Op Fl 46pr .Ar .Ar directory .Sh DESCRIPTION @@ -65,16 +63,6 @@ Use IPv4 addresses only. .It Fl 6 Use IPv6 addresses only. -.It Fl K -Turn off all Kerberos authentication. -.It Fl k -Request -.Nm -to obtain tickets -for the remote host in realm -.Ar realm -instead of the remote host's realm as determined by -.Xr krb_realmofhost 3 . .It Fl p Cause .Nm @@ -92,15 +80,6 @@ .Nm copies each subtree rooted at that name; in this case the destination must be a directory. -.It Fl x -Turn on -.Tn DES -encryption for all data passed by -.Nm . -This may impact response time and -.Tn CPU -utilization, but provides -increased security. .El .Pp If ==== //depot/projects/wifi/contrib/tcpdump/print-ppp.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ * Extensively modified by Motonori Shindo (mshindo@mshindo.net) for more * complete PPP support. * - * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.13 2004/03/31 14:57:24 bms Exp $ + * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.14 2005/01/24 14:56:48 bms Exp $ */ /* @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89.2.3 2004/03/24 03:32:43 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89.2.4 2004/07/13 16:00:25 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -444,6 +444,10 @@ pfunc = NULL; break; } + + if (pfunc == NULL) /* catch the above null pointer if unknown CP */ + break; + if ((j = (*pfunc)(tptr, len)) == 0) break; x -= j; ==== //depot/projects/wifi/contrib/telnet/telnet/telnet.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 -.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.16 2001/08/20 12:28:40 markm Exp $ +.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.17 2005/01/21 21:57:05 ru Exp $ .\" .Dd January 27, 2000 .Dt TELNET 1 @@ -84,7 +84,8 @@ .Nm to use IPv6 addresses only. .It Fl 8 -Specifies an 8-bit data path. This causes an attempt to +Specifies an 8-bit data path. +This causes an attempt to negotiate the .Dv TELNET BINARY option on both input and output. @@ -99,7 +100,8 @@ .It Fl K Specifies no automatic login to the remote system. .It Fl L -Specifies an 8-bit data path on output. This causes the +Specifies an 8-bit data path on output. +This causes the .Dv BINARY option to be negotiated on output. .It Fl N @@ -134,7 +136,8 @@ .It Fl c Disables the reading of the user's .Pa \&.telnetrc -file. (See the +file. +(See the .Ic toggle skiprc command on this man page.) .It Fl d @@ -223,13 +226,14 @@ .Nm establishes a connection to the corresponding named socket. .It Ar port -Indicates a port number (address of an application). If a number is +Indicates a port number (address of an application). +If a number is not specified, the default .Nm port is used. .El .Pp -When in rlogin mode, a line of the form ~. disconnects from the +When in rlogin mode, a line of the form ~. disconnects from the remote host; ~ is the .Nm escape character. @@ -255,9 +259,11 @@ When .Dv LINEMODE is enabled, character processing is done on the -local system, under the control of the remote system. When input +local system, under the control of the remote system. +When input editing or character echoing is to be disabled, the remote system -will relay that information. The remote system will also relay +will relay that information. +The remote system will also relay changes to any special characters that happen on the remote system, so that they can take effect on the local system. .Pp @@ -279,7 +285,7 @@ .Dv TRUE (the default for \*(Lqold line by line\*(Rq; see below), the user's -.Ic quit , +.Ic quit , .Ic intr , and .Ic flush @@ -315,7 +321,7 @@ (in the case of .Ic quit and -.Ic intr ) . +.Ic intr ) . .Pp While connected to a remote host, .Nm @@ -329,11 +335,11 @@ commands are available. Only enough of each command to uniquely identify it need be typed (this is also true for arguments to the -.Ic mode , +.Ic mode , .Ic set , -.Ic toggle , +.Ic toggle , .Ic unset , -.Ic slc , +.Ic slc , .Ic environ , and .Ic display @@ -343,17 +349,20 @@ .It Ic auth Ar argument ... The auth command manipulates the information sent through the .Dv TELNET AUTHENTICATE -option. Valid arguments for the +option. +Valid arguments for the .Ic auth command are: .Bl -tag -width "disable type" .It Ic disable Ar type -Disables the specified type of authentication. To +Disables the specified type of authentication. +To obtain a list of available types, use the .Ic auth disable ?\& command. .It Ic enable Ar type -Enables the specified type of authentication. To +Enables the specified type of authentication. +To obtain a list of available types, use the .Ic auth enable ?\& command. @@ -383,18 +392,22 @@ .It Ic disable Ar type Xo .Op Cm input | output .Xc -Disables the specified type of encryption. If you +Disables the specified type of encryption. +If you omit the input and output, both input and output -are disabled. To obtain a list of available +are disabled. +To obtain a list of available types, use the .Ic encrypt disable ?\& command. .It Ic enable Ar type Xo .Op Cm input | output .Xc -Enables the specified type of encryption. If you +Enables the specified type of encryption. +If you omit input and output, both input and output are -enabled. To obtain a list of available types, use the +enabled. +To obtain a list of available types, use the .Ic encrypt enable ?\& command. .It Ic input @@ -414,18 +427,21 @@ .Ic encrypt stop output command. .It Ic start Op Cm input | output -Attempts to start encryption. If you omit +Attempts to start encryption. +If you omit .Ic input and .Ic output , -both input and output are enabled. To +both input and output are enabled. +To obtain a list of available types, use the .Ic encrypt enable ?\& command. .It Ic status Lists the current status of encryption. .It Ic stop Op Cm input | output -Stops encryption. If you omit input and output, +Stops encryption. +If you omit input and output, encryption is on both input and output. .It Ic type Ar type Sets the default type of encryption to be used @@ -587,7 +603,7 @@ .Tn TELNET server at the default port. The host specification may be either a host name (see -.Xr hosts 5 ) , +.Xr hosts 5 ) , an Internet address specified in the \*(Lqdot notation\*(Rq (see .Xr inet 3 ) , or IPv6 host name or IPv6 coloned-hexadecimal addreess. @@ -601,16 +617,22 @@ .Nm omits any automatic initiation of .Tn TELNET -options. When the port number is preceded by a minus sign, +options. +When the port number is preceded by a minus sign, the initial option negotiation is done. After establishing a connection, the file .Pa \&.telnetrc in the -users home directory is opened. Lines beginning with a # are -comment lines. Blank lines are ignored. Lines that begin -without white space are the start of a machine entry. The +users home directory is opened. +Lines beginning with a # are +comment lines. +Blank lines are ignored. +Lines that begin +without white space are the start of a machine entry. +The first thing on the line is the name of the machine that is -being connected to. The rest of the line, and successive +being connected to. +The rest of the line, and successive lines that begin with white space are assumed to be .Nm commands and are processed as if they had been typed @@ -768,7 +790,8 @@ .Ic display command. The variables which may be set or unset, but not toggled, are -listed here. In addition, any of the variables for the +listed here. +In addition, any of the variables for the .Ic toggle command may be explicitly set or unset using the @@ -787,7 +810,8 @@ sequence (see .Ic send ayt preceding) is sent to the -remote host. The initial value for the \*(LqAre You There\*(Rq +remote host. +The initial value for the \*(LqAre You There\*(Rq character is the terminal's status character. .It Ic echo This is the value (initially \*(Lq^E\*(Rq) which, when in @@ -866,7 +890,8 @@ .Dv LINEMODE , these are the characters that, when typed, cause partial lines to be -forwarded to the remote system. The initial value for +forwarded to the remote system. +The initial value for the forwarding characters are taken from the terminal's eol and eol2 characters. .It Ic interrupt @@ -970,10 +995,11 @@ escape character is ignored unless it is preceded by this character at the beginning of a line. This character, at the beginning of a line followed by -a "." closes the connection; when followed by a ^Z it +a "." closes the connection; when followed by a ^Z it suspends the .Nm -command. The initial state is to +command. +The initial state is to disable the .Nm rlogin escape character. @@ -1028,7 +1054,8 @@ .Ic option tracing being .Dv TRUE , -will be written. If it is set to +will be written. +If it is set to .Dq Fl , then tracing information will be written to standard output (the default). .It Ic worderase @@ -1062,17 +1089,18 @@ characters when the .Dv TELNET LINEMODE option has -been enabled. Special characters are characters that get +been enabled. +Special characters are characters that get mapped to .Tn TELNET commands sequences (like .Ic ip or -.Ic quit ) +.Ic quit ) or line editing characters (like .Ic erase and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 24 21:38:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EFAB16A4D0; Mon, 24 Jan 2005 21:38:44 +0000 (GMT) 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 E4F8216A4CE for ; Mon, 24 Jan 2005 21:38:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D1043D31 for ; Mon, 24 Jan 2005 21:38:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0OLch4C082525 for ; Mon, 24 Jan 2005 21:38:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0OLchjN082522 for perforce@freebsd.org; Mon, 24 Jan 2005 21:38:43 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Jan 2005 21:38:43 GMT Message-Id: <200501242138.j0OLchjN082522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 69640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 21:38:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=69640 Change 69640 by sam@sam_ebb on 2005/01/24 21:38:09 IFC @ 69639 Affected files ... .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/wifi/lib/libarchive/tar.5#2 integrate .. //depot/projects/wifi/lib/libautofs/libautofs.3#2 integrate .. //depot/projects/wifi/sbin/mount_autofs/mount_autofs.8#2 integrate .. //depot/projects/wifi/share/man/man5/autofs.5#2 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#74 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#30 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#11 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#49 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#37 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#25 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#16 integrate .. //depot/projects/wifi/sys/sys/vnode.h#14 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#11 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.h#3 integrate .. //depot/projects/wifi/usr.bin/lsvfs/lsvfs.1#2 integrate Differences ... ==== //depot/projects/wifi/lib/libarchive/libarchive-formats.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/libarchive-formats.5,v 1.3 2004/12/22 17:31:28 wollman Exp $ +.\" $FreeBSD: src/lib/libarchive/libarchive-formats.5,v 1.4 2005/01/24 19:58:05 charnier Exp $ .\" .Dd April 27, 2004 .Dt libarchive-formats 3 @@ -36,7 +36,7 @@ library reads and writes a variety of streaming archive formats. Generally speaking, all of these archive formats consist of a series of .Dq entries . -Each entry stores a single filesystem object, such as a file, directory, +Each entry stores a single file system object, such as a file, directory, or symbolic link. .Pp The following provides a brief description of each format supported @@ -196,7 +196,7 @@ A .Dq shell archive is a shell script that, when executed on a POSIX-compliant -system, will recreate a collection of filesystem objects. +system, will recreate a collection of file system objects. The libarchive library can write two different kinds of shar archives: .Bl -tag -width indent .It Cm shar ==== //depot/projects/wifi/lib/libarchive/tar.5#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.9 2004/08/07 17:24:50 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.10 2005/01/24 19:58:05 charnier Exp $ .\" .Dd May 20, 2004 .Dt TAR 5 @@ -34,7 +34,7 @@ The .Nm archive format collects any number of files, directories, and other -filesystem objects (symbolic links, device nodes, etc.) into a single +file system objects (symbolic links, device nodes, etc.) into a single stream of bytes. The format was originally designed to be used with tape drives that operate with fixed-size blocks, but is widely used as @@ -43,7 +43,7 @@ A .Nm archive consists of a series of 512-byte records. -Each filesystem object requires a header record which stores basic metadata +Each file system object requires a header record which stores basic metadata (pathname, owner, permissions, etc.) and zero or more records containing any file data. The end of the archive is indicated by two records consisting ==== //depot/projects/wifi/lib/libautofs/libautofs.3#2 (text+ko) ==== @@ -23,13 +23,13 @@ .\" SUCH DAMAGE. .\" .\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $ -.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.5 2004/09/09 10:54:08 alfred Exp $ +.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.6 2005/01/24 20:01:28 charnier Exp $ .Dd September 9, 2004 .Dt LIBAUTOFS 3 .Os .Sh NAME .Nm libautofs -.Nd "procedural interface to managing an autofs filesystem" +.Nd "procedural interface to managing an autofs file system" .Sh SYNOPSIS .In libautofs.h .Ft int @@ -81,7 +81,7 @@ .Nm libautofs libarary provides a "mostly" stable interface to the .Xr autofs 9 -filesystem. +file system. .Pp The inteface to .Xr autofs 9 @@ -97,7 +97,7 @@ .Fn autoh_get function returns a handle to an .Xr autofs 9 -filesystem based on the +file system based on the .Fa path parameter. The handle returned should be freed via the @@ -108,7 +108,7 @@ .Fn autoh_getall function returns an array of handles to all mounted .Xr autofs 9 -filesystems, each of which should be released via the +file systems, each of which should be released via the .Fn autoh_free function or released en-mass via the .Fn autoh_freeall @@ -136,7 +136,7 @@ .Pp The .Fn autoh_mp -function returns the path to the autofs filesystem that the +function returns the path to the autofs file system that the .Fa hndl is derived from. .Pp @@ -253,5 +253,5 @@ utility first appeared in .Fx 6.0 . .Sh AUTHORS -This manual page and the autofs filesystem suite were written by +This manual page and the autofs file system suite were written by .An Alfred Perlstein . ==== //depot/projects/wifi/sbin/mount_autofs/mount_autofs.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: mount_autofs.8,v 1.3 2004/09/08 08:12:21 bright Exp $ -.\" $FreeBSD: src/sbin/mount_autofs/mount_autofs.8,v 1.2 2004/09/08 08:44:14 alfred Exp $ +.\" $FreeBSD: src/sbin/mount_autofs/mount_autofs.8,v 1.3 2005/01/24 20:03:04 charnier Exp $ .Dd August 30, 2004 .Dt MOUNT_AUTOFS 8 .Os @@ -67,5 +67,5 @@ utility first appeared in .Fx 6.0 . .Sh AUTHORS -This manual page and the autofs filesystem suite were written by +This manual page and the autofs file system suite were written by .An Alfred Perlstein . ==== //depot/projects/wifi/share/man/man5/autofs.5#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: autofs.5,v 1.1 2004/08/31 16:05:39 bright Exp $ -.\" $FreeBSD: src/share/man/man5/autofs.5,v 1.1 2004/08/31 16:26:00 alfred Exp $ +.\" $FreeBSD: src/share/man/man5/autofs.5,v 1.2 2005/01/24 20:04:41 charnier Exp $ .Dd August 30, 2004 .Dt AUTOFS 5 .Os @@ -37,7 +37,7 @@ .Sh DESCRIPTION The auto file system, or .Nm , -provides a method to dynamically graft mountpoints into the filesystem +provides a method to dynamically graft mountpoints into the file system namespace. .Sh SEE ALSO .Xr mount_autofs 8 ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#74 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.75 2005/01/24 20:05:03 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.76 2005/01/24 20:31:24 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#30 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.19 2005/01/18 19:42:17 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.20 2005/01/24 20:31:24 sam Exp $ */ /* ==== //depot/projects/wifi/sys/kern/vfs_default.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.115 2005/01/24 13:13:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.116 2005/01/24 21:21:58 phk Exp $"); #include #include @@ -370,57 +370,8 @@ struct thread *td; } */ *ap; { - struct vnode *vp = ap->a_vp; - struct ucred *cred = ap->a_cred; - struct thread *td = ap->a_td; - struct vattr vat; - vm_object_t object; - int error = 0; - vm_ooffset_t size; - if (!vn_isdisk(vp, NULL) && vn_canvmio(vp) == FALSE) - return (0); - - while ((object = vp->v_object) != NULL) { - VM_OBJECT_LOCK(object); - if (!(object->flags & OBJ_DEAD)) { - VM_OBJECT_UNLOCK(object); - break; - } - VOP_UNLOCK(vp, 0, td); - vm_object_set_flag(object, OBJ_DISCONNECTWNT); - msleep(object, VM_OBJECT_MTX(object), PDROP | PVM, "vodead", 0); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - } - - if (object == NULL) { - if (vn_isdisk(vp, NULL)) { - /* - * This simply allocates the biggest object possible - * for a disk vnode. This should be fixed, but doesn't - * cause any problems (yet). - */ - size = IDX_TO_OFF(INT_MAX); - } else { - if ((error = VOP_GETATTR(vp, &vat, cred, td)) != 0) - return (error); - size = vat.va_size; - } - - object = vnode_pager_alloc(vp, size, 0, 0); - /* - * Dereference the reference we just created. This assumes - * that the object is associated with the vp. - */ - VM_OBJECT_LOCK(object); - object->ref_count--; - VM_OBJECT_UNLOCK(object); - vrele(vp); - } - - KASSERT(vp->v_object != NULL, ("vop_stdcreatevobject: NULL object")); - - return (error); + return (vnode_create_vobject(ap->a_vp, 0, ap->a_td)); } /* Destroy the VM system object associated with this vnode */ ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#49 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.41 2005/01/24 19:32:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.42 2005/01/24 20:50:20 sam Exp $"); #include #include ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.16 2005/01/22 20:33:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.18 2005/01/24 20:50:20 sam Exp $"); #include "opt_inet.h" ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.14 2005/01/24 19:32:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.15 2005/01/24 20:39:29 sam Exp $"); /* * IEEE 802.11 protocol support. ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#16 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.8 2004/12/31 22:42:38 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.9 2005/01/24 20:38:26 sam Exp $ */ #ifndef _NET80211_IEEE80211_PROTO_H_ #define _NET80211_IEEE80211_PROTO_H_ ==== //depot/projects/wifi/sys/sys/vnode.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.271 2005/01/24 13:58:08 phk Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.272 2005/01/24 21:21:58 phk Exp $ */ #ifndef _SYS_VNODE_H_ @@ -688,6 +688,7 @@ void vbusy(struct vnode *vp); void v_addpollinfo(struct vnode *vp); +int vnode_create_vobject(struct vnode *vp, size_t size, struct thread *td); extern struct vop_vector fifo_specops; extern struct vop_vector dead_vnodeops; ==== //depot/projects/wifi/sys/vm/vnode_pager.c#11 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.210 2005/01/24 13:13:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.211 2005/01/24 21:21:59 phk Exp $"); #include #include @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -81,6 +82,7 @@ static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int); static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); +static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t); struct pagerops vnodepagerops = { .pgo_init = vnode_pager_init, @@ -100,6 +102,54 @@ vnode_pbuf_freecnt = nswbuf / 2 + 1; } +/* Create the VM system backing object for this vnode */ +int +vnode_create_vobject(struct vnode *vp, size_t isize, struct thread *td) +{ + vm_object_t object; + vm_ooffset_t size = isize; + struct vattr va; + + if (!vn_isdisk(vp, NULL) && vn_canvmio(vp) == FALSE) + return (0); + + while ((object = vp->v_object) != NULL) { + VM_OBJECT_LOCK(object); + if (!(object->flags & OBJ_DEAD)) { + VM_OBJECT_UNLOCK(object); + return (0); + } + VOP_UNLOCK(vp, 0, td); + vm_object_set_flag(object, OBJ_DISCONNECTWNT); + msleep(object, VM_OBJECT_MTX(object), PDROP | PVM, "vodead", 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + } + + if (size == 0) { + if (vn_isdisk(vp, NULL)) { + size = IDX_TO_OFF(INT_MAX); + } else { + if (VOP_GETATTR(vp, &va, td->td_ucred, td) != 0) + return (0); + size = va.va_size; + } + } + + object = vnode_pager_alloc(vp, size, 0, 0); + /* + * Dereference the reference we just created. This assumes + * that the object is associated with the vp. + */ + VM_OBJECT_LOCK(object); + object->ref_count--; + VM_OBJECT_UNLOCK(object); + vrele(vp); + + KASSERT(vp->v_object != NULL, ("vnode_create_vobject: NULL object")); + + return (0); +} + /* * Allocate (or lookup) pager for a vnode. * Handle is a vnode pointer. ==== //depot/projects/wifi/sys/vm/vnode_pager.h#3 (text+ko) ==== @@ -32,14 +32,13 @@ * SUCH DAMAGE. * * @(#)vnode_pager.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.19 2005/01/07 02:29:27 imp Exp $ + * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.20 2005/01/24 21:21:59 phk Exp $ */ #ifndef _VNODE_PAGER_ #define _VNODE_PAGER_ 1 #ifdef _KERNEL -vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t); struct vnode *vnode_pager_lock(vm_object_t); /* ==== //depot/projects/wifi/usr.bin/lsvfs/lsvfs.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.12 2004/07/02 22:22:27 ru Exp $ +.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.13 2005/01/24 20:06:16 charnier Exp $ .\" Garrett A. Wollman, September 1994 .\" This file is in the public domain. .\" @@ -7,7 +7,7 @@ .Os .Sh NAME .Nm lsvfs -.Nd list installed virtual filesystems +.Nd list installed virtual file systems .Sh SYNOPSIS .Nm .Op Ar vfsname Ar ... From owner-p4-projects@FreeBSD.ORG Mon Jan 24 23:35:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 745F916A4D0; Mon, 24 Jan 2005 23:35:10 +0000 (GMT) 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 4FFBC16A4CE for ; Mon, 24 Jan 2005 23:35:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AB6E43D39 for ; Mon, 24 Jan 2005 23:35:10 +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 j0ONZAcj088206 for ; Mon, 24 Jan 2005 23:35:10 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 j0ONZ9jJ088198 for perforce@freebsd.org; Mon, 24 Jan 2005 23:35:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jan 2005 23:35:09 GMT Message-Id: <200501242335.j0ONZ9jJ088198@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 Subject: PERFORCE change 69654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2005 23:35:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=69654 Change 69654 by rwatson@rwatson_tislabs on 2005/01/24 23:34:25 Hook up praudit and auditreduce to the global world build. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#7 (text+ko) ==== @@ -15,6 +15,7 @@ ${_audit} \ ${_auditd} \ ${_auditon} \ + ${_auditreduce} \ ${_asf} \ ${_atm} \ ${_authpf} \ @@ -121,6 +122,7 @@ pppd \ pppstats \ ${_praliases} \ + ${_praudit} \ procctl \ pstat \ pw \ @@ -199,6 +201,8 @@ _audit= audit _auditd= auditd _auditon= auditon +_auditreduce= auditreduce +_praudit= praudit .endif .if !defined(NO_BIND) From owner-p4-projects@FreeBSD.ORG Tue Jan 25 13:12:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 723FC16A4D0; Tue, 25 Jan 2005 13:12:16 +0000 (GMT) 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 34EB416A4CE for ; Tue, 25 Jan 2005 13:12:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16E6443D2F for ; Tue, 25 Jan 2005 13:12:16 +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 j0PDCFLm047265 for ; Tue, 25 Jan 2005 13:12:15 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 j0PDCFjI047262 for perforce@freebsd.org; Tue, 25 Jan 2005 13:12:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 25 Jan 2005 13:12:15 GMT Message-Id: <200501251312.j0PDCFjI047262@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 Subject: PERFORCE change 69704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2005 13:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=69704 Change 69704 by rwatson@rwatson_tislabs on 2005/01/25 13:11:13 Change behavior of the default audit_warn(5) script: submit messages via syslog rather than directly appending to /etc/security/audit_messages. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_warn#2 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_warn.5#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_warn#2 (text+ko) ==== @@ -1,3 +1,2 @@ #!/bin/sh -TIME=$(date "+%h %d %H:%M:%S") -echo "$TIME audit warning: $@" >> /etc/security/audit_messages +logger -p security.warning "audit warning: $@" ==== //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_warn.5#3 (text+ko) ==== @@ -38,16 +38,20 @@ .Pp The default .Nm -is a script whose first parameter is the type of warning; the script -appends its arguments to -.Pa /etc/security/audit_messages . +is a script whose first parameter is the type of warning; the script submits +a log message via +.Xr logger 1 +of facility +.Ar security +and level +.Ar warning . Administrators may replace this script: a more comprehensive one would take different actions based on the type of warning. For example, a low-space warning could result in an email message being sent to the administrator. .Sh FILES .Bl -tag -width "/etc/security/audit_warn" -compact .It Pa /etc/security/audit_warn -.It Pa /etc/security/audit_messages .El .Sh SEE ALSO +.Xr logger 1 .Xr auditd 8 From owner-p4-projects@FreeBSD.ORG Tue Jan 25 20:44:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB89716A4D0; Tue, 25 Jan 2005 20:44:38 +0000 (GMT) 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 A51B216A4CE for ; Tue, 25 Jan 2005 20:44:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1708D43D41 for ; Tue, 25 Jan 2005 20:44:38 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0PKicXt073922 for ; Tue, 25 Jan 2005 20:44:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0PKia7u073919 for perforce@freebsd.org; Tue, 25 Jan 2005 20:44:36 GMT (envelope-from peter@freebsd.org) Date: Tue, 25 Jan 2005 20:44:36 GMT Message-Id: <200501252044.j0PKia7u073919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 69728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2005 20:44:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=69728 Change 69728 by peter@peter_melody on 2005/01/25 20:43:49 IFC @69727 Affected files ... .. //depot/projects/hammer/bin/mkdir/Makefile#2 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#6 integrate .. //depot/projects/hammer/bin/rcp/rcp.1#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#11 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#10 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#3 integrate .. //depot/projects/hammer/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#13 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#46 integrate .. //depot/projects/hammer/etc/namedb/named.conf#8 integrate .. //depot/projects/hammer/etc/rc.d/gbde#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#35 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#19 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#19 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#16 integrate .. //depot/projects/hammer/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#7 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#8 integrate .. //depot/projects/hammer/lib/libautofs/libautofs.3#3 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#6 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#6 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/arm/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/gen/frexp.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/hammer/lib/libc/ia64/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/net/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/net/gai_strerror.3#1 branch .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#9 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.3#8 integrate .. //depot/projects/hammer/lib/libc/net/inet6_opt_init.3#5 integrate .. //depot/projects/hammer/lib/libc/net/inet6_option_space.3#6 integrate .. //depot/projects/hammer/lib/libc/net/inet6_rth_space.3#6 integrate .. //depot/projects/hammer/lib/libc/net/inet6_rthdr_space.3#6 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_get.c#5 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/sparc64/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/stdlib/strtoimax.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtol.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtol.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoll.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoul.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoul.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoull.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoumax.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/send.2#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.8#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.8#4 integrate .. //depot/projects/hammer/lib/libufs/ufs_disk_close.3#4 integrate .. //depot/projects/hammer/lib/libutil/auth.conf.5#3 integrate .. //depot/projects/hammer/lib/msun/Makefile#20 integrate .. //depot/projects/hammer/lib/msun/arm/fenv.h#4 integrate .. //depot/projects/hammer/lib/msun/ia64/s_fma.S#1 branch .. //depot/projects/hammer/lib/msun/ia64/s_fmaf.S#1 branch .. //depot/projects/hammer/lib/msun/man/fma.3#1 branch .. //depot/projects/hammer/lib/msun/man/math.3#7 integrate .. //depot/projects/hammer/lib/msun/src/math.h#25 integrate .. //depot/projects/hammer/lib/msun/src/s_fma.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_fmaf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/hammer/sbin/dump/dump.8#13 integrate .. //depot/projects/hammer/sbin/dump/main.c#13 integrate .. //depot/projects/hammer/sbin/idmapd/idmapd.8#4 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#17 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#16 integrate .. //depot/projects/hammer/sbin/mdmfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#12 integrate .. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.8#3 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#18 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#11 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#13 integrate .. //depot/projects/hammer/sbin/newfs/newfs.h#7 integrate .. //depot/projects/hammer/sbin/newfs_msdos/Makefile#5 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#4 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#6 integrate .. //depot/projects/hammer/sbin/shutdown/Makefile#2 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.c#5 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#15 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.8#4 integrate .. //depot/projects/hammer/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#4 integrate .. //depot/projects/hammer/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlock_destroy.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlock_init.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlock_rdlock.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlock_unlock.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlock_wrlock.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_destroy.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_getpshared.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_init.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/hammer/share/man/man3/stdarg.3#7 integrate .. //depot/projects/hammer/share/man/man4/adv.4#3 integrate .. //depot/projects/hammer/share/man/man4/adw.4#3 integrate .. //depot/projects/hammer/share/man/man4/aha.4#9 integrate .. //depot/projects/hammer/share/man/man4/ahc.4#6 integrate .. //depot/projects/hammer/share/man/man4/ahd.4#4 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#8 integrate .. //depot/projects/hammer/share/man/man4/blackhole.4#4 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#8 integrate .. //depot/projects/hammer/share/man/man4/bridge.4#4 integrate .. //depot/projects/hammer/share/man/man4/bt.4#4 integrate .. //depot/projects/hammer/share/man/man4/ccd.4#6 integrate .. //depot/projects/hammer/share/man/man4/cd.4#6 integrate .. //depot/projects/hammer/share/man/man4/ch.4#6 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#4 integrate .. //depot/projects/hammer/share/man/man4/divert.4#9 integrate .. //depot/projects/hammer/share/man/man4/dpt.4#6 integrate .. //depot/projects/hammer/share/man/man4/ed.4#5 integrate .. //depot/projects/hammer/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/hammer/share/man/man4/fatm.4#5 integrate .. //depot/projects/hammer/share/man/man4/fwe.4#5 integrate .. //depot/projects/hammer/share/man/man4/fwip.4#3 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#6 integrate .. //depot/projects/hammer/share/man/man4/hatm.4#7 integrate .. //depot/projects/hammer/share/man/man4/hifn.4#6 integrate .. //depot/projects/hammer/share/man/man4/hptmv.4#3 integrate .. //depot/projects/hammer/share/man/man4/icmp6.4#3 integrate .. //depot/projects/hammer/share/man/man4/ifmib.4#6 integrate .. //depot/projects/hammer/share/man/man4/inet.4#14 integrate .. //depot/projects/hammer/share/man/man4/ip.4#13 integrate .. //depot/projects/hammer/share/man/man4/ip6.4#4 integrate .. //depot/projects/hammer/share/man/man4/isp.4#5 integrate .. //depot/projects/hammer/share/man/man4/joy.4#3 integrate .. //depot/projects/hammer/share/man/man4/kld.4#6 integrate .. //depot/projects/hammer/share/man/man4/ktr.4#5 integrate .. //depot/projects/hammer/share/man/man4/led.4#7 integrate .. //depot/projects/hammer/share/man/man4/lpt.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_none.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.alpha/osf1.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/aic.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/apm.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ar.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/el.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/longrun.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/mcd.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/scd.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/spkr.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/sr.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/streams.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/svr4.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vx.4#5 integrate .. //depot/projects/hammer/share/man/man4/mem.4#8 integrate .. //depot/projects/hammer/share/man/man4/meteor.4#5 integrate .. //depot/projects/hammer/share/man/man4/mlx.4#5 integrate .. //depot/projects/hammer/share/man/man4/mly.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_atmpif.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_bpf.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_bt3c.4#9 integrate .. //depot/projects/hammer/share/man/man4/ng_btsocket.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_cisco.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_ether.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_frame_relay.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_h4.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_hci.4#10 integrate .. //depot/projects/hammer/share/man/man4/ng_l2cap.4#10 integrate .. //depot/projects/hammer/share/man/man4/ng_l2tp.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_mppc.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#10 integrate .. //depot/projects/hammer/share/man/man4/ng_pptpgre.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_rfc1490.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_socket.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_source.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_sscop.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#11 integrate .. //depot/projects/hammer/share/man/man4/ng_uni.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_vjc.4#5 integrate .. //depot/projects/hammer/share/man/man4/nsp.4#5 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#11 integrate .. //depot/projects/hammer/share/man/man4/pcvt.4#3 integrate .. //depot/projects/hammer/share/man/man4/ppc.4#3 integrate .. //depot/projects/hammer/share/man/man4/psm.4#8 integrate .. //depot/projects/hammer/share/man/man4/sa.4#4 integrate .. //depot/projects/hammer/share/man/man4/sbsh.4#3 integrate .. //depot/projects/hammer/share/man/man4/smb.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_csa.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_gusc.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_maestro.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/hammer/share/man/man4/snp.4#4 integrate .. //depot/projects/hammer/share/man/man4/spic.4#2 integrate .. //depot/projects/hammer/share/man/man4/splash.4#3 integrate .. //depot/projects/hammer/share/man/man4/sym.4#6 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#7 integrate .. //depot/projects/hammer/share/man/man4/targ.4#3 integrate .. //depot/projects/hammer/share/man/man4/tdfx.4#4 integrate .. //depot/projects/hammer/share/man/man4/twe.4#5 integrate .. //depot/projects/hammer/share/man/man4/tx.4#4 integrate .. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#6 integrate .. //depot/projects/hammer/share/man/man4/ucycom.4#2 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#9 integrate .. //depot/projects/hammer/share/man/man4/uvisor.4#5 integrate .. //depot/projects/hammer/share/man/man4/vinum.4#5 integrate .. //depot/projects/hammer/share/man/man4/vpo.4#7 integrate .. //depot/projects/hammer/share/man/man4/worm.4#4 integrate .. //depot/projects/hammer/share/man/man5/autofs.5#2 integrate .. //depot/projects/hammer/share/man/man5/dir.5#4 integrate .. //depot/projects/hammer/share/man/man5/ethers.5#3 integrate .. //depot/projects/hammer/share/man/man5/group.5#5 integrate .. //depot/projects/hammer/share/man/man5/hosts.equiv.5#3 integrate .. //depot/projects/hammer/share/man/man5/intro.5#2 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#8 integrate .. //depot/projects/hammer/share/man/man5/linprocfs.5#4 integrate .. //depot/projects/hammer/share/man/man5/mailer.conf.5#3 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#32 integrate .. //depot/projects/hammer/share/man/man5/networks.5#3 integrate .. //depot/projects/hammer/share/man/man5/passwd.5#6 integrate .. //depot/projects/hammer/share/man/man5/protocols.5#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#48 integrate .. //depot/projects/hammer/share/man/man5/remote.5#7 integrate .. //depot/projects/hammer/share/man/man5/services.5#3 integrate .. //depot/projects/hammer/share/man/man5/stab.5#4 integrate .. //depot/projects/hammer/share/man/man6/intro.6#3 integrate .. //depot/projects/hammer/share/man/man7/hier.7#26 integrate .. //depot/projects/hammer/share/man/man7/ports.7#12 integrate .. //depot/projects/hammer/share/man/man7/security.7#11 integrate .. //depot/projects/hammer/share/man/man8/adding_user.8#4 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#10 integrate .. //depot/projects/hammer/share/man/man8/rc.8#7 integrate .. //depot/projects/hammer/share/man/man8/sticky.8#4 integrate .. //depot/projects/hammer/share/man/man8/yp.8#7 integrate .. //depot/projects/hammer/share/man/man9/BUS_ADD_CHILD.9#3 integrate .. //depot/projects/hammer/share/man/man9/BUS_PRINT_CHILD.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETPAGES.9#6 integrate .. //depot/projects/hammer/share/man/man9/VOP_OPENCLOSE.9#6 integrate .. //depot/projects/hammer/share/man/man9/bus_generic_print_child.9#2 integrate .. //depot/projects/hammer/share/man/man9/contigmalloc.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#6 integrate .. //depot/projects/hammer/share/man/man9/g_attach.9#7 integrate .. //depot/projects/hammer/share/man/man9/g_event.9#6 integrate .. //depot/projects/hammer/share/man/man9/hashinit.9#2 integrate .. //depot/projects/hammer/share/man/man9/mac.9#8 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#11 integrate .. //depot/projects/hammer/share/man/man9/microseq.9#4 integrate .. //depot/projects/hammer/share/man/man9/pci.9#5 integrate .. //depot/projects/hammer/share/man/man9/pfil.9#11 integrate .. //depot/projects/hammer/share/man/man9/pmap_page_exists_quick.9#3 integrate .. //depot/projects/hammer/share/man/man9/rtentry.9#8 integrate .. //depot/projects/hammer/share/man/man9/time.9#7 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#7 integrate .. //depot/projects/hammer/share/man/man9/uio.9#4 integrate .. //depot/projects/hammer/share/man/man9/vm_map_clean.9#3 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#112 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#80 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#65 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#21 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#47 integrate .. //depot/projects/hammer/sys/amd64/isa/elcr.c#4 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#15 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#20 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#8 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#15 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#10 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#13 integrate .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#23 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#16 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#13 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#22 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#22 integrate .. //depot/projects/hammer/sys/conf/NOTES#78 integrate .. //depot/projects/hammer/sys/conf/files#101 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#35 integrate .. //depot/projects/hammer/sys/conf/options#65 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#8 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#17 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/amr/amrreg.h#5 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#14 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#7 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.h#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#18 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#25 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#14 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#10 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/hammer/sys/dev/md/md.c#47 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#7 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#21 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#28 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#16 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#29 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#21 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#16 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#21 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#7 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#26 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#13 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#24 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#24 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#38 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#20 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#39 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#39 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#11 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#18 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#50 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#47 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#32 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#48 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#70 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#39 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#14 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#22 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#44 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#16 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#15 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#35 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#9 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#17 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#29 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.h#3 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#28 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#27 integrate .. //depot/projects/hammer/sys/sys/ktr.h#10 integrate .. //depot/projects/hammer/sys/sys/lockf.h#4 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#6 integrate .. //depot/projects/hammer/sys/sys/mount.h#30 integrate .. //depot/projects/hammer/sys/sys/namei.h#7 integrate .. //depot/projects/hammer/sys/sys/param.h#51 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#24 integrate .. //depot/projects/hammer/sys/sys/syscall.h#38 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#38 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#38 integrate .. //depot/projects/hammer/sys/sys/vnode.h#43 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#19 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#10 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#13 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#31 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#21 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#42 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#31 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#11 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#15 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#29 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufsmount.h#7 integrate .. //depot/projects/hammer/sys/vm/memguard.c#1 branch .. //depot/projects/hammer/sys/vm/memguard.h#1 branch .. //depot/projects/hammer/sys/vm/vm_fault.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#39 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#50 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#29 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.h#4 integrate .. //depot/projects/hammer/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/pipe/pipe-overcommit1.c#1 branch .. //depot/projects/hammer/tools/regression/pipe/pipe-overcommit2.c#1 branch .. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/pirtool/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/pirtool/pirtable.h#2 integrate .. //depot/projects/hammer/tools/tools/pirtool/pirtool.c#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#13 integrate .. //depot/projects/hammer/usr.bin/column/column.c#4 integrate .. //depot/projects/hammer/usr.bin/find/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/find/function.c#7 integrate .. //depot/projects/hammer/usr.bin/fsync/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/fsync/fsync.c#2 integrate .. //depot/projects/hammer/usr.bin/logname/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/logname/logname.c#3 integrate .. //depot/projects/hammer/usr.bin/lsvfs/lsvfs.1#4 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#13 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/passwd/passwd.1#5 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.1#6 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#4 integrate .. //depot/projects/hammer/usr.bin/rsh/rsh.1#3 integrate .. //depot/projects/hammer/usr.bin/rsh/rsh.c#5 integrate .. //depot/projects/hammer/usr.bin/xinstall/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#9 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#10 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/isdnd.rc.5#6 integrate .. //depot/projects/hammer/usr.sbin/i4b/man/i4bisppp.4#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/man/i4btel.4#4 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#16 integrate .. //depot/projects/hammer/usr.sbin/lpr/lpc/lpc.8#4 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.8#7 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#11 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#4 integrate .. //depot/projects/hammer/usr.sbin/nfsd/nfsd.c#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#16 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#31 integrate Differences ... ==== //depot/projects/hammer/bin/mkdir/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/mkdir/Makefile,v 1.7 2001/12/04 01:57:45 obrien Exp $ +# $FreeBSD: src/bin/mkdir/Makefile,v 1.8 2005/01/25 14:31:19 ssouhlal Exp $ PROG= mkdir +WARNS?= 6 .include ==== //depot/projects/hammer/bin/mkdir/mkdir.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.30 2005/01/10 08:39:23 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.31 2005/01/25 14:31:19 ssouhlal Exp $"); #include #include @@ -62,7 +62,8 @@ main(int argc, char *argv[]) { int ch, exitval, success, pflag; - mode_t omode, *set = (mode_t *)NULL; + mode_t omode; + void *set = NULL; char *mode; omode = pflag = 0; ==== //depot/projects/hammer/bin/rcp/rcp.1#5 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.19 2005/01/10 08:39:24 imp Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.20 2005/01/21 09:31:38 ru Exp $ .\" -.Dd May 31, 1993 +.Dd October 16, 2002 .Dt RCP 1 .Os .Sh NAME @@ -37,12 +37,10 @@ .Nd remote file copy .Sh SYNOPSIS .Nm -.Op Fl 46Kpx -.Op Fl k Ar realm +.Op Fl 46p .Ar file1 file2 .Nm -.Op Fl 46Kprx -.Op Fl k Ar realm +.Op Fl 46pr .Ar .Ar directory .Sh DESCRIPTION @@ -65,16 +63,6 @@ Use IPv4 addresses only. .It Fl 6 Use IPv6 addresses only. -.It Fl K -Turn off all Kerberos authentication. -.It Fl k -Request -.Nm -to obtain tickets -for the remote host in realm -.Ar realm -instead of the remote host's realm as determined by -.Xr krb_realmofhost 3 . .It Fl p Cause .Nm @@ -92,15 +80,6 @@ .Nm copies each subtree rooted at that name; in this case the destination must be a directory. -.It Fl x -Turn on -.Tn DES -encryption for all data passed by -.Nm . -This may impact response time and -.Tn CPU -utilization, but provides -increased security. .El .Pp If ==== //depot/projects/hammer/contrib/groff/tmac/doc-common#11 (text+ko) ==== @@ -551,10 +551,6 @@ .ds doc-date-12 December . .de Dd -. \" XXX: why do we need gX? -. if "\*[doc-date-string]"" \ -. nr gX 1 -. . ie \n[.$] \{\ . ie (\n[.$] == 3) \ . ds doc-date-string \$1\~\$2 \$3 ==== //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#6 (text+ko) ==== @@ -180,8 +180,6 @@ .ds Ba \f[R]|\f[] .ds Am & . -.nr gX 0 -. . .\" NS doc-header-string global string .\" NS the final string used for the manual page header @@ -203,12 +201,8 @@ . wh 0 doc-header . wh -1.25i doc-footer . -. if \n[gX] \ -. ds doc-command-name -. . br . -. nr gX 0 . e@ doc-end-macro .. . ==== //depot/projects/hammer/contrib/groff/tmac/doc-syms#6 (text+ko) ==== @@ -697,6 +697,7 @@ .ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) .ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) +.ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) .ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) .ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) .ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) ==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#10 (text+ko) ==== @@ -2179,10 +2179,21 @@ . doc-parse-args \$@ . \} . el \{\ -. ie \n[doc-space-mode] \ +. ie \n[doc-space-mode] \{\ +. ds doc-saved-space "\*[doc-space] +. ds doc-space . nr doc-space-mode 0 -. el \ +. \} +. el \{\ +. ds doc-space "\*[doc-saved-space] . nr doc-space-mode 1 +. +. \" finish line only if it is interrupted and `doc-have-space' +. \" isn't set +. if \n[doc-reg-Sm] \ +. if \n[.int] \ +. nop \) +. \} . \}\} . . if !\n[doc-arg-limit] \ @@ -2207,10 +2218,15 @@ . el \{\ . \" no argument for Sm . nr doc-arg-ptr -1 -. ie \n[doc-space-mode] \ +. ie \n[doc-space-mode] \{\ +. ds doc-saved-space "\*[doc-space] +. ds doc-space . nr doc-space-mode 0 -. el \ +. \} +. el \{\ +. ds doc-space "\*[doc-saved-space] . nr doc-space-mode 1 +. \} . \}\} . . ie \n[doc-space-mode] \{\ @@ -2237,18 +2253,13 @@ . \} . . \" do we have parameters to print? -. ie (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\ -. \" ignore `.Sm on' and `.Sm off' without additional parameters -. ie (\n[doc-arg-ptr] > 1) \ -. doc-print-and-reset -. el \ -. doc-reset-args -. \} -. el \{\ +. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ . \" skip `Sm' argument . nr doc-arg-ptr +1 . doc-print-recursive . \} +. el \ +. doc-reset-args .. . . @@ -5146,6 +5157,10 @@ . ie \n[.$] \ . tm Usage: .Re (does not take arguments) (#\n[.c]) . el \{\ +. if !\n[doc-is-reference] \{\ +. tm mdoc warning: Extraneous .Re (#\n[.c]) +. return +. \} . doc-print-reference . doc-reset-reference . nr doc-is-reference 0 @@ -5224,7 +5239,7 @@ .\" NS doc-reference-count . .de doc-finish-reference -. nr doc-reference-count -1 +. nr doc-reference-count -\$1 . ie \n[doc-reference-count] \ . nop \), . el \ @@ -5254,81 +5269,81 @@ . chop doc-reference-title-name-for-book . ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\ . nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c -. doc-finish-reference +. doc-finish-reference \n[doc-reference-title-count] . \} . el \{\ . nop \*[doc-reference-title-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-reference-title-count] . \}\} . . if \n[doc-book-count] \{\ . unformat doc-book-name . chop doc-book-name . nop \*[doc-book-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-book-count] . \} . . if \n[doc-publisher-count] \{\ . unformat doc-publisher-name . chop doc-publisher-name . nop \*[doc-publisher-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-publisher-count] . \} . . if \n[doc-journal-count] \{\ . unformat doc-journal-name . chop doc-journal-name . nop \*[doc-journal-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-journal-count] . \} . . if \n[doc-report-count] \{\ . unformat doc-report-name . chop doc-report-name . nop \*[doc-report-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-report-count] . \} . . if \n[doc-issue-count] \{\ . unformat doc-issue-name . chop doc-issue-name . nop \*[doc-issue-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-issue-count] . \} . . if \n[doc-volume-count] \{\ . unformat doc-volume-name . chop doc-volume-name . nop \*[doc-volume-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-volume-count] . \} . . if \n[doc-page-number-count] \{\ . unformat doc-page-number-string . chop doc-page-number-string . nop \*[doc-page-number-string]\c -. doc-finish-reference +. doc-finish-reference \n[doc-page-number-count] . \} . . if \n[doc-corporate-count] \{\ . unformat doc-corporate-name . chop doc-corporate-name . nop \*[doc-corporate-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-corporate-count] . \} . . if \n[doc-date-count] \{\ . unformat doc-date . chop doc-date . nop \*[doc-date]\c -. doc-finish-reference +. doc-finish-reference \n[doc-date-count] . \} . . if \n[doc-optional-count] \{\ . unformat doc-optional-string . chop doc-optional-string . nop \*[doc-optional-string]\c -. doc-finish-reference +. doc-finish-reference \n[doc-optional-count] . \} . . if \n[doc-reference-count] \ ==== //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#9 (text+ko) ==== @@ -1699,6 +1699,8 @@ .Lb libmenu .It Li libossaudio .Lb libossaudio +.It Li libpam +.Lb libpam .It Li libpcap .Lb libpcap .It Li libpci ==== //depot/projects/hammer/contrib/tcpdump/print-ppp.c#3 (text+ko) ==== @@ -21,7 +21,7 @@ * Extensively modified by Motonori Shindo (mshindo@mshindo.net) for more * complete PPP support. * - * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.13 2004/03/31 14:57:24 bms Exp $ + * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.14 2005/01/24 14:56:48 bms Exp $ */ /* @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89.2.3 2004/03/24 03:32:43 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89.2.4 2004/07/13 16:00:25 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -444,6 +444,10 @@ pfunc = NULL; break; } + + if (pfunc == NULL) /* catch the above null pointer if unknown CP */ + break; + if ((j = (*pfunc)(tptr, len)) == 0) break; x -= j; ==== //depot/projects/hammer/contrib/telnet/telnet/telnet.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 -.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.16 2001/08/20 12:28:40 markm Exp $ +.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.17 2005/01/21 21:57:05 ru Exp $ .\" .Dd January 27, 2000 .Dt TELNET 1 @@ -84,7 +84,8 @@ .Nm to use IPv6 addresses only. .It Fl 8 -Specifies an 8-bit data path. This causes an attempt to +Specifies an 8-bit data path. +This causes an attempt to negotiate the .Dv TELNET BINARY option on both input and output. @@ -99,7 +100,8 @@ .It Fl K Specifies no automatic login to the remote system. .It Fl L -Specifies an 8-bit data path on output. This causes the +Specifies an 8-bit data path on output. +This causes the .Dv BINARY option to be negotiated on output. .It Fl N @@ -134,7 +136,8 @@ .It Fl c Disables the reading of the user's .Pa \&.telnetrc -file. (See the +file. +(See the .Ic toggle skiprc command on this man page.) .It Fl d @@ -223,13 +226,14 @@ .Nm establishes a connection to the corresponding named socket. .It Ar port -Indicates a port number (address of an application). If a number is +Indicates a port number (address of an application). +If a number is not specified, the default .Nm port is used. .El .Pp -When in rlogin mode, a line of the form ~. disconnects from the +When in rlogin mode, a line of the form ~. disconnects from the remote host; ~ is the .Nm escape character. @@ -255,9 +259,11 @@ When .Dv LINEMODE is enabled, character processing is done on the -local system, under the control of the remote system. When input +local system, under the control of the remote system. +When input editing or character echoing is to be disabled, the remote system -will relay that information. The remote system will also relay +will relay that information. +The remote system will also relay changes to any special characters that happen on the remote system, so that they can take effect on the local system. .Pp @@ -279,7 +285,7 @@ .Dv TRUE (the default for \*(Lqold line by line\*(Rq; see below), the user's -.Ic quit , +.Ic quit , .Ic intr , and .Ic flush @@ -315,7 +321,7 @@ (in the case of .Ic quit and -.Ic intr ) . +.Ic intr ) . .Pp While connected to a remote host, .Nm @@ -329,11 +335,11 @@ commands are available. Only enough of each command to uniquely identify it need be typed (this is also true for arguments to the -.Ic mode , +.Ic mode , .Ic set , -.Ic toggle , +.Ic toggle , .Ic unset , -.Ic slc , +.Ic slc , .Ic environ , and .Ic display @@ -343,17 +349,20 @@ .It Ic auth Ar argument ... The auth command manipulates the information sent through the .Dv TELNET AUTHENTICATE -option. Valid arguments for the +option. +Valid arguments for the .Ic auth command are: .Bl -tag -width "disable type" .It Ic disable Ar type -Disables the specified type of authentication. To +Disables the specified type of authentication. +To obtain a list of available types, use the .Ic auth disable ?\& command. .It Ic enable Ar type -Enables the specified type of authentication. To +Enables the specified type of authentication. +To obtain a list of available types, use the .Ic auth enable ?\& command. @@ -383,18 +392,22 @@ .It Ic disable Ar type Xo .Op Cm input | output .Xc -Disables the specified type of encryption. If you +Disables the specified type of encryption. +If you omit the input and output, both input and output -are disabled. To obtain a list of available +are disabled. +To obtain a list of available types, use the .Ic encrypt disable ?\& >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 25 23:59:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B49616A4D0; Tue, 25 Jan 2005 23:59:36 +0000 (GMT) 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 1981D16A4CE for ; Tue, 25 Jan 2005 23:59:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D058E43D4C for ; Tue, 25 Jan 2005 23:59:35 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0PNxZ4N087551 for ; Tue, 25 Jan 2005 23:59:35 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0PNxZTc087548 for perforce@freebsd.org; Tue, 25 Jan 2005 23:59:35 GMT (envelope-from wsalamon@computer.org) Date: Tue, 25 Jan 2005 23:59:35 GMT Message-Id: <200501252359.j0PNxZTc087548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2005 23:59:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=69736 Change 69736 by wsalamon@rickenbacker on 2005/01/25 23:58:34 Modify test library to match include paths for FreeBSD, use system calls instead of syscall(). Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/tlib.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#2 (text+ko) ==== @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #define AUDITLOGSUFFIX "audit.log" #define INITIAL_AUID 666 ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/Makefile#2 (text+ko) ==== @@ -24,20 +24,22 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# -LIB_NAME=libaudittest.a +LIB_NAME=audittest +LONG_LIB_NAME=lib$(LIB_NAME).a GCC=gcc -g -Wall -I/usr/include -I../include +LD=ld +AR=ar all: lib test lib: - $(GCC) -fno-common -c audittest.c - libtool -static -o $(LIB_NAME) *.o + $(GCC) -fPIC -c audittest.c + $(AR) -r $(LONG_LIB_NAME) *.o test: tlib.c - $(GCC) -lbsm $(LIB_NAME) tlib.c -o tlib + $(GCC) -lbsm tlib.c -o tlib audittest.o chmod +x tlib clean: - rm -f *.o $(LIB_NAME) tlib + rm -f *.o $(LONG_LIB_NAME) tlib ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#2 (text+ko) ==== @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include int aut_verbose; @@ -46,6 +46,7 @@ void aut_logfile(char *prefix) { int ret; + char *fn; if (prefix != NULL) sprintf(logfile, "%s.%s", prefix, AUDITLOGSUFFIX); @@ -57,7 +58,8 @@ perror("Audit log file open"); exit(-1); } - ret = syscall(SYS_auditctl, logfile); + fn = logfile; + ret = auditctl(AC_SETLOGFILE, &fn, sizeof(fn)); if (ret != 0) { perror("auditctl() failed"); exit(-1); @@ -105,7 +107,7 @@ { int ret; - ret = syscall(SYS_auditctl, NULL); + ret = auditctl(AC_SHUTDOWN, NULL, 0); if (ret != 0) { perror("auditctl() shutdown failed"); return (ret); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/tlib.c#2 (text+ko) ==== @@ -26,8 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include -#include +#include +#include #include extern int aut_verbose; From owner-p4-projects@FreeBSD.ORG Wed Jan 26 00:06:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7350516A4CF; Wed, 26 Jan 2005 00:06:45 +0000 (GMT) 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 2C96B16A4D0 for ; Wed, 26 Jan 2005 00:06:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E971243D49 for ; Wed, 26 Jan 2005 00:06:44 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q06iAA087810 for ; Wed, 26 Jan 2005 00:06:44 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q06ihK087807 for perforce@freebsd.org; Wed, 26 Jan 2005 00:06:44 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 00:06:44 GMT Message-Id: <200501260006.j0Q06ihK087807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 00:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=69737 Change 69737 by wsalamon@rickenbacker on 2005/01/26 00:06:36 Change Makefile to be BSD make compliant. Remove the mach tests from the build. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/Makefile#2 (text+ko) ==== @@ -25,12 +25,11 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # - # # Top-level make file for building and running the audit test programs. # -export SUBDIRS = lib file filesystem ipc mach net other process syscall system +SUBDIRS=lib file filesystem ipc net other process syscall system # # From audittest.h: @@ -41,7 +40,7 @@ # AUT_PERROR_FLAG 0x1000 # # -export ASSERT_FLAGS = 0x0010 +ASSERT_FLAGS=0x0010 all: @for subdir in $(SUBDIRS); do \ From owner-p4-projects@FreeBSD.ORG Wed Jan 26 01:06:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A4E416A4D0; Wed, 26 Jan 2005 01:06:59 +0000 (GMT) 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 223DE16A4CE for ; Wed, 26 Jan 2005 01:06:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C549543D2F for ; Wed, 26 Jan 2005 01:06:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q16wsp096525 for ; Wed, 26 Jan 2005 01:06:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q16wju096522 for perforce@freebsd.org; Wed, 26 Jan 2005 01:06:58 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 01:06:58 GMT Message-Id: <200501260106.j0Q16wju096522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 01:07:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=69740 Change 69740 by wsalamon@rickenbacker on 2005/01/26 01:06:57 Update the audit file test programs to match the include paths, etc. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tchroot.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilecreate.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileioctl.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tmmap.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tsharedfile.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tchroot.c#2 (text+ko) ==== @@ -25,13 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include #include +#include +#include #include #include -#include -#include -#include -#include /* * Test the auditing of of path/vnode information when using a chroot'd ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#2 (text+ko) ==== @@ -25,13 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include #include -#include +#include +#include #include #include -#include -#include -#include /* * Test the auditing of some of the dir-related system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#2 (text+ko) ==== @@ -25,15 +25,15 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include +#include +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include /* * Test the auditing of some of the file-related system calls. @@ -47,7 +47,6 @@ int ret; int temp_fd; struct stat tstat; - struct attrlist alist; char tempname[32]; char buf[128]; fhandle_t fh; @@ -69,19 +68,6 @@ /* Generate a failure AUE_ACCESS record */ access("ANonExisteNtFiLeNaME", F_OK); - /* Generate a success AUE_GETATTRLIST record */ - bzero((void *)&alist, sizeof(alist)); - alist.bitmapcount = ATTR_BIT_MAP_COUNT; - /* getattrlist() is not completely implemented. The alist.fileattr - * field should be set as below, but that will generate a failure. - * So we fake it for now. - */ - /* alist.fileattr = ATTR_FILE_VALIDMASK; */ - alist.fileattr = 1; - if (getattrlist(tempname, &alist, buf, 128, FSOPT_NOFOLLOW)) - AUT_PERROR("getattrlist()"); - aut_assert(AUE_GETATTRLIST); - /* Generate a success AUE_GETFH record */ if (getfh(tempname, &fh)) AUT_PERROR("getfh()"); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilecreate.c#2 (text+ko) ==== @@ -25,13 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include +#include +#include +#include #include -#include #include -#include -#include -#include /* * Test the auditing of some of the file-related system calls. @@ -48,10 +48,21 @@ char tempname2[32]; char tempname3[32]; char tempname4[32]; + char *tempname; AUT_INIT(); /* Create a temporary file */ + /* Should create a AUE_OPEN_WC record (no vnode attr info) */ + strcpy(tempname1, "tempName1.XXXX"); + tempname = mktemp(tempname1); + temp_fd = open(tempname, O_WRONLY | O_CREAT, 0x666); + if(temp_fd < 0) { + AUT_PERROR("temp file open/create"); + } + aut_assert(AUE_OPEN_WC); + + /* Create a temporary file */ /* Should create a AUE_OPEN_RWC record (no vnode attr info) */ strcpy(tempname1, "tempName1.XXXX"); if ((temp_fd = mkstemp(tempname1)) < 0) { ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileioctl.c#2 (text+ko) ==== @@ -25,10 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include #include -#include -#include -#include /* * Test the auditing of some of the file ioctl system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include +#include +#include +#include #include #include -#include -#include -#include -#include -#include /* * Test the auditing of some of the file-related system calls. @@ -48,7 +47,6 @@ struct timeval mytime; char tempname[32]; char tempname2[32]; - struct attrlist alist; char buf[128]; struct flock tlock; @@ -66,6 +64,11 @@ AUT_PERROR("chmod()"); aut_assert(AUE_CHMOD); + /* The next call should generate a AUE_LCHMOD audit record */ + if ((lchmod(tempname, S_IRWXU)) < 0) + AUT_PERROR("lchmod()"); + aut_assert(AUE_LCHMOD); + /* The next call should generate a AUE_FCHMOD audit record */ if ((fchmod(temp_fd, S_IRWXU|S_IRWXG|S_IRWXO)) < 0) AUT_PERROR("fchmod()"); @@ -76,6 +79,11 @@ AUT_PERROR("chown()"); aut_assert(AUE_CHOWN); + /* The next call should generate a AUE_LCHOWN audit record */ + if ((lchown(tempname, 9, 9)) < 0) + AUT_PERROR("lchown()"); + aut_assert(AUE_LCHOWN); + /* The next call should generate a AUE_FCHOWN audit record */ if ((fchown(temp_fd, 0, 0)) < 0) AUT_PERROR("fchown()"); @@ -97,6 +105,11 @@ AUT_PERROR("chflags()"); aut_assert(AUE_CHFLAGS); + /* Generate a AUE_LCHFLAGS audit record */ + if ((lchflags(tempname, UF_NODUMP)) < 0) + AUT_PERROR("lchflags()"); + aut_assert(AUE_LCHFLAGS); + /* Generate a AUE_TRUNCATE audit record */ if ((truncate(tempname, 0)) < 0) AUT_PERROR("truncate()"); @@ -142,20 +155,6 @@ AUT_PERROR("temp file two creation"); exit (-1); } - bzero((void *)buf, 128); - bzero((void *)&alist, sizeof(alist)); - alist.bitmapcount = ATTR_BIT_MAP_COUNT; - alist.fileattr = ATTR_FILE_VALIDMASK; - getattrlist(tempname2, &alist, (void *)buf, 128, FSOPT_NOFOLLOW); - /* Generate a success AUE_SETATTRLIST audit record */ - alist.fileattr = ATTR_FILE_SETMASK; - if (setattrlist(tempname2, &alist, (void *)buf, 128, FSOPT_NOFOLLOW)) - AUT_PERROR("setattrlist()"); - - /* Generate a success AUE_EXCHANGEDATA record */ - if (exchangedata(tempname, tempname2, FSOPT_NOFOLLOW)) - AUT_PERROR("exchangedata()"); - aut_assert(AUE_EXCHANGEDATA); /* Generate a failure AUE_UNDELETE record, but with path and vnode * attr tokens. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tmmap.c#2 (text+ko) ==== @@ -25,11 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include +#include +#include #include -#include -#include -#include /* * Test the auditing of some of the mmap-related system calls. @@ -83,8 +83,8 @@ aut_assert(AUE_MPROTECT); /* Create a AUE_MINHERIT record */ - if (minherit(maddr, MAPLEN, VM_INHERIT_SHARE) < 0) { - AUT_PERROR("minherit(.., .., VM_INHERIT_SHARE)"); + if (minherit(maddr, MAPLEN, INHERIT_SHARE) < 0) { + AUT_PERROR("minherit(.., .., INHERIT_SHARE)"); } aut_assert(AUE_MINHERIT); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tsharedfile.c#2 (text+ko) ==== @@ -25,11 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include #include -#include -#include -#include -#include /* * Test the auditing of some of the shared file mapping system calls. @@ -44,7 +43,6 @@ char tempname[32]; char buf[MAPSIZE]; int flags; - sf_mapping_t sf_map; AUT_INIT(); @@ -58,6 +56,7 @@ AUT_PERROR("write to temp file"); } +#if 0 /* Generate a AUE_LOADSHFILE audit record. The call will fail * (which is what we want) but we will get a complete audit record. */ @@ -83,6 +82,7 @@ if ((new_system_shared_regions()) < 0) AUT_PERROR("new_system_shared_regions()"); aut_assert(AUE_NEWSYSTEMSHREG); +#endif unlink(tempname); From owner-p4-projects@FreeBSD.ORG Wed Jan 26 01:25:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D59416A4D0; Wed, 26 Jan 2005 01:25:21 +0000 (GMT) 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 6A57516A4CE for ; Wed, 26 Jan 2005 01:25:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31CF143D2D for ; Wed, 26 Jan 2005 01:25:21 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q1PLfJ097146 for ; Wed, 26 Jan 2005 01:25:21 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q1PK5K097143 for perforce@freebsd.org; Wed, 26 Jan 2005 01:25:20 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 01:25:20 GMT Message-Id: <200501260125.j0Q1PK5K097143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 01:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=69741 Change 69741 by wsalamon@rickenbacker on 2005/01/26 01:24:47 Update for include paths; remove Darwin-specific code. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include +#include +#include +#include #include #include -#include -#include -#include -#include -#include /* * Test the auditing of some of the filesystem-related system calls. @@ -47,13 +46,10 @@ int temp_fd; char tempname[32]; struct statfs stat; - struct attrlist alist; u_long count; u_long basep; u_long newstate; u_long nmatches; - struct fssearchblock searchbl; - struct searchstate state; char buf[128]; AUT_INIT(); @@ -106,30 +102,6 @@ exit (-1); } - bzero((void *)&alist, sizeof(alist)); - alist.bitmapcount = ATTR_BIT_MAP_COUNT; - alist.dirattr = 1; - count = 1; - /* Generate a success AUE_GETDIRENTRIESATTR audit record */ - if (getdirentriesattr(temp_fd, &alist, buf, 128, &count, - &basep, &newstate, FSOPT_NOFOLLOW)) - AUT_PERROR("getdirentriesattr()"); - aut_assert(AUE_GETDIRENTRIESATTR); - - /* Generate a failure AUE_SEARCHFS audit record, but we'll still - * get the path and vnode attr tokens */ - searchbl.returnattrs=(struct attrlist *)malloc(sizeof(struct attrlist)); - searchbl.returnbuffer = (void *)malloc(128); - searchbl.returnbuffersize = 128; - searchbl.maxmatches = 1; - searchbl.searchparams1 = (void *)malloc(16); - searchbl.sizeofsearchparams1 = 16; - searchbl.searchparams2 = (void *)malloc(16); - searchbl.sizeofsearchparams2 = 16; - if (searchfs("/", &searchbl, &nmatches, 0, FSOPT_NOFOLLOW, &state)) - AUT_PERROR("searchfs()"); - aut_assert(AUE_SEARCHFS); - aut_shutdown(); exit(0); } From owner-p4-projects@FreeBSD.ORG Wed Jan 26 01:39:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8722A16A4D0; Wed, 26 Jan 2005 01:39:39 +0000 (GMT) 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 2658D16A4CE for ; Wed, 26 Jan 2005 01:39:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9BAF43D1D for ; Wed, 26 Jan 2005 01:39:38 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q1dccu097541 for ; Wed, 26 Jan 2005 01:39:38 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q1dcTN097538 for perforce@freebsd.org; Wed, 26 Jan 2005 01:39:38 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 01:39:38 GMT Message-Id: <200501260139.j0Q1dcTN097538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 01:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=69742 Change 69742 by wsalamon@rickenbacker on 2005/01/26 01:39:14 Fix up include paths. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tmsg.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tposix.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tsem.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tshm.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#2 (text+ko) ==== @@ -25,9 +25,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include #include -#include -#include /* * Test the auditing of some of the IPC system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tmsg.c#2 (text+ko) ==== @@ -25,11 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include #include -#include #include -#include -#include /* * Test the auditing of the System V message passing system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tposix.c#2 (text+ko) ==== @@ -25,14 +25,14 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include -#include /* * Test the auditing of the Posix shared memory and semaphore system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tsem.c#2 (text+ko) ==== @@ -25,12 +25,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include +#include #include -#include #include -#include -#include -#include /* * Test the auditing of the System V semaphore system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tshm.c#2 (text+ko) ==== @@ -25,12 +25,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include +#include #include -#include #include -#include -#include -#include /* * Test the auditing of the System V shared memory system calls. From owner-p4-projects@FreeBSD.ORG Wed Jan 26 04:31:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EFBB16A4D0; Wed, 26 Jan 2005 04:31:08 +0000 (GMT) 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 1899C16A4CE for ; Wed, 26 Jan 2005 04:31:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1F0443D41 for ; Wed, 26 Jan 2005 04:31:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q4V7Om003987 for ; Wed, 26 Jan 2005 04:31:07 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q4V7An003983 for perforce@freebsd.org; Wed, 26 Jan 2005 04:31:07 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 04:31:07 GMT Message-Id: <200501260431.j0Q4V7An003983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 04:31:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=69749 Change 69749 by wsalamon@rickenbacker on 2005/01/26 04:30:42 Change include paths; remove use of syscall() and use audit system calls directly. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tauditon.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tauditon_cond.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsysaudit.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsyscall.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tauditon.c#2 (text+ko) ==== @@ -25,12 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include -#include -#include -#include -#include +#include +#include /* * Test the auditon() system call, execpt for the A_GETCOND/A_SETCOND @@ -55,7 +53,7 @@ AUT_INIT(); flags = 0; - ret = syscall(SYS_auditon, A_GETPOLICY, &flags, sizeof(long)); + ret = auditon(A_GETPOLICY, &flags, sizeof(long)); if (ret == 0) AUT_PRINTF("Current policy flags are 0x%08x\n", flags); else @@ -64,13 +62,12 @@ flags = AUDIT_CNT | AUDIT_TRAIL; AUT_PRINTF("Setting policy flags to 0x%08x\n", flags); - ret = syscall(SYS_auditon, A_SETPOLICY, &flags, sizeof(long)); + ret = auditon(A_SETPOLICY, &flags, sizeof(long)); if (ret) AUT_PERROR("A_SETPOLICY"); aut_assert(AUE_AUDITON_SPOLICY); - ret = syscall(SYS_auditon, A_GETKMASK, &mask, sizeof(au_mask_t)); -ret = syscall(SYS_auditon, A_GETKMASK, &mask, -1); + ret = auditon(A_GETKMASK, &mask, sizeof(au_mask_t)); if (ret == 0) AUT_PRINTF("GETKMASK: success[0x%08x], failure[0x%08x]\n", mask.am_success, mask.am_failure); @@ -82,12 +79,12 @@ mask.am_failure = AU_ALL; AUT_PRINTF("A_SETKMASK: success[0x%08x], failure[0x%08x]\n", mask.am_success, mask.am_failure); - ret = syscall(SYS_auditon, A_SETKMASK, &mask, sizeof(au_mask_t)); + ret = auditon(A_SETKMASK, &mask, sizeof(au_mask_t)); if (ret) AUT_PERROR("A_SETKMASK"); aut_assert(AUE_AUDITON_SETKMASK); - ret = syscall(SYS_auditon, A_GETQCTRL, &qctrl, sizeof(au_qctrl_t)); + ret = auditon(A_GETQCTRL, &qctrl, sizeof(au_qctrl_t)); if (ret == 0) AUT_PRINTF("A_GETQCTRL: hiwater[%d], lowater[%d], bufsz[%d], delay[%d], minfree[%d]\n", qctrl.aq_hiwater, qctrl.aq_lowater, qctrl.aq_bufsz, qctrl.aq_delay, qctrl.aq_minfree); @@ -102,33 +99,33 @@ qctrl.aq_minfree = 10; AUT_PRINTF("A_SETQCTRL: hiwater[%d], lowater[%d], bufsz[%d], delay[%d], minfree[%d]\n", qctrl.aq_hiwater, qctrl.aq_lowater, qctrl.aq_bufsz, qctrl.aq_delay, qctrl.aq_minfree); - ret = syscall(SYS_auditon, A_SETQCTRL, &qctrl, sizeof(au_qctrl_t)); + ret = auditon(A_SETQCTRL, &qctrl, sizeof(au_qctrl_t)); if (ret) AUT_PERROR("A_SETQCTRL"); aut_assert(AUE_AUDITON_SQCTRL); bzero(&qctrl, sizeof(qctrl)); - ret = syscall(SYS_auditon, A_GETQCTRL, &qctrl, sizeof(au_qctrl_t)); + ret = auditon(A_GETQCTRL, &qctrl, sizeof(au_qctrl_t)); if (ret == 0) AUT_PRINTF("A_GETQCTRL: hiwater[%d], lowater[%d], bufsz[%d], delay[%d], minfree[%d]\n", qctrl.aq_hiwater, qctrl.aq_lowater, qctrl.aq_bufsz, qctrl.aq_delay, qctrl.aq_minfree); else AUT_PERROR("A_GETQCTRL"); - ret = syscall(SYS_auditon, A_GETCWD, path, MAXPATHLEN); + ret = auditon(A_GETCWD, path, MAXPATHLEN); if (ret == 0) AUT_PRINTF("A_GETCWD: path[%s]\n", path); else AUT_PERROR("A_GETCWD"); aut_assert(AUE_AUDITON_GETCWD); - ret = syscall(SYS_auditon, A_GETCAR, path, MAXPATHLEN); + ret = auditon(A_GETCAR, path, MAXPATHLEN); if (ret == 0) AUT_PRINTF("A_GETCAR: path[%s]\n", path); else AUT_PERROR("A_GETCAR"); aut_assert(AUE_AUDITON_GETCAR); - ret = syscall(SYS_auditon, A_GETSTAT, &stat, sizeof(au_stat_t)); + ret = auditon(A_GETSTAT, &stat, sizeof(au_stat_t)); if (ret == 0) { AUT_PRINTF("A_GETSTAT: version[%u], numevent[%u], generated[%d] ", stat.as_version, stat.as_numevent, stat.as_generated); @@ -144,7 +141,7 @@ aut_assert(AUE_AUDITON_GETSTAT); bzero((void *)&stat, sizeof(au_stat_t)); - ret = syscall(SYS_auditon, A_SETSTAT, &stat, sizeof(au_stat_t)); + ret = auditon(A_SETSTAT, &stat, sizeof(au_stat_t)); if (ret) AUT_PERROR("A_SETSTAT"); @@ -153,19 +150,19 @@ info.ai_mask.am_success = AU_NET | AU_FREAD; info.ai_mask.am_failure = AU_ALL; info.ai_asid = 0; - ret = syscall(SYS_auditon, A_SETUMASK, &info, sizeof(auditinfo_t)); + ret = auditon(A_SETUMASK, &info, sizeof(auditinfo_t)); if (ret) AUT_PERROR("A_SETUMASK"); aut_assert(AUE_AUDITON_SETUMASK); - ret = syscall(SYS_auditon, A_SETSMASK, &info, sizeof(auditinfo_t)); + ret = auditon(A_SETSMASK, &info, sizeof(auditinfo_t)); if (ret) AUT_PERROR("A_SETSMASK"); aut_assert(AUE_AUDITON_SETSMASK); classmap.ec_number = AUE_AUDIT; classmap.ec_class = 0; - ret = syscall(SYS_auditon, A_GETCLASS, &classmap, + ret = auditon(A_GETCLASS, &classmap, sizeof(au_evclass_map_t)); if (ret == 0) AUT_PRINTF("A_GETCLASS: Event %d maps to class mask 0x%08x\n", @@ -178,14 +175,14 @@ classmap.ec_class = AU_LOGIN; AUT_PRINTF("A_SETCLASS: Mapping event %d to class mask 0x%08x\n", classmap.ec_number, classmap.ec_class); - ret = syscall(SYS_auditon, A_SETCLASS, &classmap, + ret = auditon(A_SETCLASS, &classmap, sizeof(au_evclass_map_t)); if (ret) AUT_PERROR("A_SETCLASS"); aut_assert(AUE_AUDITON_SETCLASS); classmap.ec_class = 0; - ret = syscall(SYS_auditon, A_GETCLASS, &classmap, + ret = auditon(A_GETCLASS, &classmap, sizeof(au_evclass_map_t)); if (ret == 0) AUT_PRINTF("A_GETCLASS: Event %d maps to class mask 0x%08x\n", @@ -194,7 +191,7 @@ AUT_PERROR("A_GETCLASS(AUE_telenet"); pinfo.ap_pid = getpid(); - ret = syscall(SYS_auditon, A_GETPINFO, &pinfo, sizeof(auditpinfo_t)); + ret = auditon(A_GETPINFO, &pinfo, sizeof(auditpinfo_t)); if (ret == 0) { AUT_PRINTF("A_GETPINFO: pid[%d], auid[%d] ", pinfo.ap_pid, pinfo.ap_auid); @@ -212,38 +209,38 @@ */ /* Failure auditon() */ pinfo.ap_pid = 0; - syscall(SYS_auditon, A_SETPMASK, &pinfo, sizeof(auditpinfo_t)); + auditon(A_SETPMASK, &pinfo, sizeof(auditpinfo_t)); /* Success auditon() */ pinfo.ap_pid = getpid(); - ret = syscall(SYS_auditon, A_SETPMASK, &pinfo, sizeof(auditpinfo_t)); + ret = auditon(A_SETPMASK, &pinfo, sizeof(auditpinfo_t)); if (ret) AUT_PERROR("A_SETPMASK"); - ret = syscall(SYS_auditon, A_SETFSIZE, &fstat, sizeof(au_fstat_t)); + ret = auditon(A_SETFSIZE, &fstat, sizeof(au_fstat_t)); if (ret) AUT_PERROR("A_SETFSIZE"); - ret = syscall(SYS_auditon, A_GETFSIZE, &fstat, sizeof(au_fstat_t)); + ret = auditon(A_GETFSIZE, &fstat, sizeof(au_fstat_t)); if (ret == 0) ; else AUT_PERROR("A_GETFSIZE"); - ret = syscall(SYS_auditon, A_GETPINFO_ADDR, &pinfo_addr, + ret = auditon(A_GETPINFO_ADDR, &pinfo_addr, sizeof(auditpinfo_addr_t)); if (ret == 0) ; else AUT_PERROR("A_GETPINFO_ADDR"); - ret = syscall(SYS_auditon, A_GETKAUDIT, NULL, 0); + ret = auditon(A_GETKAUDIT, NULL, 0); if (ret == 0) ; else AUT_PERROR("A_GETKAUDIT"); - ret = syscall(SYS_auditon, A_SETKAUDIT, NULL, 0); + ret = auditon(A_SETKAUDIT, NULL, 0); if (ret) AUT_PERROR("A_SETKAUDIT"); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tauditon_cond.c#2 (text+ko) ==== @@ -25,13 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include -#include -#include -#include -#include +#include /* * Test the A_GETCOND and A_SETCOND commands of the auditon() system call. @@ -46,7 +43,7 @@ AUT_INIT(); - ret = syscall(SYS_auditon, A_GETCOND, &cond, sizeof(long)); + ret = auditon(A_GETCOND, &cond, sizeof(long)); if (ret == 0) AUT_PRINTF("A_GETCOND: cond is %s\n", aut_condstr(cond)); else @@ -63,7 +60,7 @@ */ cond = AUC_AUDITING; AUT_PRINTF("First A_SETCOND: %s\n", aut_condstr(cond)); - ret = syscall(SYS_auditon, A_SETCOND, &cond, sizeof(long)); + ret = auditon(A_SETCOND, &cond, sizeof(long)); if (ret) { AUT_PRINTF("%s ", aut_condstr(cond)); AUT_PERROR("A_SETCOND"); @@ -72,7 +69,7 @@ cond = AUC_NOAUDIT; AUT_PRINTF("Second A_SETCOND: %s\n", aut_condstr(cond)); - ret = syscall(SYS_auditon, A_SETCOND, &cond, sizeof(long)); + ret = auditon(A_SETCOND, &cond, sizeof(long)); if (ret) { AUT_PRINTF("%s ", aut_condstr(cond)); AUT_PERROR("A_SETCOND"); @@ -84,7 +81,7 @@ cond = AUC_AUDITING; AUT_PRINTF("Third A_SETCOND: %s\n", aut_condstr(cond)); - ret = syscall(SYS_auditon, A_SETCOND, &cond, sizeof(long)); + ret = auditon(A_SETCOND, &cond, sizeof(long)); if (ret) { AUT_PRINTF("%s ", aut_condstr(cond)); AUT_PERROR("A_SETCOND"); @@ -101,7 +98,7 @@ */ cond = AUC_DISABLED; AUT_PRINTF("A_SETCOND: %s\n", aut_condstr(cond)); - ret = syscall(SYS_auditon, A_SETCOND, &cond, sizeof(long)); + ret = auditon(A_SETCOND, &cond, sizeof(long)); if (ret) { AUT_PRINTF("%s ", aut_condstr(cond)); AUT_PERROR("A_SETCOND"); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsysaudit.c#2 (text+ko) ==== @@ -25,14 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include /* * Test the audit() system call. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsyscall.c#2 (text+ko) ==== @@ -25,84 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include #include - -/* - * Test some of the audit information system calls. - * These calls should generate audit records because we set the preselection - * mask for the process before making the call. - */ -int main(int argc, char **argv) { - -#define AUDIT_CLASSES (AU_ADMIN) - - int ret; - uid_t auid; - struct auditinfo ret_auinfo; - au_evclass_map_t classmap; - caddr_t rec; - - AUT_INIT(); - - auid = 777; - ret = syscall(SYS_setauid, &auid); - if (ret != 0) - AUT_PERROR("setauid() failed: "); - aut_assert(AUE_SETAUID); - - auid = -1; - ret = syscall(SYS_getauid, &auid); - if (ret != 0) - AUT_PERROR("getauid() failed: "); - else - AUT_PRINTF("Audit ID returned by getauid() is %d\n", auid); - aut_assert(AUE_GETAUID); - - /* Assign the GETAUDIT and SETAUDIT events to the AU_ADMIN class */ - classmap.ec_number = AUE_GETAUDIT; - classmap.ec_class = AU_ADMIN; - ret = syscall(SYS_auditon, A_SETCLASS, &classmap, - sizeof(au_evclass_map_t)); - classmap.ec_number = AUE_SETAUDIT; - ret = syscall(SYS_auditon, A_SETCLASS, &classmap, - sizeof(au_evclass_map_t)); - ret = syscall(SYS_getaudit, &ret_auinfo); - if (ret != 0) - AUT_PERROR("getaudit() failed: "); - else { - AUT_PRINTF("Audit ID returned is %d\n", ret_auinfo.ai_auid); - AUT_PRINTF("Session ID returned is %d\n", ret_auinfo.ai_asid); - AUT_PRINTF("Terminal ID returned is %d:%d\n", - ret_auinfo.ai_termid.port, - ret_auinfo.ai_termid.machine); - AUT_PRINTF("Audit masks returned are 0x%08x:0x%08x\n", - ret_auinfo.ai_mask.am_success, - ret_auinfo.ai_mask.am_failure); - } - aut_assert(AUE_GETAUDIT); - - ret = syscall(SYS_setaudit, &ret_auinfo); - if (ret != 0) - AUT_PERROR("setaudit() failed: "); - aut_assert(AUE_SETAUDIT); - - aut_shutdown(); - exit(0); -} - #include -#include +#include #include #include -#include -#include -#include /* * Test some of the audit information system calls. @@ -122,13 +49,13 @@ AUT_INIT(); auid = 777; - ret = syscall(SYS_setauid, &auid); + ret = setauid(&auid); if (ret != 0) AUT_PERROR("setauid() failed: "); aut_assert(AUE_SETAUID); auid = -1; - ret = syscall(SYS_getauid, &auid); + ret = getauid(&auid); if (ret != 0) AUT_PERROR("getauid() failed: "); else @@ -138,12 +65,12 @@ /* Assign the GETAUDIT and SETAUDIT events to the AU_ADMIN class */ classmap.ec_number = AUE_GETAUDIT; classmap.ec_class = AU_ADMIN; - ret = syscall(SYS_auditon, A_SETCLASS, &classmap, + ret = auditon(A_SETCLASS, &classmap, sizeof(au_evclass_map_t)); classmap.ec_number = AUE_SETAUDIT; - ret = syscall(SYS_auditon, A_SETCLASS, &classmap, + ret = auditon(A_SETCLASS, &classmap, sizeof(au_evclass_map_t)); - ret = syscall(SYS_getaudit, &ret_auinfo); + ret = getaudit(&ret_auinfo); if (ret != 0) AUT_PERROR("getaudit() failed: "); else { @@ -158,7 +85,7 @@ } aut_assert(AUE_GETAUDIT); - ret = syscall(SYS_setaudit, &ret_auinfo); + ret = setaudit(&ret_auinfo); if (ret != 0) AUT_PERROR("setaudit() failed: "); aut_assert(AUE_SETAUDIT); From owner-p4-projects@FreeBSD.ORG Wed Jan 26 04:57:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E822A16A4D0; Wed, 26 Jan 2005 04:57:40 +0000 (GMT) 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 A4C1C16A4CE for ; Wed, 26 Jan 2005 04:57:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59EE543D1F for ; Wed, 26 Jan 2005 04:57:40 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0Q4vehS011272 for ; Wed, 26 Jan 2005 04:57:40 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0Q4vdx1011269 for perforce@freebsd.org; Wed, 26 Jan 2005 04:57:39 GMT (envelope-from wsalamon@computer.org) Date: Wed, 26 Jan 2005 04:57:39 GMT Message-Id: <200501260457.j0Q4vdx1011269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 69750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2005 04:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=69750 Change 69750 by wsalamon@rickenbacker on 2005/01/26 04:56:45 Changes necessary to compile on FreeBSD. Also remove unecessary include of audit.h from several files. Most of tkevent.c is if'd out because kqueue/kevent are not audited at the present time. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/net/tinetsock.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/net/tunixsock.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/other/tkevent.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tfork.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tlogin.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tprocess.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/net/tinetsock.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include #include #include #include #include #include -#include /* * Test the auditing of the INET socket system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/net/tunixsock.c#2 (text+ko) ==== @@ -25,12 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include #include #include #include -#include /* * Test the auditing of the Unix socket system calls. @@ -62,7 +61,7 @@ aut_assert(AUE_SOCKET); strcpy(tempname, "tempSock.XXXX"); - mktemp(tempname); + mkstemp(tempname); sname.sun_family = AF_UNIX; strcpy(sname.sun_path, tempname); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/other/tkevent.c#2 (text+ko) ==== @@ -25,13 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include #include +#include #include -#include -#include -#include /* * Test the auditing of the kqueue/kevent system calls. @@ -40,6 +37,10 @@ #define AUDIT_CLASSES (AU_OTHER) +// At one time, kqueue(0/kevent() were audited in Darwin, but was later removed +// If it is ever put back in place, this test program is a start. +#if 0 + int kqd; struct kevent kev; int fflags; @@ -66,10 +67,8 @@ fflags = NOTE_EXIT; EV_SET(&changelist[0], pid, EVFILT_PROC, EV_ADD, fflags, 0, NULL); AUT_PRINTF("Registering for event ID (PID) %d\n", pid); -/* if (kevent(kqd, changelist, 1, eventlist, 1, &ts) < 0) AUT_PERROR("kevent(pid)"); -*/ fd = open("/dev/null", O_RDONLY, S_IROTH); if (fd < 0) @@ -83,5 +82,6 @@ fd = open("/dev/null", O_RDONLY, S_IROTH); aut_shutdown(); +#endif exit(0); } ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tfork.c#2 (text+ko) ==== @@ -25,16 +25,16 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include #include -#include -#include #include #include -#include +#include +#include +#include +#include +#include +#include /* * Test the auditing of fork, exec, ktrace and ptrace system calls. @@ -80,10 +80,6 @@ AUT_PERROR("fork"); aut_assert(AUE_FORK); - /* Generate a success AUE_SETPRIVEXEC record */ - setprivexec(1); - aut_assert(AUE_SETPRIVEXEC); - /* Generate a success AUE_EXECVE record */ if (child_pid == 0) { execv("child", argv); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tlogin.c#2 (text+ko) ==== @@ -25,11 +25,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include #include #include -#include /* * Test the auditing of the login system call. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tprocess.c#2 (text+ko) ==== @@ -25,12 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include #include -#include +#include #include -#include -#include -#include /* * Test the auditing of some of the process-related system calls. From owner-p4-projects@FreeBSD.ORG Thu Jan 27 01:13:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C4016A503; Thu, 27 Jan 2005 01:13:32 +0000 (GMT) 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 1A59216A4F7 for ; Thu, 27 Jan 2005 01:13:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E19FF43D2F for ; Thu, 27 Jan 2005 01:13:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0R1DVUD090801 for ; Thu, 27 Jan 2005 01:13:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0R1DVvD090798 for perforce@freebsd.org; Thu, 27 Jan 2005 01:13:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 27 Jan 2005 01:13:31 GMT Message-Id: <200501270113.j0R1DVvD090798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 69794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2005 01:13:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=69794 Change 69794 by sam@sam_ebb on 2005/01/27 01:12:43 add tools to the branch Affected files ... .. //depot/projects/vap/tools/tools/ath/80211debug.c#1 branch .. //depot/projects/vap/tools/tools/ath/80211stats.c#1 branch .. //depot/projects/vap/tools/tools/ath/80211watch.c#1 branch .. //depot/projects/vap/tools/tools/ath/Makefile#1 branch .. //depot/projects/vap/tools/tools/ath/athdebug.c#1 branch .. //depot/projects/vap/tools/tools/ath/athstats.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 27 13:09:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66ED816A4D0; Thu, 27 Jan 2005 13:09:59 +0000 (GMT) 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 E545F16A4CE for ; Thu, 27 Jan 2005 13:09:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2F8B43D53 for ; Thu, 27 Jan 2005 13:09:58 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0RD9w44033992 for ; Thu, 27 Jan 2005 13:09:58 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0RD9wnn033989 for perforce@freebsd.org; Thu, 27 Jan 2005 13:09:58 GMT (envelope-from areisse@nailabs.com) Date: Thu, 27 Jan 2005 13:09:58 GMT Message-Id: <200501271309.j0RD9wnn033989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 69825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2005 13:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=69825 Change 69825 by areisse@areisse_tislabs on 2005/01/27 13:09:03 various minor sebsd policy changes -crontab, /usr/bin/mail, ssh dontaudit cap_sys_admin Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#10 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mta.fc#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crontab_macros.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mta_macros.te#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#6 (text+ko) ==== @@ -31,3 +31,6 @@ # Add/remove user home directories file_type_auto_trans(sysadm_t, home_root_t, user_home_dir_t, dir) + + +dontaudit domain self:capability sys_admin; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#10 (text+ko) ==== @@ -126,7 +126,6 @@ # type of the pty for the child define(`sshd_spawn_domain', ` login_spawn_domain($1, $2) -domain_auto_trans($1_t, shell_exec_t, user_t) ifdef(`xauth.te', ` domain_trans($1_t, xauth_exec_t, $2) ') @@ -233,6 +232,9 @@ allow sshd_t sshd_devpts_t:chr_file { setattr getattr relabelfrom relabelto }; allow sshd_t userpty_type:chr_file { setattr relabelto rw_file_perms }; +# respawn sshd +allow sshd_t sshd_exec_t:file execute_no_trans; + # # Author: Stephen Smalley # ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mta.fc#3 (text+ko) ==== @@ -2,6 +2,7 @@ /usr/sbin/sendmail(.sendmail)? system_u:object_r:sendmail_exec_t /usr/sbin/mailwrapper system_u:object_r:sendmail_exec_t /usr/libexec/sendmail/sendmail system_u:object_r:sendmail_exec_t +/usr/libexec/mail.local system_u:object_r:sendmail_exec_t /etc/aliases system_u:object_r:etc_aliases_t /etc/aliases\.db system_u:object_r:etc_aliases_t /var/spool/mail(/.*)? system_u:object_r:mail_spool_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crontab_macros.te#5 (text+ko) ==== @@ -40,7 +40,7 @@ # Use capabilities dac_override is to create the file in the directory # under /tmp -allow $1_crontab_t $1_crontab_t:capability { setuid setgid chown dac_override }; +allow $1_crontab_t $1_crontab_t:capability { setuid setgid chown dac_override fowner }; dontaudit $1_crontab_t proc_t:dir { search }; dontaudit $1_crontab_t selinux_config_t:dir { search }; @@ -92,6 +92,7 @@ # Inherit and use descriptors from gnome-pty-helper. ifdef(`gnome-pty-helper.te', `allow $1_crontab_t $1_gph_t:fd use;') allow $1_crontab_t privfd:fd use; +allow $1_crontab_t self:fd { use create }; dontaudit $1_crontab_t var_run_t:dir search; ') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mta_macros.te#3 (text+ko) ==== @@ -37,6 +37,7 @@ can_ypbind($1_mail_t) allow $1_mail_t self:unix_dgram_socket create_socket_perms; allow $1_mail_t self:unix_stream_socket create_socket_perms; +allow $1_mail_t self:fd {create use}; read_locale($1_mail_t) read_sysctl($1_mail_t) From owner-p4-projects@FreeBSD.ORG Thu Jan 27 18:09:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D082D16A4D0; Thu, 27 Jan 2005 18:09:04 +0000 (GMT) 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 8888A16A4CE for ; Thu, 27 Jan 2005 18:09:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAC7443D46 for ; Thu, 27 Jan 2005 18:09:03 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0RI93Y7051558 for ; Thu, 27 Jan 2005 18:09:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0RI93Pb051555 for perforce@freebsd.org; Thu, 27 Jan 2005 18:09:03 GMT (envelope-from sam@freebsd.org) Date: Thu, 27 Jan 2005 18:09:03 GMT Message-Id: <200501271809.j0RI93Pb051555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 69837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2005 18:09:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=69837 Change 69837 by sam@sam_ebb on 2005/01/27 18:08:42 IFC @ 69836 Affected files ... .. //depot/projects/wifi/bin/chflags/Makefile#2 integrate .. //depot/projects/wifi/bin/chio/Makefile#2 integrate .. //depot/projects/wifi/bin/mkdir/Makefile#2 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/wifi/bin/ps/Makefile#3 integrate .. //depot/projects/wifi/bin/rm/Makefile#2 integrate .. //depot/projects/wifi/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-ditroff#2 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc.tmac#3 integrate .. //depot/projects/wifi/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#4 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#8 integrate .. //depot/projects/wifi/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/wifi/gnu/lib/libstdc++/config.h#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/wifi/include/netdb.h#2 integrate .. //depot/projects/wifi/include/pwd.h#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#4 integrate .. //depot/projects/wifi/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/wifi/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/wifi/lib/libc/net/name6.c#2 integrate .. //depot/projects/wifi/lib/libc/sys/send.2#3 integrate .. //depot/projects/wifi/lib/msun/Makefile#5 integrate .. //depot/projects/wifi/lib/msun/man/copysign.3#1 branch .. //depot/projects/wifi/lib/msun/man/ieee.3#3 integrate .. //depot/projects/wifi/lib/msun/man/ilogb.3#1 branch .. //depot/projects/wifi/lib/msun/man/math.3#5 integrate .. //depot/projects/wifi/lib/msun/man/nextafter.3#1 branch .. //depot/projects/wifi/lib/msun/man/remainder.3#1 branch .. //depot/projects/wifi/lib/msun/man/scalbn.3#1 branch .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#8 integrate .. //depot/projects/wifi/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/wifi/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/wifi/sbin/reboot/Makefile#2 integrate .. //depot/projects/wifi/sbin/reboot/reboot.c#2 integrate .. //depot/projects/wifi/sbin/shutdown/Makefile#2 integrate .. //depot/projects/wifi/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/wifi/share/man/man4/ktr.4#2 integrate .. //depot/projects/wifi/share/man/man4/nmdm.4#2 integrate .. //depot/projects/wifi/share/man/man4/uplcom.4#3 integrate .. //depot/projects/wifi/share/man/man9/style.9#5 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#6 integrate .. //depot/projects/wifi/share/mk/bsd.prog.mk#5 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#6 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#8 integrate .. //depot/projects/wifi/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/cs/if_csvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#6 integrate .. //depot/projects/wifi/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/wifi/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#10 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/wifi/sys/i386/include/sysarch.h#3 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/unaligned.c#3 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/wifi/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_time.c#4 integrate .. //depot/projects/wifi/sys/kern/sys_generic.c#6 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#8 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#8 integrate .. //depot/projects/wifi/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#12 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#5 integrate .. //depot/projects/wifi/sys/modules/Makefile#12 integrate .. //depot/projects/wifi/sys/modules/agp/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/aic7xxx/ahd/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/bios/smapi/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ie/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/pcic/Makefile#2 delete .. //depot/projects/wifi/sys/modules/sound/driver/maestro/Makefile#2 integrate .. //depot/projects/wifi/sys/net/raw_cb.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#21 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/wifi/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/wifi/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/wifi/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/wifi/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/wifi/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/wifi/sys/sys/lockf.h#3 integrate .. //depot/projects/wifi/sys/sys/lockmgr.h#3 integrate .. //depot/projects/wifi/sys/sys/param.h#4 integrate .. //depot/projects/wifi/sys/sys/syscall.h#7 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#7 integrate .. //depot/projects/wifi/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#7 integrate .. //depot/projects/wifi/sys/sys/systm.h#6 integrate .. //depot/projects/wifi/sys/sys/umtx.h#9 integrate .. //depot/projects/wifi/sys/sys/vnode.h#15 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/wifi/tools/regression/ia64/unaligned/test.c#2 integrate .. //depot/projects/wifi/tools/regression/ia64/unaligned/unaligned.t#2 integrate .. //depot/projects/wifi/tools/regression/ia64_unaligned/Makefile#4 delete .. //depot/projects/wifi/tools/regression/ia64_unaligned/unaligned.c#2 delete .. //depot/projects/wifi/usr.bin/banner/banner.6#3 integrate .. //depot/projects/wifi/usr.bin/checknr/checknr.1#3 integrate .. //depot/projects/wifi/usr.bin/column/column.c#2 integrate .. //depot/projects/wifi/usr.bin/comm/comm.1#3 integrate .. //depot/projects/wifi/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/wifi/usr.bin/find/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/find/function.c#2 integrate .. //depot/projects/wifi/usr.bin/fmt/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/fsync/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/fsync/fsync.1#2 integrate .. //depot/projects/wifi/usr.bin/fsync/fsync.c#2 integrate .. //depot/projects/wifi/usr.bin/logname/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/logname/logname.c#2 integrate .. //depot/projects/wifi/usr.bin/make/main.c#11 integrate .. //depot/projects/wifi/usr.bin/make/make.1#5 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#6 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#8 integrate .. //depot/projects/wifi/usr.bin/make/str.c#6 integrate .. //depot/projects/wifi/usr.bin/ncal/Makefile#4 integrate .. //depot/projects/wifi/usr.bin/nl/nl.1#4 integrate .. //depot/projects/wifi/usr.bin/rlogin/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/rsh/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/stat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/xinstall/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/xinstall/xinstall.c#2 integrate .. //depot/projects/wifi/usr.sbin/arlcontrol/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/dconschat/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/getfmac/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/getfmac/getfmac.c#2 integrate .. //depot/projects/wifi/usr.sbin/getpmac/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/getpmac/getpmac.c#2 integrate .. //depot/projects/wifi/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/lptcontrol/lptcontrol.c#2 integrate .. //depot/projects/wifi/usr.sbin/pnpinfo/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/ipcp.c#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/ipv6cp.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/radius.c#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/radius.h#2 integrate .. //depot/projects/wifi/usr.sbin/setfmac/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/wifi/usr.sbin/setpmac/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/setpmac/setpmac.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/wifi/bin/chflags/Makefile#2 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/bin/chflags/Makefile,v 1.18 2004/10/03 15:03:15 stefanf Exp $ +# $FreeBSD: src/bin/chflags/Makefile,v 1.19 2005/01/27 13:23:05 delphij Exp $ PROG= chflags -WARNS?= 6 .include ==== //depot/projects/wifi/bin/chio/Makefile#2 (text+ko) ==== @@ -1,7 +1,6 @@ -# $FreeBSD: src/bin/chio/Makefile,v 1.11 2001/12/04 01:57:38 obrien Exp $ +# $FreeBSD: src/bin/chio/Makefile,v 1.12 2005/01/27 13:25:09 delphij Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= chio -SRCS= chio.c .include ==== //depot/projects/wifi/bin/mkdir/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/mkdir/Makefile,v 1.7 2001/12/04 01:57:45 obrien Exp $ +# $FreeBSD: src/bin/mkdir/Makefile,v 1.9 2005/01/26 06:48:17 ssouhlal Exp $ PROG= mkdir ==== //depot/projects/wifi/bin/mkdir/mkdir.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.30 2005/01/10 08:39:23 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.31 2005/01/25 14:31:19 ssouhlal Exp $"); #include #include @@ -62,7 +62,8 @@ main(int argc, char *argv[]) { int ch, exitval, success, pflag; - mode_t omode, *set = (mode_t *)NULL; + mode_t omode; + void *set = NULL; char *mode; omode = pflag = 0; ==== //depot/projects/wifi/bin/ps/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.26 2004/11/13 17:12:22 ru Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.27 2005/01/27 13:42:40 delphij Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c -WARNS?= 5 + # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps ==== //depot/projects/wifi/bin/rm/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rm/Makefile,v 1.17 2002/07/15 12:08:21 sheldonh Exp $ +# $FreeBSD: src/bin/rm/Makefile,v 1.18 2005/01/27 14:52:45 delphij Exp $ PROG= rm -SRCS= rm.c LINKS= ${BINDIR}/rm ${BINDIR}/unlink MLINKS= rm.1 unlink.1 ==== //depot/projects/wifi/bin/rmdir/rmdir.c#3 (text+ko) ==== @@ -39,10 +39,9 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.19 2004/11/20 00:41:08 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.20 2005/01/26 06:51:28 ssouhlal Exp $"); #include -#include #include #include #include ==== //depot/projects/wifi/contrib/groff/tmac/doc-common#3 (text+ko) ==== @@ -551,10 +551,6 @@ .ds doc-date-12 December . .de Dd -. \" XXX: why do we need gX? -. if "\*[doc-date-string]"" \ -. nr gX 1 -. . ie \n[.$] \{\ . ie (\n[.$] == 3) \ . ds doc-date-string \$1\~\$2 \$3 ==== //depot/projects/wifi/contrib/groff/tmac/doc-ditroff#2 (text+ko) ==== @@ -180,8 +180,6 @@ .ds Ba \f[R]|\f[] .ds Am & . -.nr gX 0 -. . .\" NS doc-header-string global string .\" NS the final string used for the manual page header @@ -203,12 +201,8 @@ . wh 0 doc-header . wh -1.25i doc-footer . -. if \n[gX] \ -. ds doc-command-name -. . br . -. nr gX 0 . e@ doc-end-macro .. . ==== //depot/projects/wifi/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -697,6 +697,7 @@ .ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) .ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) +.ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) .ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) .ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) .ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) ==== //depot/projects/wifi/contrib/groff/tmac/doc.tmac#3 (text+ko) ==== @@ -2179,10 +2179,21 @@ . doc-parse-args \$@ . \} . el \{\ -. ie \n[doc-space-mode] \ +. ie \n[doc-space-mode] \{\ +. ds doc-saved-space "\*[doc-space] +. ds doc-space . nr doc-space-mode 0 -. el \ +. \} +. el \{\ +. ds doc-space "\*[doc-saved-space] . nr doc-space-mode 1 +. +. \" finish line only if it is interrupted and `doc-have-space' +. \" isn't set +. if \n[doc-reg-Sm] \ +. if \n[.int] \ +. nop \) +. \} . \}\} . . if !\n[doc-arg-limit] \ @@ -2207,10 +2218,15 @@ . el \{\ . \" no argument for Sm . nr doc-arg-ptr -1 -. ie \n[doc-space-mode] \ +. ie \n[doc-space-mode] \{\ +. ds doc-saved-space "\*[doc-space] +. ds doc-space . nr doc-space-mode 0 -. el \ +. \} +. el \{\ +. ds doc-space "\*[doc-saved-space] . nr doc-space-mode 1 +. \} . \}\} . . ie \n[doc-space-mode] \{\ @@ -2237,18 +2253,13 @@ . \} . . \" do we have parameters to print? -. ie (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\ -. \" ignore `.Sm on' and `.Sm off' without additional parameters -. ie (\n[doc-arg-ptr] > 1) \ -. doc-print-and-reset -. el \ -. doc-reset-args -. \} -. el \{\ +. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ . \" skip `Sm' argument . nr doc-arg-ptr +1 . doc-print-recursive . \} +. el \ +. doc-reset-args .. . . @@ -5146,6 +5157,10 @@ . ie \n[.$] \ . tm Usage: .Re (does not take arguments) (#\n[.c]) . el \{\ +. if !\n[doc-is-reference] \{\ +. tm mdoc warning: Extraneous .Re (#\n[.c]) +. return +. \} . doc-print-reference . doc-reset-reference . nr doc-is-reference 0 @@ -5224,7 +5239,7 @@ .\" NS doc-reference-count . .de doc-finish-reference -. nr doc-reference-count -1 +. nr doc-reference-count -\$1 . ie \n[doc-reference-count] \ . nop \), . el \ @@ -5254,81 +5269,81 @@ . chop doc-reference-title-name-for-book . ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\ . nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c -. doc-finish-reference +. doc-finish-reference \n[doc-reference-title-count] . \} . el \{\ . nop \*[doc-reference-title-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-reference-title-count] . \}\} . . if \n[doc-book-count] \{\ . unformat doc-book-name . chop doc-book-name . nop \*[doc-book-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-book-count] . \} . . if \n[doc-publisher-count] \{\ . unformat doc-publisher-name . chop doc-publisher-name . nop \*[doc-publisher-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-publisher-count] . \} . . if \n[doc-journal-count] \{\ . unformat doc-journal-name . chop doc-journal-name . nop \*[doc-journal-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-journal-count] . \} . . if \n[doc-report-count] \{\ . unformat doc-report-name . chop doc-report-name . nop \*[doc-report-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-report-count] . \} . . if \n[doc-issue-count] \{\ . unformat doc-issue-name . chop doc-issue-name . nop \*[doc-issue-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-issue-count] . \} . . if \n[doc-volume-count] \{\ . unformat doc-volume-name . chop doc-volume-name . nop \*[doc-volume-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-volume-count] . \} . . if \n[doc-page-number-count] \{\ . unformat doc-page-number-string . chop doc-page-number-string . nop \*[doc-page-number-string]\c -. doc-finish-reference +. doc-finish-reference \n[doc-page-number-count] . \} . . if \n[doc-corporate-count] \{\ . unformat doc-corporate-name . chop doc-corporate-name . nop \*[doc-corporate-name]\c -. doc-finish-reference +. doc-finish-reference \n[doc-corporate-count] . \} . . if \n[doc-date-count] \{\ . unformat doc-date . chop doc-date . nop \*[doc-date]\c -. doc-finish-reference +. doc-finish-reference \n[doc-date-count] . \} . . if \n[doc-optional-count] \{\ . unformat doc-optional-string . chop doc-optional-string . nop \*[doc-optional-string]\c -. doc-finish-reference +. doc-finish-reference \n[doc-optional-count] . \} . . if \n[doc-reference-count] \ ==== //depot/projects/wifi/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -1699,6 +1699,8 @@ .Lb libmenu .It Li libossaudio .Lb libossaudio +.It Li libpam +.Lb libpam .It Li libpcap .Lb libpcap .It Li libpci ==== //depot/projects/wifi/etc/defaults/periodic.conf#4 (text+ko) ==== @@ -10,7 +10,10 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.32 2005/01/04 16:35:30 paul Exp $ +# For a more detailed explanation of all the periodic.conf variables, please +# refer to the periodic.conf(5) manual page. +# +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33 2005/01/24 22:21:13 keramida Exp $ # # What files override these defaults ? ==== //depot/projects/wifi/etc/defaults/rc.conf#8 (text+ko) ==== @@ -1,5 +1,4 @@ #!/bin/sh -# # This is rc.conf - a file full of useful variables that you can set # to change the default startup behavior of your system. You should @@ -13,7 +12,10 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.235 2004/12/15 12:39:28 brian Exp $ +# For a more detailed explanation of all the rc.conf variables, please +# refer to the rc.conf(5) manual page. +# +# $FreeBSD: src/etc/defaults/rc.conf,v 1.236 2005/01/24 21:52:32 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### ==== //depot/projects/wifi/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.53 2005/01/17 08:38:31 cperciva Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.54 2005/01/26 13:56:27 kan Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -21,14 +21,15 @@ DPADD= ${LIBM} # libstdc++ sources -SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc functexcept.cc \ - globals_locale.cc globals_io.cc ios.cc ios_failure.cc ios_init.cc \ - ios_locale.cc limits.cc list.cc locale.cc locale_init.cc \ - locale_facets.cc localename.cc stdexcept.cc strstream.cc tree.cc \ - allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \ - io-inst.cc istream-inst.cc locale-inst.cc locale-misc-inst.cc \ - misc-inst.cc ostream-inst.cc sstream-inst.cc streambuf-inst.cc \ - string-inst.cc valarray-inst.cc wlocale-inst.cc wstring-inst.cc +SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \ + functexcept.cc globals_locale.cc globals_io.cc ios.cc ios_failure.cc \ + ios_init.cc ios_locale.cc limits.cc debug_list.cc list.cc locale.cc \ + locale_init.cc locale_facets.cc localename.cc stdexcept.cc \ + strstream.cc tree.cc allocator-inst.cc concept-inst.cc fstream-inst.cc \ + ext-inst.cc io-inst.cc istream-inst.cc locale-inst.cc \ + locale-misc-inst.cc misc-inst.cc ostream-inst.cc sstream-inst.cc \ + streambuf-inst.cc string-inst.cc valarray-inst.cc wlocale-inst.cc \ + wstring-inst.cc # target sources SRCS+= atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \ ==== //depot/projects/wifi/gnu/lib/libstdc++/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.8 2004/07/28 05:27:18 kan Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.10 2005/01/26 14:23:31 kan Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -201,7 +201,7 @@ #define HAVE_CEILF 1 /* Define to 1 if you have the `ceill' function. */ -/* #undef HAVE_CEILL */ +#define HAVE_CEILL 1 /* Define to 1 if you have the `copysign' function. */ #define HAVE_COPYSIGN 1 @@ -261,7 +261,7 @@ #define HAVE_FLOORF 1 /* Define to 1 if you have the `floorl' function. */ -/* #undef HAVE_FLOORL */ +#define HAVE_FLOORL 1 /* Define to 1 if you have the `fmodf' function. */ #define HAVE_FMODF 1 @@ -858,10 +858,10 @@ #define HAVE___SIGNBIT 1 /* Define to 1 if you have the `__signbitf' function. */ -/* #undef HAVE___SIGNBITF */ +#define HAVE___SIGNBITF 1 /* Define to 1 if you have the `__signbitl' function. */ -/* #undef HAVE___SIGNBITL */ +#define HAVE___SIGNBITL 1 /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" ==== //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.44 2004/12/18 07:20:33 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.45 2005/01/25 09:37:37 ru Exp $ .\" .\" %beginstrip% . @@ -48,7 +48,6 @@ .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) -.ds doc-str-Lb-libpam PAM Library (libpam, \-lpam) .ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) .ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ==== //depot/projects/wifi/include/netdb.h#2 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.32 2004/02/25 21:03:44 green Exp $ + * $FreeBSD: src/include/netdb.h,v 1.33 2005/01/27 14:45:11 ume Exp $ */ #ifndef _NETDB_H_ @@ -175,10 +175,12 @@ */ #define AI_PASSIVE 0x00000001 /* get address to use bind() */ #define AI_CANONNAME 0x00000002 /* fill ai_canonname */ -#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */ -/* valid flags for addrinfo */ +#define AI_NUMERICHOST 0x00000004 /* prevent host name resolution */ +#define AI_NUMERICSERV 0x00000008 /* prevent service name resolution */ +/* valid flags for addrinfo (not a standard def, apps should not use it) */ #define AI_MASK \ - (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_ADDRCONFIG) + (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \ + AI_ADDRCONFIG) #define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */ #define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */ ==== //depot/projects/wifi/include/pwd.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pwd.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/include/pwd.h,v 1.15 2003/04/18 14:11:17 nectar Exp $ + * $FreeBSD: src/include/pwd.h,v 1.16 2005/01/26 17:26:54 nectar Exp $ */ #ifndef _PWD_H_ @@ -89,11 +89,11 @@ * As it happens, some applications read the database directly. * (Bad app, no cookie!) Thus, we leave the _PW_KEY* symbols at their * old pre-FreeBSD 5.1 values so these apps still work. Consequently - * we have to do muck around a bit more to get the correct, versioned - * tag, and that is what the _PW_VERSIONED macros is about. + * we have to muck around a bit more to get the correct, versioned + * tag, and that is what the _PW_VERSIONED macro is about. */ -#define _PW_VERSION_MASK '0xF0' +#define _PW_VERSION_MASK '\xF0' #define _PW_VERSIONED(x, v) ((unsigned char)(((x) & 0xCF) | ((v)<<4))) #define _PW_KEYBYNAME '\x31' /* stored by name */ ==== //depot/projects/wifi/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.28 2005/01/08 19:51:04 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.29 2005/01/25 06:07:28 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.01.022 +VERSION= 1.02.002 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -42,6 +42,7 @@ archive_read_support_format_cpio.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_tar.c \ + archive_read_support_format_zip.c \ archive_string.c \ archive_string_sprintf.c \ archive_util.c \ @@ -142,6 +143,7 @@ MLINKS+= archive_read.3 archive_read_support_format_cpio.3 MLINKS+= archive_read.3 archive_read_support_format_iso9660.3 MLINKS+= archive_read.3 archive_read_support_format_tar.3 +MLINKS+= archive_read.3 archive_read_support_format_zip.3 MLINKS+= archive_util.3 archive_compression.3 MLINKS+= archive_util.3 archive_compression_name.3 MLINKS+= archive_util.3 archive_errno.3 ==== //depot/projects/wifi/lib/libarchive/Makefile.am#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile.am,v 1.2 2004/08/08 00:48:39 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile.am,v 1.3 2005/01/25 06:07:28 kientzle Exp $ lib_LIBRARIES= libarchive.a @@ -26,7 +26,9 @@ archive_read_support_compression_none.c \ archive_read_support_format_all.c \ archive_read_support_format_cpio.c \ + archive_read_support_format_iso9660.c \ archive_read_support_format_tar.c \ + archive_read_support_format_zip.c \ archive_string.c \ archive_string.h \ archive_string_sprintf.c \ ==== //depot/projects/wifi/lib/libarchive/archive.h.in#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.21 2005/01/23 03:02:14 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.22 2005/01/25 06:07:28 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -128,8 +128,9 @@ #define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2) #define ARCHIVE_FORMAT_TAR_PAX_RESTRICTED (ARCHIVE_FORMAT_TAR | 3) #define ARCHIVE_FORMAT_TAR_GNUTAR (ARCHIVE_FORMAT_TAR | 4) -#define ARCHIVE_FORMAT_ISO9660 0x40000 -#define ARCHIVE_FORMAT_ISO9660_ROCKRIDGE (ARCHIVE_FORMAT_ISO9660 | 1) +#define ARCHIVE_FORMAT_ISO9660 0x40000 +#define ARCHIVE_FORMAT_ISO9660_ROCKRIDGE (ARCHIVE_FORMAT_ISO9660 | 1) +#define ARCHIVE_FORMAT_ZIP 0x50000 /*- * Basic outline for reading an archive: @@ -163,6 +164,7 @@ int archive_read_support_format_gnutar(struct archive *); int archive_read_support_format_iso9660(struct archive *); int archive_read_support_format_tar(struct archive *); +int archive_read_support_format_zip(struct archive *); /* Open the archive using callbacks for archive I/O. */ ==== //depot/projects/wifi/lib/libarchive/archive_read.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.16 2005/01/12 05:56:49 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.17 2005/01/25 06:07:28 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_read 3 @@ -39,6 +39,7 @@ .Nm archive_read_support_format_cpio , .Nm archive_read_support_format_iso9660 , .Nm archive_read_support_format_tar , +.Nm archive_read_support_format_zip , .Nm archive_read_open , .Nm archive_read_open_fd , .Nm archive_read_open_file , @@ -78,6 +79,8 @@ .Ft int .Fn archive_read_support_format_tar "struct archive *" .Ft int +.Fn archive_read_support_format_zip "struct archive *" +.Ft int .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *" .Ft int .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" @@ -122,7 +125,7 @@ This controls the size that will be used when invoking the read callback function. The default is 20 records or 10240 bytes for tar formats. -.It Fn archive_read_support_comression_all , Fn archive_read_support_compression_bzip2 , Fn archive_read_support_compression_compress , Fn archive_read_support_compression_gzip , Fn archive_read_support_compression_none +.It Fn archive_read_support_compression_all , Fn archive_read_support_compression_bzip2 , Fn archive_read_support_compression_compress , Fn archive_read_support_compression_gzip , Fn archive_read_support_compression_none Enables auto-detection code and decompression support for the specified compression. Note that @@ -131,7 +134,7 @@ For convenience, .Fn archive_read_support_compression_all enables all available decompression code. -.It Fn archive_read_support_format_all , Fn archive_read_support_format_cpio , Fn archive_read_support_format_iso9660 , Fn archive_read_support_format_tar +.It Fn archive_read_support_format_all , Fn archive_read_support_format_cpio , Fn archive_read_support_format_iso9660 , Fn archive_read_support_format_tar, Fn archive_read_support_format_zip Enables support---including auto-detection code---for the specified archive format. For example, @@ -233,7 +236,9 @@ Note that restoring of atime is not currently supported. .It Cm ARCHIVE_EXTRACT_NO_OVERWRITE Existing files on disk will not be overwritten. -By default, existing files are unlinked before the new entry is written. +By default, existing regular files are truncated and overwritten; +existing directories will have their permissions updated; +other pre-existing objects are unlinked and recreated from scratch. .It Cm ARCHIVE_EXTRACT_UNLINK Existing files on disk will be unlinked and recreated from scratch. By default, existing files are truncated and rewritten, but @@ -401,9 +406,9 @@ Most functions return zero on success, non-zero on error. The possible return codes include: .Cm ARCHIVE_OK -(the operation succeeded) +(the operation succeeded), .Cm ARCHIVE_WARN -(the operation succeeded but a non-critical error was encountered) +(the operation succeeded but a non-critical error was encountered), .Cm ARCHIVE_EOF (end-of-archive was encountered), .Cm ARCHIVE_RETRY @@ -467,3 +472,24 @@ library was written by .An Tim Kientzle Aq kientzle@acm.org . .Sh BUGS +Directories are actually extracted in two distinct phases. +Directories are created during +.Fn archive_read_extract , +but final permissions are not set until +.Fn archive_read_close . +This separation is necessary to correctly handle borderline +cases such as a non-writable directory containing +files, but can cause unexpected results. +In particular, directory permissions are not fully +restored until the archive is closed. +If you use +.Xr chdir 2 +to change the current directory between calls to +.Fn archive_read_extract +or before calling +.Fn archive_read_close , +you may confuse the permission-setting logic with +the result that directory permissions are restored +incorrectly. + + ==== //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.5 2005/01/02 05:22:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.6 2005/01/25 06:07:28 kientzle Exp $"); #include "archive.h" @@ -35,5 +35,6 @@ archive_read_support_format_cpio(a); archive_read_support_format_iso9660(a); archive_read_support_format_tar(a); + archive_read_support_format_zip(a); return (ARCHIVE_OK); } ==== //depot/projects/wifi/lib/libc/gdtoa/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.7 2005/01/15 05:23:57 das Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.8 2005/01/27 05:44:16 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa @@ -6,7 +6,7 @@ MISRCS+=_hdtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ - strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c + strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa ==== //depot/projects/wifi/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.118 2004/11/18 23:59:19 marks Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.119 2005/01/27 05:46:16 das Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -76,7 +76,8 @@ err.3 vwarnx.3 err.3 warnc.3 err.3 warn.3 err.3 warnx.3 MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \ exec.3 execv.3 exec.3 execvp.3 -MLINKS+=fpclassify.3 isfinite.3 fpclassify.3 isinf.3 fpclassify.3 isnan.3 \ +MLINKS+=fpclassify.3 finite.3 fpclassify.3 finitef.3 \ + fpclassify.3 isfinite.3 fpclassify.3 isinf.3 fpclassify.3 isnan.3 \ fpclassify.3 isnormal.3 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \ fts.3 fts_read.3 fts.3 fts_set.3 ==== //depot/projects/wifi/lib/libc/gen/fpclassify.3#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.5 2004/07/09 06:37:44 das Exp $ +.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.6 2005/01/27 05:46:16 das Exp $ .\" -.Dd July 8, 2004 +.Dd January 26, 2005 .Dt FPCLASSIFY 3 .Os .Sh NAME @@ -92,6 +92,12 @@ is provided as an alias to .Fn isnan for compatibility, and its use is deprecated. +Similarly, +.Fn finite +and +.Fn finitef +are deprecated versions of +.Fn isfinite . .Sh SEE ALSO .Xr isgreater 3 , .Xr math 3 , ==== //depot/projects/wifi/lib/libc/net/getaddrinfo.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 28 12:56:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0622316A4D0; Fri, 28 Jan 2005 12:56:21 +0000 (GMT) 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 9E97116A4CE for ; Fri, 28 Jan 2005 12:56:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BFD743D1F for ; Fri, 28 Jan 2005 12:56:20 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SCuKZI022010 for ; Fri, 28 Jan 2005 12:56:20 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SCuK47022007 for perforce@freebsd.org; Fri, 28 Jan 2005 12:56:20 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 12:56:20 GMT Message-Id: <200501281256.j0SCuK47022007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 12:56:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=69865 Change 69865 by des@des.at.des.thinksec.com on 2005/01/28 12:56:15 Numerous improvements inspired by comments from ru@. Mainly, this fixes a couple of markup bugs, improves reference sorting, and improves handling of function argument names (function pointer arguments were not properly handled). Affected files ... .. //depot/projects/openpam/misc/gendoc.pl#29 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#29 (text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#28 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#29 $ # use strict; @@ -156,7 +156,7 @@ $args = "\"$args\""; %xref = ( - "pam 3" => 1 + 3 => { 'pam' => 1 }, ); if ($type eq "int") { @@ -164,14 +164,21 @@ next unless (m/^ \*\s+(!?PAM_[A-Z_]+|=[a-z_]+)\s*$/); push(@errors, $1); } - $xref{"pam_strerror 3"} = 1; + ++$xref{3}->{'pam_strerror'}; } $argnames = $args; + # extract names of regular arguments $argnames =~ s/\"[^\"]+\*?\b(\w+)\"/\"$1\"/g; + # extract names of function pointer arguments + $argnames =~ s/\"([\w\s\*]+)\(\*?(\w+)\)\([^\)]+\)\"/\"$2\"/g; + # escape metacharacters (there shouldn't be any, but...) $argnames =~ s/([\|\[\]\(\)\.\*\+\?])/\\$1/g; + # separate argument names with | $argnames =~ s/\" \"/|/g; + # and surround with () $argnames =~ s/^\"(.*)\"$/($1)/; + # $argnames is now a regexp that matches argument names $inliteral = $inlist = 0; foreach (split("\n", $source)) { s/\s*$//; @@ -197,8 +204,9 @@ } next; } - if (m/^>(\w+)(?:\s+(\d))?$/) { - ++$xref{$2 ? "$1 $2" : "$1 3"}; + if (m/^>(\w+)(\s+\d)?$/) { + my ($page, $sect) = ($1, $2 ? int($2) : 3); + ++$xref{$sect}->{$page}; next; } if (s/^\s+(=?\w+):\s*/.It $1/) { @@ -232,12 +240,12 @@ next; } s/\s*=$func\b\s*/\n.Nm\n/gs; - s/\s*=$argnames\b\s*/\n.Va $1\n/gs; + s/\s*=$argnames\b\s*/\n.Fa $1\n/gs; s/\s*=(struct \w+(?: \*)?)\b\s*/\n.Vt $1\n/gs; s/\s*:([a-z_]+)\b\s*/\n.Va $1\n/gs; s/\s*;([a-z_]+)\b\s*/\n.Dv $1\n/gs; while (s/\s*=([a-z_]+)\b\s*/\n.Xr $1 3\n/s) { - ++$xref{"$1 3"}; + ++$xref{3}->{$1}; } s/\s*\"(?=\w)/\n.Do\n/gs; s/\"(?!\w)\s*/\n.Dc\n/gs; @@ -333,6 +341,23 @@ $func->{'errors'} = [ sort(keys(%errors)) ]; } +sub genxref($) { + my $xref = shift; # References + + my $mdoc = ''; + my @refs = (); + foreach my $sect (sort(keys(%{$xref}))) { + foreach my $page (sort(keys(%{$xref->{$sect}}))) { + push(@refs, "$page $sect"); + } + } + while ($_ = shift(@refs)) { + $mdoc .= ".Xr $_" . + (@refs ? " ,\n" : "\n"); + } + return $mdoc; +} + sub gendoc($) { my $func = shift; # Ref to function hash @@ -391,11 +416,7 @@ "; } } - $mdoc .= ".Sh SEE ALSO\n"; - my @xref = sort(keys(%{$func->{'xref'}})); - while (@xref) { - $mdoc .= ".Xr " . shift(@xref) . (@xref ? " ,\n" : "\n"); - } + $mdoc .= ".Sh SEE ALSO\n" . genxref($func->{'xref'}); $mdoc .= ".Sh STANDARDS\n"; if ($func->{'openpam'}) { $mdoc .= "The @@ -415,7 +436,7 @@ function and this manual page were developed for the .Fx Project by ThinkSec AS and Network Associates Laboratories, the -Security Research Division of Network Associates, Inc. under +Security Research Division of Network Associates, Inc.\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. @@ -495,7 +516,7 @@ } while () { if (m/^\.Xr (\S+)\s*(\d)\s*$/) { - $xref{$1} = $2; + ++$xref{int($2)}->{$1}; } print FILE $_; } @@ -503,7 +524,7 @@ if ($page eq 'pam') { print FILE ".Sh RETURN VALUES The following return codes are defined by -.Aq Pa security/pam_constants.h : +.In security/pam_constants.h : .Bl -tag -width 18n "; foreach (sort(keys(%PAMERR))) { @@ -513,18 +534,13 @@ } print FILE ".Sh SEE ALSO "; - print FILE ".Xr openpam 3 ,\n" - if ($page eq 'pam'); + if ($page eq 'pam') { + ++$xref{3}->{'openpam'}; + } foreach $func (keys(%FUNCTIONS)) { - $xref{$func} = 3; + ++$xref{3}->{$func}; } - my @refs = sort(keys(%xref)); - while ($_ = shift(@refs)) { - print FILE ".Xr $_ $xref{$_}"; - print FILE " ," - if (@refs); - print FILE "\n"; - } + print FILE genxref(\%xref); print FILE ".Sh STANDARDS .Rs .%T \"X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules\" @@ -534,7 +550,7 @@ The OpenPAM library and this manual page were developed for the .Fx Project by ThinkSec AS and Network Associates Laboratories, the -Security Research Division of Network Associates, Inc. under +Security Research Division of Network Associates, Inc.\& under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. From owner-p4-projects@FreeBSD.ORG Fri Jan 28 12:58:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA47316A4D0; Fri, 28 Jan 2005 12:58:23 +0000 (GMT) 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 8A3D016A4CE for ; Fri, 28 Jan 2005 12:58:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF7B43D1F for ; Fri, 28 Jan 2005 12:58:23 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SCwNcN022101 for ; Fri, 28 Jan 2005 12:58:23 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SCwNTo022098 for perforce@freebsd.org; Fri, 28 Jan 2005 12:58:23 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 12:58:23 GMT Message-Id: <200501281258.j0SCwNTo022098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 12:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=69866 Change 69866 by des@des.at.des.thinksec.com on 2005/01/28 12:57:45 Add explicit section numbers to sete[gu]id() / setgroups() cross- references; otherwise, gendoc.pl incorrectly assumes they're in section 3. Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#12 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#11 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#11 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#12 $ */ #include @@ -114,7 +114,7 @@ * group access list. The original credentials can be restored using * =openpam_restore_cred. * - * >setegid - * >seteuid - * >setgroups + * >setegid 2 + * >seteuid 2 + * >setgroups 2 */ ==== //depot/projects/openpam/lib/openpam_restore_cred.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#11 $ */ #include @@ -87,7 +87,7 @@ * The =openpam_restore_cred function restores the credentials saved by * =openpam_borrow_cred. * - * >setegid - * >seteuid - * >setgroups + * >setegid 2 + * >seteuid 2 + * >setgroups 2 */ From owner-p4-projects@FreeBSD.ORG Fri Jan 28 12:59:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7767A16A4D0; Fri, 28 Jan 2005 12:59:25 +0000 (GMT) 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 3646D16A4CF for ; Fri, 28 Jan 2005 12:59:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E13743D4C for ; Fri, 28 Jan 2005 12:59:25 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SCxPYZ022124 for ; Fri, 28 Jan 2005 12:59:25 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SCxOXd022121 for perforce@freebsd.org; Fri, 28 Jan 2005 12:59:24 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 12:59:24 GMT Message-Id: <200501281259.j0SCxOXd022121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 12:59:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=69867 Change 69867 by des@des.at.des.thinksec.com on 2005/01/28 12:58:30 Hard sentence break. Affected files ... .. //depot/projects/openpam/doc/man/openpam.man#2 edit Differences ... ==== //depot/projects/openpam/doc/man/openpam.man#2 (text+ko) ==== @@ -1,8 +1,9 @@ .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam.man#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam.man#2 $ .\" .Sh DESCRIPTION -These functions are OpenPAM extensions to the PAM API. Those named +These functions are OpenPAM extensions to the PAM API. +Those named .Fn pam_* are, in the author's opinion, logical and necessary extensions to the standard API, while those named From owner-p4-projects@FreeBSD.ORG Fri Jan 28 13:00:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E25C16A51C; Fri, 28 Jan 2005 13:00:57 +0000 (GMT) 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 E5F8316A523 for ; Fri, 28 Jan 2005 13:00:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E152643D54 for ; Fri, 28 Jan 2005 13:00:26 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SD0Qer022183 for ; Fri, 28 Jan 2005 13:00:26 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SD0QlN022180 for perforce@freebsd.org; Fri, 28 Jan 2005 13:00:26 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 13:00:26 GMT Message-Id: <200501281300.j0SD0QlN022180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 13:00:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=69868 Change 69868 by des@des.at.des.thinksec.com on 2005/01/28 13:00:23 Add a couple of missing words. Affected files ... .. //depot/projects/openpam/doc/man/pam.man#3 edit Differences ... ==== //depot/projects/openpam/doc/man/pam.man#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.man#2 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.man#3 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number @@ -77,7 +77,7 @@ .Fn pam_open_session and .Fn pam_close_session -handle session setup and teardown. +functions handle session setup and teardown. .Ss Password Management The .Fn pam_chauthtok @@ -89,6 +89,7 @@ .Fn pam_getenv and .Fn pam_getenvlist +functions manage a private environment list in which modules can set environment variables they want the server to export during the session. .Pp From owner-p4-projects@FreeBSD.ORG Fri Jan 28 13:02:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C48DE16A4D0; Fri, 28 Jan 2005 13:02:30 +0000 (GMT) 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 84A1B16A4CE for ; Fri, 28 Jan 2005 13:02:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C34943D2F for ; Fri, 28 Jan 2005 13:02:30 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SD2Uca022302 for ; Fri, 28 Jan 2005 13:02:30 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SD2Uv9022299 for perforce@freebsd.org; Fri, 28 Jan 2005 13:02:30 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 13:02:30 GMT Message-Id: <200501281302.j0SD2Uv9022299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 13:02:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=69870 Change 69870 by des@des.at.des.thinksec.com on 2005/01/28 13:02:05 Rewrap a paragraph. Affected files ... .. //depot/projects/openpam/doc/man/pam.man#4 edit Differences ... ==== //depot/projects/openpam/doc/man/pam.man#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.man#3 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.man#4 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number @@ -89,9 +89,9 @@ .Fn pam_getenv and .Fn pam_getenvlist -functions -manage a private environment list in which modules can set environment -variables they want the server to export during the session. +functions manage a private environment list in which modules can set +environment variables they want the server to export during the +session. .Pp The .Fn pam_strerror From owner-p4-projects@FreeBSD.ORG Fri Jan 28 13:09:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3528716A4D0; Fri, 28 Jan 2005 13:09:40 +0000 (GMT) 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 CCE5C16A4CE for ; Fri, 28 Jan 2005 13:09:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71DFE43D1D for ; Fri, 28 Jan 2005 13:09:39 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SD9d4l022748 for ; Fri, 28 Jan 2005 13:09:39 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SD9drs022745 for perforce@freebsd.org; Fri, 28 Jan 2005 13:09:39 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 13:09:39 GMT Message-Id: <200501281309.j0SD9drs022745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 13:09:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=69871 Change 69871 by des@des.at.des.thinksec.com on 2005/01/28 13:08:44 Hard sentence breaks in inline documentation. Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#13 edit .. //depot/projects/openpam/lib/openpam_free_data.c#6 edit .. //depot/projects/openpam/lib/openpam_log.c#24 edit .. //depot/projects/openpam/lib/openpam_nullconv.c#7 edit .. //depot/projects/openpam/lib/openpam_ttyconv.c#25 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#28 edit .. //depot/projects/openpam/lib/pam_get_user.c#20 edit .. //depot/projects/openpam/lib/pam_open_session.c#14 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#13 $ */ #include @@ -109,10 +109,10 @@ /** * The =openpam_borrow_cred function saves the current credentials and - * switches to those of the user specified by its =pwd argument. The - * affected credentials are the effective UID, the effective GID, and the - * group access list. The original credentials can be restored using - * =openpam_restore_cred. + * switches to those of the user specified by its =pwd argument. + * The affected credentials are the effective UID, the effective GID, and + * the group access list. + * The original credentials can be restored using =openpam_restore_cred. * * >setegid 2 * >seteuid 2 ==== //depot/projects/openpam/lib/openpam_free_data.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_free_data.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_free_data.c#6 $ */ #include @@ -64,6 +64,6 @@ /** * The =openpam_free_data is a cleanup function suitable for passing to - * =pam_set_data. It simply releases the data by passing its =data - * argument to =free. + * =pam_set_data. + * It simply releases the data by passing its =data argument to =free. */ ==== //depot/projects/openpam/lib/openpam_log.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_log.c#23 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#24 $ */ #include @@ -122,27 +122,31 @@ #endif /** - * The =openpam_log function logs messages using =syslog. It is primarily - * intended for internal use by the library and modules. + * The =openpam_log function logs messages using =syslog. + * It is primarily intended for internal use by the library and modules. * - * The =level argument indicates the importance of the message. The - * following levels are defined: + * The =level argument indicates the importance of the message. + * The following levels are defined: * * =PAM_LOG_DEBUG: - * Debugging messages. These messages are normally not - * logged unless the global integer variable :_openpam_debug - * is set to a non-zero value, in which case they are logged - * with a =syslog priority of =LOG_DEBUG. + * Debugging messages. + * These messages are normally not logged unless the global + * integer variable :_openpam_debug is set to a non-zero + * value, in which case they are logged with a =syslog + * priority of =LOG_DEBUG. * =PAM_LOG_VERBOSE: * Information about the progress of the authentication - * process, or other non-essential messages. These messages - * are logged with a =syslog priority of =LOG_INFO. + * process, or other non-essential messages. + * These messages are logged with a =syslog priority of + * =LOG_INFO. * =PAM_LOG_NOTICE: - * Messages relating to non-fatal errors. These messages are - * logged with a =syslog priority of =LOG_NOTICE. + * Messages relating to non-fatal errors. + * These messages are logged with a =syslog priority of + * =LOG_NOTICE. * =PAM_LOG_ERROR: - * Messages relating to serious errors. These messages are - * logged with a =syslog priority of =LOG_ERR. + * Messages relating to serious errors. + * These messages are logged with a =syslog priority of + * =LOG_ERR. * * The remaining arguments are a =printf format string and the * corresponding arguments. ==== //depot/projects/openpam/lib/openpam_nullconv.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#7 $ */ #include @@ -70,12 +70,13 @@ /** * The =openpam_nullconv function is a null conversation function suitable * for applications that want to use PAM but don't support interactive - * dialog with the user. Such applications should set =PAM_AUTHTOK to - * whatever authentication token they've obtained on their own before - * calling =pam_authenticate and / or =pam_chauthtok, and their PAM - * configuration should specify the ;use_first_pass option for all modules - * that require access to the authentication token, to make sure they use - * =PAM_AUTHTOK rather than try to query the user. + * dialog with the user. + * Such applications should set =PAM_AUTHTOK to whatever authentication + * token they've obtained on their own before calling =pam_authenticate + * and / or =pam_chauthtok, and their PAM configuration should specify the + * ;use_first_pass option for all modules that require access to the + * authentication token, to make sure they use =PAM_AUTHTOK rather than + * try to query the user. * * >openpam_ttyconv * >pam_prompt ==== //depot/projects/openpam/lib/openpam_ttyconv.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#24 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#25 $ */ #include @@ -230,8 +230,9 @@ /** * The =openpam_ttyconv function is a standard conversation function - * suitable for use on TTY devices. It should be adequate for the needs - * of most text-based interactive programs. + * suitable for use on TTY devices. + * It should be adequate for the needs of most text-based interactive + * programs. * * The =openpam_ttyconv function allows the application to specify a * timeout for user input by setting the global integer variable ==== //depot/projects/openpam/lib/pam_get_authtok.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#27 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#28 $ */ #include @@ -142,9 +142,9 @@ /** * The =pam_get_authtok function returns the cached authentication token, - * or prompts the user if no token is currently cached. Either way, a - * pointer to the authentication token is stored in the location pointed - * to by the =authtok argument. + * or prompts the user if no token is currently cached. + * Either way, a pointer to the authentication token is stored in the + * location pointed to by the =authtok argument. * * The =item argument must have one of the following values: * @@ -157,13 +157,13 @@ * * The =prompt argument specifies a prompt to use if no token is cached. * If it is =NULL, the =PAM_AUTHTOK_PROMPT or =PAM_OLDAUTHTOK_PROMPT item, - * as appropriate, will be used. If that item is also =NULL, a hardcoded - * default prompt will be used. + * as appropriate, will be used. + * If that item is also =NULL, a hardcoded default prompt will be used. * * If =item is set to =PAM_AUTHTOK and there is a non-null =PAM_OLDAUTHTOK * item, =pam_get_authtok will ask the user to confirm the new token by - * retyping it. If there is a mismatch, =pam_get_authtok will return - * =PAM_TRY_AGAIN. + * retyping it. + * If there is a mismatch, =pam_get_authtok will return =PAM_TRY_AGAIN. * * >pam_get_item * >pam_get_user ==== //depot/projects/openpam/lib/pam_get_user.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#19 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#20 $ */ #include @@ -96,14 +96,16 @@ /** * The =pam_get_user function returns the name of the target user, as - * specified to =pam_start. If no user was specified, nor set using - * =pam_set_item, =pam_get_user will prompt for a user name. Either way, - * a pointer to the user name is stored in the location pointed to by the - * =user argument. - + * specified to =pam_start. + * If no user was specified, nor set using =pam_set_item, =pam_get_user + * will prompt for a user name. + * Either way, a pointer to the user name is stored in the location + * pointed to by the =user argument. + * * The =prompt argument specifies a prompt to use if no user name is - * cached. If it is =NULL, the =PAM_USER_PROMPT will be used. If that - * item is also =NULL, a hardcoded default prompt will be used. + * cached. + * If it is =NULL, the =PAM_USER_PROMPT will be used. + * If that item is also =NULL, a hardcoded default prompt will be used. * * >pam_get_item * >pam_get_authtok ==== //depot/projects/openpam/lib/pam_open_session.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_open_session.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#14 $ */ #include @@ -71,8 +71,8 @@ /** * The =pam_open_session sets up a user session for a previously - * authenticated user. The session should later be torn down by a call to - * =pam_close_session. + * authenticated user. + * The session should later be torn down by a call to =pam_close_session. * * The =flags argument is the binary or of zero or more of the following * values: From owner-p4-projects@FreeBSD.ORG Fri Jan 28 13:48:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE63716A4D0; Fri, 28 Jan 2005 13:48:28 +0000 (GMT) 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 84F8416A4CE for ; Fri, 28 Jan 2005 13:48:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD7C43D2F for ; Fri, 28 Jan 2005 13:48:28 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SDmS72024768 for ; Fri, 28 Jan 2005 13:48:28 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SDmSYr024765 for perforce@freebsd.org; Fri, 28 Jan 2005 13:48:28 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 13:48:28 GMT Message-Id: <200501281348.j0SDmSYr024765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 13:48:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=69875 Change 69875 by des@des.at.des.thinksec.com on 2005/01/28 13:47:41 Add openpam_free_envlist(). I'm tired of freeing them by hand. Affected files ... .. //depot/projects/openpam/doc/man/Makefile.am#2 edit .. //depot/projects/openpam/include/security/openpam.h#28 edit .. //depot/projects/openpam/lib/Makefile.am#2 edit .. //depot/projects/openpam/lib/openpam_free_envlist.c#1 add Differences ... ==== //depot/projects/openpam/doc/man/Makefile.am#2 (text+ko) ==== @@ -35,6 +35,7 @@ OMAN = \ openpam_borrow_cred.3 \ openpam_free_data.3 \ + openpam_free_envlist.3 \ openpam_get_option.3 \ openpam_log.3 \ openpam_nullconv.3 \ ==== //depot/projects/openpam/include/security/openpam.h#28 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#27 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#28 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -60,6 +60,9 @@ void *_data, int _status); +void +openpam_free_envlist(char **_envlist); + const char * openpam_get_option(pam_handle_t *_pamh, const char *_option); ==== //depot/projects/openpam/lib/Makefile.am#2 (text+ko) ==== @@ -11,6 +11,7 @@ openpam_dynamic.c \ openpam_findenv.c \ openpam_free_data.c \ + openpam_free_envlist.c \ openpam_get_option.c \ openpam_load.c \ openpam_log.c \ From owner-p4-projects@FreeBSD.ORG Fri Jan 28 14:22:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1DBF16A4D0; Fri, 28 Jan 2005 14:22:10 +0000 (GMT) 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 5EF4C16A4CE for ; Fri, 28 Jan 2005 14:22:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47F9E43D39 for ; Fri, 28 Jan 2005 14:22:10 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SEMAeu025970 for ; Fri, 28 Jan 2005 14:22:10 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SEMAPj025967 for perforce@freebsd.org; Fri, 28 Jan 2005 14:22:10 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 14:22:10 GMT Message-Id: <200501281422.j0SEMAPj025967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 14:22:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=69878 Change 69878 by des@des.at.des.thinksec.com on 2005/01/28 14:21:35 Use FREE() instead of free(). Affected files ... .. //depot/projects/openpam/lib/openpam_free_envlist.c#2 edit Differences ... ==== //depot/projects/openpam/lib/openpam_free_envlist.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_free_envlist.c#1 $ + * $P4: //depot/projects/openpam/lib/openpam_free_envlist.c#2 $ */ #include @@ -49,8 +49,8 @@ if (envlist == NULL) RETURNV(); for (env = envlist; *env != NULL; ++env) - free(*env); - free(envlist); + FREE(*env); + FREE(envlist); RETURNV(); } From owner-p4-projects@FreeBSD.ORG Fri Jan 28 14:25:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E599B16A4D1; Fri, 28 Jan 2005 14:25:14 +0000 (GMT) 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 9DB9816A4CE for ; Fri, 28 Jan 2005 14:25:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7829843D45 for ; Fri, 28 Jan 2005 14:25:14 +0000 (GMT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SEPEJL026036 for ; Fri, 28 Jan 2005 14:25:14 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0SEPEkp026033 for perforce@freebsd.org; Fri, 28 Jan 2005 14:25:14 GMT (envelope-from des@freebsd.org) Date: Fri, 28 Jan 2005 14:25:14 GMT Message-Id: <200501281425.j0SEPEkp026033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 69879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 14:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=69879 Change 69879 by des@des.at.des.thinksec.com on 2005/01/28 14:24:44 Formatting and documentation nits. Affected files ... .. //depot/projects/openpam/lib/openpam_free_data.c#7 edit Differences ... ==== //depot/projects/openpam/lib/openpam_free_data.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_free_data.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_free_data.c#7 $ */ #include @@ -48,7 +48,9 @@ */ void -openpam_free_data(pam_handle_t *pamh, void *data, int status) +openpam_free_data(pam_handle_t *pamh, + void *data, + int status) { ENTER(); @@ -63,7 +65,7 @@ */ /** - * The =openpam_free_data is a cleanup function suitable for passing to - * =pam_set_data. + * The =openpam_free_data function is a cleanup function suitable for + * passing to =pam_set_data. * It simply releases the data by passing its =data argument to =free. */ From owner-p4-projects@FreeBSD.ORG Sat Jan 29 17:24:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70FF416A4D1; Sat, 29 Jan 2005 17:24:25 +0000 (GMT) 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 167E416A4CE for ; Sat, 29 Jan 2005 17:24:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 001C543D1F for ; Sat, 29 Jan 2005 17:24:23 +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 j0THONKU031775 for ; Sat, 29 Jan 2005 17:24:23 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 j0THONxs031772 for perforce@freebsd.org; Sat, 29 Jan 2005 17:24:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 29 Jan 2005 17:24:23 GMT Message-Id: <200501291724.j0THONxs031772@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 Subject: PERFORCE change 69924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jan 2005 17:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=69924 Change 69924 by rwatson@rwatson_paprika on 2005/01/29 17:23:27 MAC Framework entry points and stub policy implementations to allow MAC policies to instrument the various set*id() system calls. Submitted by: Samy Al Bahra Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#44 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#24 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#139 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#264 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#221 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#44 (text+ko) ==== @@ -500,6 +500,12 @@ PROC_LOCK(p); oldcred = p->p_ucred; +#ifdef MAC + error = mac_check_proc_setuid(p, oldcred, uid); + if (error) + goto fail; +#endif + /* * See if we have "permission" by POSIX 1003.1 rules. * @@ -524,12 +530,8 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ uid != oldcred->cr_uid && /* allow setuid(geteuid()) */ #endif - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - uifree(uip); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; /* * Copy credentials so other references do not see our changes. @@ -579,6 +581,12 @@ uifree(uip); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + uifree(uip); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -604,14 +612,18 @@ euip = uifind(euid); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_seteuid(p, oldcred, euid; + if (error) + goto fail; +#endif + if (euid != oldcred->cr_ruid && /* allow seteuid(getuid()) */ euid != oldcred->cr_svuid && /* allow seteuid(saved uid) */ - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - uifree(euip); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; + /* * Everything's okay, do it. Copy credentials so other references do * not see our changes. @@ -626,6 +638,12 @@ uifree(euip); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + uifree(euip); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -650,6 +668,12 @@ PROC_LOCK(p); oldcred = p->p_ucred; +#ifdef MAC + error = mac_check_proc_setgid(p, oldcred, gid); + if (error) + goto fail; +#endif + /* * See if we have "permission" by POSIX 1003.1 rules. * @@ -668,11 +692,8 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ gid != oldcred->cr_groups[0] && /* allow setgid(getegid()) */ #endif - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; crcopy(newcred, oldcred); #ifdef _POSIX_SAVED_IDS @@ -718,6 +739,11 @@ PROC_UNLOCK(p); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -741,13 +767,18 @@ newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setegid(p, oldcred, egid); + if (error) + goto fail; +#endif + if (egid != oldcred->cr_rgid && /* allow setegid(getgid()) */ egid != oldcred->cr_svgid && /* allow setegid(saved gid) */ - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; + crcopy(newcred, oldcred); if (oldcred->cr_groups[0] != egid) { change_egid(newcred, egid); @@ -757,6 +788,11 @@ PROC_UNLOCK(p); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -789,14 +825,18 @@ newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setgroups(p, oldcred, ngrp, + tempcred->cr_groups); + if (error) + goto fail; +#endif + error = suser_cred(oldcred, SUSER_ALLOWJAIL); - if (error) { - PROC_UNLOCK(p); - crfree(newcred); - crfree(tempcred); - return (error); - } - + if (error) + goto fail; + /* * XXX A little bit lazy here. We could test if anything has * changed before crcopy() and setting P_SUGID. @@ -821,6 +861,12 @@ crfree(tempcred); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + crfree(newcred); + crfree(tempcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -849,17 +895,20 @@ ruip = uifind(ruid); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setreuid(p, oldcred, ruid, euid); + if (error) + goto fail; +#endif + if (((ruid != (uid_t)-1 && ruid != oldcred->cr_ruid && ruid != oldcred->cr_svuid) || (euid != (uid_t)-1 && euid != oldcred->cr_uid && euid != oldcred->cr_ruid && euid != oldcred->cr_svuid)) && - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - uifree(ruip); - uifree(euip); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; + crcopy(newcred, oldcred); if (euid != (uid_t)-1 && oldcred->cr_uid != euid) { change_euid(newcred, euip); @@ -880,6 +929,13 @@ uifree(euip); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + uifree(ruip); + uifree(euip); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -905,15 +961,19 @@ newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setregid(p, oldcred, rgid, egid); + if (error) + goto fail; +#endif + if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid && rgid != oldcred->cr_svgid) || (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] && egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) && - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; crcopy(newcred, oldcred); if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) { @@ -933,6 +993,11 @@ PROC_UNLOCK(p); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + crfree(newcred); + return (error); } /* @@ -968,6 +1033,13 @@ ruip = uifind(ruid); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setresuid(p, oldcred, ruid, euid, suid); + if (error) + goto fail; +#endif + if (((ruid != (uid_t)-1 && ruid != oldcred->cr_ruid && ruid != oldcred->cr_svuid && ruid != oldcred->cr_uid) || @@ -977,13 +1049,8 @@ (suid != (uid_t)-1 && suid != oldcred->cr_ruid && suid != oldcred->cr_svuid && suid != oldcred->cr_uid)) && - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - uifree(ruip); - uifree(euip); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; crcopy(newcred, oldcred); if (euid != (uid_t)-1 && oldcred->cr_uid != euid) { @@ -1004,6 +1071,14 @@ uifree(euip); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + uifree(ruip); + uifree(euip); + crfree(newcred); + return (error); + } /* @@ -1036,6 +1111,13 @@ newcred = crget(); PROC_LOCK(p); oldcred = p->p_ucred; + +#ifdef MAC + error = mac_check_proc_setresgid(p, oldcred, rgid, egid, sgid); + if (error) + goto fail; +#endif + if (((rgid != (gid_t)-1 && rgid != oldcred->cr_rgid && rgid != oldcred->cr_svgid && rgid != oldcred->cr_groups[0]) || @@ -1045,11 +1127,8 @@ (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid && sgid != oldcred->cr_svgid && sgid != oldcred->cr_groups[0])) && - (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { - PROC_UNLOCK(p); - crfree(newcred); - return (error); - } + (error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) + goto fail; crcopy(newcred, oldcred); if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) { @@ -1068,6 +1147,11 @@ PROC_UNLOCK(p); crfree(oldcred); return (0); + +fail: + PROC_UNLOCK(p); + crfree(newcred); + return (error); } #ifndef _SYS_SYSPROTO_H_ ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#14 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2003 Networks Associates Technology, Inc. + * Copyright (c) 2005 Samy Al Bahra * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -85,6 +86,11 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); +static int mac_enforce_suid = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_suid, CTLFLAW_RW, + &mac_enforce_suid, 0, "Enforce MAC policy on suid/sgid operations"); +TUNABLE_INT("security.mac.enforce_suid", &mac_enforce_suid); + #ifdef MAC_DEBUG static unsigned int nmaccreds, nmacprocs; SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, @@ -515,6 +521,137 @@ } int +mac_check_proc_setuid(struct proc *proc, struct ucred *cred, uid_t uid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setuid, cred, uid); + return (error); +} + +int +mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, uid_t euid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_seteuid, cred, euid); + return (error); +} + +int +mac_check_proc_setgid(struct proc *proc, struct ucred *cred, gid_t gid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setgid, cred, gid); + return (error); +} + +int +mac_check_proc_setegid(struct proc *proc, struct ucred *cred, gid_t egid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setegid, cred, egid); + return (error); +} + +int +mac_check_proc_setgroups(struct proc *proc, struct ucred *cred, + int ngroups, gid_t *gidset) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setgroups, cred, ngroups, gidset); + return (error); +} + +int +mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, uid_t ruid, + uid_t euid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setreuid, cred, ruid, euid); + return (error); +} + +int +mac_check_proc_setregid(struct proc *proc, struct ucred *cred, gid_t rgid, + gid_t egid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setregid, cred, rgid, egid); + return (error); +} + +int +mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, uid_t ruid, + uid_t euid, uid_t suid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setresuid, cred, ruid, euid, suid); + return (error); +} + +int +mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, gid_t rgid, + gid_t egid, gid_t sgid) +{ + int error; + + PROC_LOCK_ASSERT(proc, MA_OWNED); + + if (!mac_enforce_suid) + return (0); + + MAC_CHECK(check_proc_setresgid, cred, rgid, egid, sgid); + return (error); +} + +int mac_check_proc_wait(struct ucred *cred, struct proc *proc) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#24 (text+ko) ==== @@ -924,6 +924,72 @@ } static int +stub_check_proc_setuid(struct ucred *cred, uid_t uid) +{ + + return (0); +} + +static int +stub_check_proc_seteuid(struct ucred *cred, uid_t euid) +{ + + return (0); +} + +static int +stub_check_proc_setgid(struct ucred *cred, gid_t gid) +{ + + return (0); +} + +static int +stub_check_proc_setegid(struct ucred *cred, gid_t egid) +{ + + return (0); +} + +static int +stub_check_proc_setgroups(struct ucred *cred, int ngroups, + gid_t *gidset) +{ + + return (0); +} + +static int +stub_check_proc_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) +{ + + return (0); +} + +static int +stub_check_proc_setregid(struct ucred *cred, gid_t rgid, gid_t egid) +{ + + return (0); +} + +static int +stub_check_proc_setresuid(struct ucred *cred, uid_t ruid, uid_t euid, + uid_t suid) +{ + + return (0); +} + +static int +stub_check_proc_setresgid(struct ucred *cred, gid_t rgid, gid_t egid, + gid_t sgid) +{ + + return (0); +} + +static int stub_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -1442,6 +1508,15 @@ .mpo_check_posix_sem_wait = stub_check_posix_sem_wait, .mpo_check_proc_debug = stub_check_proc_debug, .mpo_check_proc_sched = stub_check_proc_sched, + .mpo_check_proc_setuid = stub_check_proc_setuid, + .mpo_check_proc_seteuid = stub_check_proc_seteuid, + .mpo_check_proc_setgid = stub_check_proc_setgid, + .mpo_check_proc_setegid = stub_check_proc_setegid, + .mpo_check_proc_setgroups = stub_check_proc_setgroups, + .mpo_check_proc_setreuid = stub_check_proc_setreuid, + .mpo_check_proc_setregid = stub_check_proc_setregid, + .mpo_check_proc_setresuid = stub_check_proc_setresuid, + .mpo_check_proc_setresgid = stub_check_proc_setresgid, .mpo_check_proc_signal = stub_check_proc_signal, .mpo_check_proc_wait = stub_check_proc_wait, .mpo_check_socket_bind = stub_check_socket_bind, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#139 (text+ko) ==== @@ -1796,6 +1796,90 @@ } static int +mac_test_check_proc_setuid(struct ucred *cred, uid_t uid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_seteuid(struct ucred *cred, uid_t euid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setgid(struct ucred *cred, gid_t gid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setegid(struct ucred *cred, gid_t egid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setgroups(struct ucred *cred, int ngroups, + gid_t *gidset) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setregid(struct ucred *cred, gid_t rgid, gid_t egid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setresuid(struct ucred *cred, uid_t ruid, uid_t euid, + uid_t suid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int +mac_test_check_proc_setresgid(struct ucred *cred, gid_t rgid, gid_t egid, + gid_t sgid) +{ + + ASSERT_CRED_LABEL(cred->cr_label); + + return (0); +} + +static int mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -2468,6 +2552,15 @@ .mpo_check_posix_sem_wait = mac_test_check_posix_ksem, .mpo_check_proc_debug = mac_test_check_proc_debug, .mpo_check_proc_sched = mac_test_check_proc_sched, + .mpo_check_proc_setuid = mac_test_check_proc_setuid, + .mpo_check_proc_seteuid = mac_test_check_proc_seteuid, + .mpo_check_proc_setgid = mac_test_check_proc_setgid, + .mpo_check_proc_setegid = mac_test_check_proc_setegid, + .mpo_check_proc_setgroups = mac_test_check_proc_setgroups, + .mpo_check_proc_setreuid = mac_test_check_proc_setreuid, + .mpo_check_proc_setregid = mac_test_check_proc_setregid, + .mpo_check_proc_setresuid = mac_test_check_proc_setresuid, + .mpo_check_proc_setresgid = mac_test_check_proc_setresgid, .mpo_check_proc_signal = mac_test_check_proc_signal, .mpo_check_proc_wait = mac_test_check_proc_wait, .mpo_check_socket_bind = mac_test_check_socket_bind, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#264 (text+ko) ==== @@ -350,6 +350,24 @@ int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); int mac_check_proc_debug(struct ucred *cred, struct proc *proc); int mac_check_proc_sched(struct ucred *cred, struct proc *proc); +int mac_check_proc_setuid(struct proc *proc, struct ucred *cred, + uid_t uid); +int mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, + uid_t euid); +int mac_check_proc_setgid(struct proc *proc, struct ucred *cred, + gid_t gid); +int mac_check_proc_setegid(struct proc *proc, struct ucred *cred, + gid_t egid); +int mac_check_proc_setgroups(struct proc *proc, struct ucred *cred, + int ngroups, gid_t *gidset); +int mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, + uid_t ruid, uid_t euid); +int mac_check_proc_setregid(struct proc *proc, struct ucred *cred, + gid_t rgid, gid_t egid); +int mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, + uid_t ruid, uid_t euid, uid_t suid); +int mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, + gid_t rgid, gid_t egid, gid_t sgid); int mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum); int mac_check_proc_wait(struct ucred *cred, struct proc *proc); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#221 (text+ko) ==== @@ -435,6 +435,20 @@ struct proc *proc); int (*mpo_check_proc_sched)(struct ucred *cred, struct proc *proc); + int (*mpo_check_proc_setuid)(struct ucred *cred, uid_t uid); + int (*mpo_check_proc_seteuid)(struct ucred *cred, uid_t euid); + int (*mpo_check_proc_setgid)(struct ucred *cred, gid_t gid); + int (*mpo_check_proc_setegid)(struct ucred *cred, gid_t egid); + int (*mpo_check_proc_setgroups)(struct ucred *cred, int ngroups, + gid_t *gidset); + int (*mpo_check_proc_setreuid)(struct ucred *cred, uid_t ruid, + uid_t euid); + int (*mpo_check_proc_setregid)(struct ucred *cred, gid_t rgid, + gid_t egid); + int (*mpo_check_proc_setresuid)(struct ucred *cred, uid_t ruid, + uid_t euid, uid_t suid); + int (*mpo_check_proc_setresgid)(struct ucred *cred, gid_t rgid, + gid_t egid, gid_t sgid); int (*mpo_check_proc_signal)(struct ucred *cred, struct proc *proc, int signum); int (*mpo_check_proc_wait)(struct ucred *cred, From owner-p4-projects@FreeBSD.ORG Sat Jan 29 17:26:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51E2D16A4CF; Sat, 29 Jan 2005 17:26:27 +0000 (GMT) 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 12F2B16A4D0 for ; Sat, 29 Jan 2005 17:26:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA5AF43D39 for ; Sat, 29 Jan 2005 17:26:26 +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 j0THQQom031868 for ; Sat, 29 Jan 2005 17:26:26 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 j0THQQaf031865 for perforce@freebsd.org; Sat, 29 Jan 2005 17:26:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 29 Jan 2005 17:26:26 GMT Message-Id: <200501291726.j0THQQaf031865@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 Subject: PERFORCE change 69925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jan 2005 17:26:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=69925 Change 69925 by rwatson@rwatson_paprika on 2005/01/29 17:26:10 Correct two typos: one probably from the original patch, and one that I definitely introduced. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#45 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#45 (text+ko) ==== @@ -614,7 +614,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_seteuid(p, oldcred, euid; + error = mac_check_proc_seteuid(p, oldcred, euid); if (error) goto fail; #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#15 (text+ko) ==== @@ -87,7 +87,7 @@ "copy-on-write semantics, or by removing all write access"); static int mac_enforce_suid = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_suid, CTLFLAW_RW, +SYSCTL_INT(_security_mac, OID_AUTO, enforce_suid, CTLFLAG_RW, &mac_enforce_suid, 0, "Enforce MAC policy on suid/sgid operations"); TUNABLE_INT("security.mac.enforce_suid", &mac_enforce_suid);